[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL V2 4/6] tap: fix memory leak on failure to create a m
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL V2 4/6] tap: fix memory leak on failure to create a multiqueue tap device |
Date: |
Tue, 19 Jul 2016 10:38:53 +0800 |
From: Paolo Bonzini <address@hidden>
Reported by Coverity.
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
net/tap.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/net/tap.c b/net/tap.c
index e9c32f3..6a2cedc 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -787,8 +787,8 @@ int net_init_tap(const NetClientOptions *opts, const char
*name,
return -1;
}
} else if (tap->has_fds) {
- char **fds = g_new(char *, MAX_TAP_QUEUES);
- char **vhost_fds = g_new(char *, MAX_TAP_QUEUES);
+ char **fds = g_new0(char *, MAX_TAP_QUEUES);
+ char **vhost_fds = g_new0(char *, MAX_TAP_QUEUES);
int nfds, nvhosts;
if (tap->has_ifname || tap->has_script || tap->has_downscript ||
@@ -806,7 +806,7 @@ int net_init_tap(const NetClientOptions *opts, const char
*name,
if (nfds != nvhosts) {
error_setg(errp, "The number of fds passed does not match "
"the number of vhostfds passed");
- return -1;
+ goto free_fail;
}
}
@@ -814,7 +814,7 @@ int net_init_tap(const NetClientOptions *opts, const char
*name,
fd = monitor_fd_param(cur_mon, fds[i], &err);
if (fd == -1) {
error_propagate(errp, err);
- return -1;
+ goto free_fail;
}
fcntl(fd, F_SETFL, O_NONBLOCK);
@@ -824,7 +824,7 @@ int net_init_tap(const NetClientOptions *opts, const char
*name,
} else if (vnet_hdr != tap_probe_vnet_hdr(fd)) {
error_setg(errp,
"vnet_hdr not consistent across given tap fds");
- return -1;
+ goto free_fail;
}
net_init_tap_one(tap, peer, "tap", name, ifname,
@@ -833,11 +833,21 @@ int net_init_tap(const NetClientOptions *opts, const char
*name,
vnet_hdr, fd, &err);
if (err) {
error_propagate(errp, err);
- return -1;
+ goto free_fail;
}
}
g_free(fds);
g_free(vhost_fds);
+ return 0;
+
+free_fail:
+ for (i = 0; i < nfds; i++) {
+ g_free(fds[i]);
+ g_free(vhost_fds[i]);
+ }
+ g_free(fds);
+ g_free(vhost_fds);
+ return -1;
} else if (tap->has_helper) {
if (tap->has_ifname || tap->has_script || tap->has_downscript ||
tap->has_vnet_hdr || tap->has_queues || tap->has_vhostfds) {
--
2.7.4
- [Qemu-devel] [PULL V2 0/6] Net patches, Jason Wang, 2016/07/18
- [Qemu-devel] [PULL V2 1/6] e1000e: fix incorrect access to pointer, Jason Wang, 2016/07/18
- [Qemu-devel] [PULL V2 2/6] net: fix incorrect access to pointer, Jason Wang, 2016/07/18
- [Qemu-devel] [PULL V2 3/6] net: fix incorrect argument to iov_to_buf, Jason Wang, 2016/07/18
- [Qemu-devel] [PULL V2 4/6] tap: fix memory leak on failure to create a multiqueue tap device,
Jason Wang <=
- [Qemu-devel] [PULL V2 5/6] MAINTAINERS: release Scott from being a rocker maintainer, Jason Wang, 2016/07/18
- [Qemu-devel] [PULL V2 6/6] e1000e: fix building without CONFIG_VMXNET3_PCI, Jason Wang, 2016/07/18
- Re: [Qemu-devel] [PULL V2 0/6] Net patches, Peter Maydell, 2016/07/19