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

qemu-nbd: Fix a memleak in nbd_client_thread()

Browse Source 
When the qio_channel_socket_connect_sync() fails
we should goto 'out_socket' label to free the 'sioc' instead of
goto 'out' label.
In addition, there's a lot of redundant code in the successful branch
and the error branch, optimize it.

Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Alex Chen <alex.chen@huawei.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20201208134944.27962-1-alex.chen@huawei.com>
This commit is contained in:
Alex Chen 2020-12-08 13:49:44 +00:00 committed by Eric Blake
parent 992809bf8b
commit af74b550bd
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
qemu-nbd.c
View File

@ -265,8 +265,8 @@ static void *nbd_client_thread(void *arg)
char *device = arg; char *device = arg;
NBDExportInfo info = { .request_sizes = false, .name = g_strdup("") }; NBDExportInfo info = { .request_sizes = false, .name = g_strdup("") };
QIOChannelSocket *sioc; QIOChannelSocket *sioc;
int fd; int fd = -1;
int ret; int ret = EXIT_FAILURE;
pthread_t show_parts_thread; pthread_t show_parts_thread;
Error *local_error = NULL; Error *local_error = NULL;
@ -278,26 +278,24 @@ static void *nbd_client_thread(void *arg)
goto out; goto out;
} }
ret = nbd_receive_negotiate(NULL, QIO_CHANNEL(sioc), if (nbd_receive_negotiate(NULL, QIO_CHANNEL(sioc),
NULL, NULL, NULL, &info, &local_error); NULL, NULL, NULL, &info, &local_error) < 0) {
if (ret < 0) {
if (local_error) { if (local_error) {
error_report_err(local_error); error_report_err(local_error);
} }
goto out_socket; goto out;
} }
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. */
error_report("Failed to open %s: %m", device); error_report("Failed to open %s: %m", device);
goto out_socket; goto out;
} }
ret = nbd_init(fd, sioc, &info, &local_error); if (nbd_init(fd, sioc, &info, &local_error) < 0) {
if (ret < 0) {
error_report_err(local_error); error_report_err(local_error);
goto out_fd; goto out;
} }
/* update partition table */ /* update partition table */
@ -311,24 +309,20 @@ static void *nbd_client_thread(void *arg)
dup2(STDOUT_FILENO, STDERR_FILENO); dup2(STDOUT_FILENO, STDERR_FILENO);
} }
ret = nbd_client(fd); if (nbd_client(fd) < 0) {
if (ret) { goto out;
goto out_fd;
} }
close(fd);
object_unref(OBJECT(sioc));
g_free(info.name);
kill(getpid(), SIGTERM);
return (void *) EXIT_SUCCESS;
out_fd: ret = EXIT_SUCCESS;
close(fd);
out_socket: out:
if (fd >= 0) {
close(fd);
}
object_unref(OBJECT(sioc)); object_unref(OBJECT(sioc));
out:
g_free(info.name); g_free(info.name);
kill(getpid(), SIGTERM); kill(getpid(), SIGTERM);
return (void *) EXIT_FAILURE; return (void *) (intptr_t) ret;
} }
#endif /* HAVE_NBD_DEVICE */ #endif /* HAVE_NBD_DEVICE */