OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qemu-nbd: Fix coverity issues 

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 <armbru@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2014-03-14 18:10:54 +01:00
parent 6295b98d7b
commit 0c544d73bb
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qemu-nbd.c
View File

@ -288,19 +288,19 @@ static void *nbd_client_thread(void *arg)
ret = nbd_receive_negotiate(sock, NULL, &nbdflags, ret = nbd_receive_negotiate(sock, NULL, &nbdflags,
&size, &blocksize); &size, &blocksize);
if (ret < 0) { if (ret < 0) {
goto out; goto out_socket;
} }
fd = open(device, O_RDWR); fd = open(device, O_RDWR);
if (fd < 0) { if (fd < 0) {
/* Linux-only, we can use %m in printf. */ /* Linux-only, we can use %m in printf. */
fprintf(stderr, "Failed to open %s: %m", device); fprintf(stderr, "Failed to open %s: %m", device);
goto out; goto out_socket;
} }
ret = nbd_init(fd, sock, nbdflags, size, blocksize); ret = nbd_init(fd, sock, nbdflags, size, blocksize);
if (ret < 0) { if (ret < 0) {
goto out; goto out_fd;
} }
/* update partition table */ /* update partition table */
@ -316,12 +316,16 @@ static void *nbd_client_thread(void *arg)
ret = nbd_client(fd); ret = nbd_client(fd);
if (ret) { if (ret) {
goto out; goto out_fd;
} }
close(fd); close(fd);
kill(getpid(), SIGTERM); kill(getpid(), SIGTERM);
return (void *) EXIT_SUCCESS; return (void *) EXIT_SUCCESS;
out_fd:
close(fd);
out_socket:
closesocket(sock);
out: out:
kill(getpid(), SIGTERM); kill(getpid(), SIGTERM);
return (void *) EXIT_FAILURE; return (void *) EXIT_FAILURE;
@ -355,6 +359,11 @@ static void nbd_accept(void *opaque)
socklen_t addr_len = sizeof(addr); socklen_t addr_len = sizeof(addr);
int fd = accept(server_fd, (struct sockaddr *)&addr, &addr_len); int fd = accept(server_fd, (struct sockaddr *)&addr, &addr_len);
if (fd < 0) {
perror("accept");
return;
}
if (state >= TERMINATE) { if (state >= TERMINATE) {
close(fd); close(fd);
return; return;