diff mbox series

[PULL,2/4] slirp: fork_exec(): Don't close() a negative number in fork_exec()

Message ID 20170715123057.8529-3-samuel.thibault@ens-lyon.org
State Accepted
Commit 12dccfe4f57ead8166567ec8a60d2ce91e266f04
Headers show
Series None | expand

Commit Message

Samuel Thibault July 15, 2017, 12:30 p.m. UTC 
From: Peter Maydell <peter.maydell@linaro.org>


In a fork_exec() error path we try to closesocket(s) when s might
be a negative number because the thing that failed was the
qemu_socket() call. Add a guard so we don't do this.

(Spotted by Coverity: CID 1005727 issue 1 of 2.)

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

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

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

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

-- 
2.13.2
diff mbox series

Patch

diff --git a/slirp/misc.c b/slirp/misc.c
index 88e9d94197..260187b6b6 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -112,7 +112,9 @@  fork_exec(struct socket *so, const char *ex, int do_pty)
 		    bind(s, (struct sockaddr *)&addr, addrlen) < 0 ||
 		    listen(s, 1) < 0) {
 			error_report("Error: inet socket: %s", strerror(errno));
-			closesocket(s);
+			if (s >= 0) {
+			    closesocket(s);
+			}
 
 			return 0;
 		}