[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 21/23] tap: do not close(fd) in net_init_tap_one
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 21/23] tap: do not close(fd) in net_init_tap_one |
Date: |
Sun, 2 Nov 2014 14:57:33 +0300 |
From: Gonglei <address@hidden>
commit 5193e5fb (tap: factor out common tap initialization)
introduce net_init_tap_one(). But it's inappropriate that
we close fd in net_init_tap_one(), we should lay it in the
caller, becuase some callers needn't to close it if we get
the fd by monitor_handle_fd_param().
On the other hand, in other exceptional branches fd isn't
closed, so that's incomplete anyway.
Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
net/tap.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/tap.c b/net/tap.c
index a40f7f0..7bcd4c7 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -598,7 +598,6 @@ static int net_init_tap_one(const NetdevTapOptions *tap,
NetClientState *peer,
s = net_tap_fd_init(peer, model, name, fd, vnet_hdr);
if (!s) {
- close(fd);
return -1;
}
--
1.7.10.4
- [Qemu-devel] [PULL 05/23] target-arm: A64: remove redundant store, (continued)
- [Qemu-devel] [PULL 05/23] target-arm: A64: remove redundant store, Michael Tokarev, 2014/11/02
- [Qemu-devel] [PULL 06/23] sparse: fix build, Michael Tokarev, 2014/11/02
- [Qemu-devel] [PULL 23/23] vdi: wrapped uuid_unparse() in #ifdef, Michael Tokarev, 2014/11/02
- [Qemu-devel] [PULL 15/23] os-posix: use global daemon_pipe instead of cryptic fds[1], Michael Tokarev, 2014/11/02
- [Qemu-devel] [PULL 09/23] net/slirp: specify logbase for smbd, Michael Tokarev, 2014/11/02
- [Qemu-devel] [PULL 08/23] Revert "os-posix: report error message when lock file failed", Michael Tokarev, 2014/11/02
- [Qemu-devel] [PULL 13/23] virtio-9p-proxy: improve error messages in connect_namedsocket(), Michael Tokarev, 2014/11/02
- [Qemu-devel] [PULL 22/23] tap: fix possible fd leak in net_init_tap, Michael Tokarev, 2014/11/02
- [Qemu-devel] [PULL 18/23] os-posix: reorder parent notification for -daemonize, Michael Tokarev, 2014/11/02
- [Qemu-devel] [PULL 10/23] target-tricore: check return value before using it, Michael Tokarev, 2014/11/02
- [Qemu-devel] [PULL 21/23] tap: do not close(fd) in net_init_tap_one,
Michael Tokarev <=
- [Qemu-devel] [PULL 20/23] target-i386: Remove unused model_features_t struct, Michael Tokarev, 2014/11/02
- [Qemu-devel] [PULL 19/23] tap_int.h: remove repeating NETWORK_SCRIPT defines, Michael Tokarev, 2014/11/02
- [Qemu-devel] [PULL 16/23] os-posix: replace goto again with a proper loop, Michael Tokarev, 2014/11/02
- [Qemu-devel] [PULL 14/23] dump: Fix dump-guest-memory termination and use-after-close, Michael Tokarev, 2014/11/02
- Re: [Qemu-devel] [PULL 00/23] Trivial patches for 2014-11-02, Peter Maydell, 2014/11/03