[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 12/23] virtio-9p-proxy: fix error return in proxy_i
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 12/23] virtio-9p-proxy: fix error return in proxy_init() |
Date: |
Sun, 2 Nov 2014 14:57:24 +0300 |
proxy_init() does not check the return value of connect_namedsocket(),
fix this by rearranging code a little bit.
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/9pfs/virtio-9p-proxy.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/9pfs/virtio-9p-proxy.c b/hw/9pfs/virtio-9p-proxy.c
index e6bbb06..2ec211b 100644
--- a/hw/9pfs/virtio-9p-proxy.c
+++ b/hw/9pfs/virtio-9p-proxy.c
@@ -1155,10 +1155,12 @@ static int proxy_init(FsContext *ctx)
sock_id = atoi(ctx->fs_root);
if (sock_id < 0) {
fprintf(stderr, "socket descriptor not initialized\n");
- g_free(proxy);
- return -1;
}
}
+ if (sock_id < 0) {
+ g_free(proxy);
+ return -1;
+ }
g_free(ctx->fs_root);
ctx->fs_root = NULL;
--
1.7.10.4
- [Qemu-trivial] [PULL 00/23] Trivial patches for 2014-11-02, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 01/23] tests: Add missing include to test-bitops.c, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 02/23] bitops.h: Don't include qemu-common.h, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 11/23] virtio-9p-proxy: Fix sockfd leak, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 03/23] bitmap.h: Don't include qemu-common.h, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 04/23] target-xtensa: mark XtensaConfig structs as unused, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 17/23] pidfile: stop making pidfile error a special case, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 12/23] virtio-9p-proxy: fix error return in proxy_init(),
Michael Tokarev <=
- [Qemu-trivial] [PULL 07/23] util: Improve os_mem_prealloc error message, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 05/23] target-arm: A64: remove redundant store, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 06/23] sparse: fix build, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 08/23] Revert "os-posix: report error message when lock file failed", Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 23/23] vdi: wrapped uuid_unparse() in #ifdef, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 09/23] net/slirp: specify logbase for smbd, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 15/23] os-posix: use global daemon_pipe instead of cryptic fds[1], Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 22/23] tap: fix possible fd leak in net_init_tap, Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 13/23] virtio-9p-proxy: improve error messages in connect_namedsocket(), Michael Tokarev, 2014/11/02
- [Qemu-trivial] [PULL 21/23] tap: do not close(fd) in net_init_tap_one, Michael Tokarev, 2014/11/02