diff mbox

[v2] tap: fix possible fd leak in net_init_tap

Message ID 1414906637-11048-1-git-send-email-arei.gonglei@huawei.com
State New
Headers show

Commit Message

Gonglei (Arei) Nov. 2, 2014, 5:37 a.m. UTC 
From: Gonglei <arei.gonglei@huawei.com>

In hotplugging scenario, taking those true branch, the file
handler do not be closed. Let's close them before return.

Signed-off-by: Gonglei <arei.gonglei@huawei.com>
---
 v1: [PATCH 2/2] tap: fix possible fd leak
 v2: add explicit close(fd) and change subject. (Thanks to /mjt)
---
 net/tap.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Michael Tokarev Nov. 2, 2014, 5:39 a.m. UTC | #1 
02.11.2014 08:37, arei.gonglei@huawei.com wrote:
> 
> In hotplugging scenario, taking those true branch, the file
> handler do not be closed. Let's close them before return.

This looks much better now, and is shorter too :)
Applied to -trivial, thank you!

/mjt
Gonglei (Arei) Nov. 2, 2014, 5:51 a.m. UTC | #2 
On 2014/11/2 13:39, Michael Tokarev wrote:

> 02.11.2014 08:37, arei.gonglei@huawei.com wrote:
>>
>> In hotplugging scenario, taking those true branch, the file
>> handler do not be closed. Let's close them before return.
> 
> This looks much better now, and is shorter too :)
> Applied to -trivial, thank you!
> 

Thanks :)

Best regards,
-Gonglei
diff mbox

Patch

diff --git a/net/tap.c b/net/tap.c
index 7bcd4c7..bde6b58 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -796,6 +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)) {
+            close(fd);
             return -1;
         }
     } else {
@@ -823,6 +824,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");
+                    close(fd);
                     return -1;
                 }
             }
@@ -831,6 +833,7 @@  int net_init_tap(const NetClientOptions *opts, const char *name,
                                  i >= 1 ? "no" : script,
                                  i >= 1 ? "no" : downscript,
                                  vhostfdname, vnet_hdr, fd)) {
+                close(fd);
                 return -1;
             }
         }