diff mbox series

[PULL,3/3] slirp: tcp_listen(): Don't try to close() an fd we never opened

Message ID 20170226144353.2502-4-samuel.thibault@ens-lyon.org
State Accepted
Commit bd5d2353aa69e68e45d8a89787bab17c155e9e24
Headers show
Series [PULL,1/3] slirp: Check qemu_socket() return value in udp_listen() | expand

Commit Message

Samuel Thibault Feb. 26, 2017, 2:43 p.m. UTC 
From: Peter Maydell <peter.maydell@linaro.org>


Coverity points out (CID 1005725) that an error-exit path in tcp_listen()
will try to close(s) even if the reason it got there was that the
qemu_socket() failed and s was never opened.  Not only that, this isn't even
the right function to use, because we need closesocket() to do the right
thing on Windows.  Change to using the right function and only calling it if
needed.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

---
 slirp/socket.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

-- 
2.11.0
diff mbox series

Patch

diff --git a/slirp/socket.c b/slirp/socket.c
index 6c18971368..86927722e1 100644
--- a/slirp/socket.c
+++ b/slirp/socket.c
@@ -713,7 +713,9 @@  tcp_listen(Slirp *slirp, uint32_t haddr, u_int hport, uint32_t laddr,
 	    (listen(s,1) < 0)) {
 		int tmperrno = errno; /* Don't clobber the real reason we failed */
 
-		close(s);
+                if (s >= 0) {
+                    closesocket(s);
+                }
 		sofree(so);
 		/* Restore the real errno */
 #ifdef _WIN32