From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48364) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPWa3-0004E1-0G for qemu-devel@nongnu.org; Mon, 17 Mar 2014 08:23:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WPWZu-0003Te-EK for qemu-devel@nongnu.org; Mon, 17 Mar 2014 08:23:46 -0400 Received: from mail-qc0-x231.google.com ([2607:f8b0:400d:c01::231]:63372) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPWZu-0003TY-9Z for qemu-devel@nongnu.org; Mon, 17 Mar 2014 08:23:38 -0400 Received: by mail-qc0-f177.google.com with SMTP id w7so5662232qcr.22 for ; Mon, 17 Mar 2014 05:23:38 -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 u15sm20813967qge.2.2014.03.17.05.23.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Mar 2014 05:23:36 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 17 Mar 2014 13:23:15 +0100 Message-Id: <1395058997-19660-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1395058997-19660-1-git-send-email-pbonzini@redhat.com> References: <1395058997-19660-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 2/4] 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. Reviewed-by: Markus Armbruster 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