From: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
In "if (saddr->keep_alive) {" we may already be on error path, with
invalid sock < 0. Fix it by returning error earlier.
Reported-by: Coverity (CID 1405300)
Fixes: aec21d31756cbd
Suggested-by: Peter Maydell <peter.mayd...@linaro.org>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
Message-Id: <20190910075943.12977-1-vsement...@virtuozzo.com>
Reviewed-by: Daniel P. Berrangé <berra...@redhat.com>
Signed-off-by: Eric Blake <ebl...@redhat.com>
---
util/qemu-sockets.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 98ff3a1cce64..bcc06d0e01c7 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -461,12 +461,13 @@ int inet_connect_saddr(InetSocketAddress *saddr, Error
**errp)
}
}
+ freeaddrinfo(res);
+
if (sock < 0) {
error_propagate(errp, local_err);
+ return sock;
}
- freeaddrinfo(res);
-
if (saddr->keep_alive) {
int val = 1;
int ret = qemu_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
--
2.21.0
