From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOVnZ-0005Q7-FD for qemu-devel@nongnu.org; Fri, 14 Mar 2014 13:21:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WOVnR-0007Nj-26 for qemu-devel@nongnu.org; Fri, 14 Mar 2014 13:21:33 -0400 Received: from mail-qc0-x22b.google.com ([2607:f8b0:400d:c01::22b]:45175) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOVnQ-0007Nc-TM for qemu-devel@nongnu.org; Fri, 14 Mar 2014 13:21:24 -0400 Received: by mail-qc0-f171.google.com with SMTP id x13so3232650qcv.2 for ; Fri, 14 Mar 2014 10:21:24 -0700 (PDT) Received: from yakj.usersys.redhat.com (net-37-117-154-249.cust.vodafonedsl.it. [37.117.154.249]) by mx.google.com with ESMTPSA id t5sm8871163qge.0.2014.03.14.10.21.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Mar 2014 10:21:23 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 14 Mar 2014 18:21:07 +0100 Message-Id: <1394817667-2207-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] qemu-nbd: Fix coverity issues List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org There are two issues in qemu-nbd: a missing return value check after calling accept(), and file descriptor leaks in nbd_client_thread. Signed-off-by: Paolo Bonzini --- qemu-nbd.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/qemu-nbd.c b/qemu-nbd.c index bdac1f3..899e67c 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -288,19 +288,19 @@ static void *nbd_client_thread(void *arg) ret = nbd_receive_negotiate(sock, NULL, &nbdflags, &size, &blocksize); if (ret < 0) { - goto out; + goto out_socket; } fd = open(device, O_RDWR); if (fd < 0) { /* Linux-only, we can use %m in printf. */ fprintf(stderr, "Failed to open %s: %m", device); - goto out; + goto out_socket; } ret = nbd_init(fd, sock, nbdflags, size, blocksize); if (ret < 0) { - goto out; + goto out_fd; } /* update partition table */ @@ -316,12 +316,16 @@ static void *nbd_client_thread(void *arg) ret = nbd_client(fd); if (ret) { - goto out; + goto out_fd; } close(fd); kill(getpid(), SIGTERM); return (void *) EXIT_SUCCESS; +out_fd: + close(fd); +out_socket: + closesocket(sock); out: kill(getpid(), SIGTERM); return (void *) EXIT_FAILURE; @@ -355,6 +359,11 @@ static void nbd_accept(void *opaque) socklen_t addr_len = sizeof(addr); int fd = accept(server_fd, (struct sockaddr *)&addr, &addr_len); + if (fd < 0) { + perror("accept"); + return; + } + if (state >= TERMINATE) { close(fd); return; -- 1.8.5.3