From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51615) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcaBx-0007VW-1V for qemu-devel@nongnu.org; Mon, 30 Mar 2015 09:57:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcaBv-0005EK-IN for qemu-devel@nongnu.org; Mon, 30 Mar 2015 09:57:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42374) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcaBv-0005EG-D3 for qemu-devel@nongnu.org; Mon, 30 Mar 2015 09:57:23 -0400 From: Stefan Hajnoczi Date: Mon, 30 Mar 2015 14:57:16 +0100 Message-Id: <1427723836-302-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1427723836-302-1-git-send-email-stefanha@redhat.com> References: <1427723836-302-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] virtfs-proxy-helper: fail gracefully if socket path is too long List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Aneesh Kumar K.V" , Stefan Hajnoczi , Shannon Zhao 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 Signed-off-by: Stefan Hajnoczi --- fsdev/virtfs-proxy-helper.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c index 91e8b9b..9097d15 100644 --- a/fsdev/virtfs-proxy-helper.c +++ b/fsdev/virtfs-proxy-helper.c @@ -739,7 +739,12 @@ static int proxy_socket(const char *path, uid_t uid, gid_t gid) 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); if (sock < 0) { do_perror("socket"); -- 2.1.0