Ver Fonte

virtfs-proxy-helper: fail gracefully if socket path is too long

Replace the assertion check with graceful failure when the socket path
is too long.  Programs should not crash on invalid input.  Print an
error message and exit properly.

Cc: Shannon Zhao <zhaoshenglong@huawei.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Stefan Hajnoczi há 10 anos atrás
pai
commit
f8d30a4f96
1 ficheiros alterados com 6 adições e 1 exclusões
  1. 6 1
      fsdev/virtfs-proxy-helper.c

+ 6 - 1
fsdev/virtfs-proxy-helper.c

@@ -739,7 +739,12 @@ static int proxy_socket(const char *path, uid_t uid, gid_t gid)
         return -1;
         return -1;
     }
     }
 
 
-    g_assert(strlen(path) < sizeof(proxy.sun_path));
+    if (strlen(path) >= sizeof(proxy.sun_path)) {
+        do_log(LOG_CRIT, "UNIX domain socket path exceeds %zu characters\n",
+               sizeof(proxy.sun_path));
+        return -1;
+    }
+
     sock = socket(AF_UNIX, SOCK_STREAM, 0);
     sock = socket(AF_UNIX, SOCK_STREAM, 0);
     if (sock < 0) {
     if (sock < 0) {
         do_perror("socket");
         do_perror("socket");