[Qemu-devel] [PATCH 2/2] tap: fix possible fd leak

[arei.gonglei]

From: Gonglei <address@hidden>

In hotplugging scenario, taking those true branch, the file
handler do not be closed. Adding cleanup logic for them.

Signed-off-by: Gonglei <address@hidden>
---
 net/tap.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/net/tap.c b/net/tap.c
index 7bcd4c7..3cfbee8 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -796,7 +796,7 @@ int net_init_tap(const NetClientOptions *opts, const char 
*name,
         if (net_init_tap_one(tap, peer, "bridge", name, ifname,
                              script, downscript, vhostfdname,
                              vnet_hdr, fd)) {
-            return -1;
+            goto fail;
         }
     } else {
         if (tap->has_vhostfds) {
@@ -823,7 +823,7 @@ int net_init_tap(const NetClientOptions *opts, const char 
*name,
             if (queues > 1 && i == 0 && !tap->has_ifname) {
                 if (tap_fd_get_ifname(fd, ifname)) {
                     error_report("Fail to get ifname");
-                    return -1;
+                    goto fail;
                 }
             }
 
@@ -831,12 +831,18 @@ int net_init_tap(const NetClientOptions *opts, const char 
*name,
                                  i >= 1 ? "no" : script,
                                  i >= 1 ? "no" : downscript,
                                  vhostfdname, vnet_hdr, fd)) {
-                return -1;
+                goto fail;
             }
         }
     }
 
     return 0;
+
+fail:
+    if (fd != -1) {
+        close(fd);
+    }
+    return -1;
 }
 
 VHostNetState *tap_get_vhost_net(NetClientState *nc)
-- 
1.7.12.4