util/qemu-sockets: fix keep_alive handling in inet_connect_saddr
PATCH 1/1 util/qemu-sockets: fix keep_alive handling in inet_connect_saddr
In "if (saddr->keep_alive) {" we may already be on error path, with invalid sock < 0. Fix it by returning error earlier.
--- util/qemu-sockets.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
util/qemu-sockets.c +3 -2
@@ -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,
Signature · 1 line
2.18.0
Quoted 9 lines · Vladimir Sementsov-Ogievskiy
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)Suggested-by Peter Maydell <[email protected]>Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- util/qemu-sockets.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 9 lines · Vladimir Sementsov-Ogievskiy
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)Suggested-by Peter Maydell <[email protected]>Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- util/qemu-sockets.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Quoted 4 lines · Daniel P. Berrangé
Quoted 3 lines · Vladimir Sementsov-Ogievskiy
In "if (
saddr->keep_alive) {" we may already be on error path, with invalid sock < 0. Fix it by returning error earlier.
Quoted 8 lines
Quoted 6 lines
Reported-by Coverity (CID 1405300)Suggested-by Peter Maydell <[email protected]>Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- util/qemu-sockets.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)Reviewed-by Daniel P. Berrangé <[email protected]>
Thanks. Will queue through my NBD tree, since that's where the original problem was introduced.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Quoted 12 lines · Eric Blake
Quoted 11 lines · Daniel P. Berrangé
Quoted 9 lines · Vladimir Sementsov-Ogievskiy
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)Suggested-by Peter Maydell <[email protected]>Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- util/qemu-sockets.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Quoted 5 lines
Quoted 1 line
Reviewed-by Daniel P. Berrangé <[email protected]>Thanks. Will queue through my NBD tree, since that's where the original problem was introduced.
Please add when queueing:
Signature · 2 lines
Best regards, Vladimir
Quoted 15 lines · Vladimir Sementsov-Ogievskiy
Quoted 14 lines · Eric Blake
Quoted 12 lines · Daniel P. Berrangé
Quoted 9 lines · Vladimir Sementsov-Ogievskiy
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)Suggested-by Peter Maydell <[email protected]>Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>---
util/qemu-sockets.c| 5 +++--1 file changed, 3 insertions(+), 2 deletions(-)Reviewed-by Daniel P. Berrangé <[email protected]>
Quoted 8 lines
Quoted 3 lines
Thanks. Will queue through my NBD tree, since that's where the original problem was introduced.
Please add when queueing:
Fixes aec21d31756cbd
Hmm, don't you forget? Don't see it neither in pull request nor in your branches.
Signature · 2 lines
Best regards, Vladimir
Quoted 20 lines · Vladimir Sementsov-Ogievskiy
Quoted 19 lines · Vladimir Sementsov-Ogievskiy
Quoted 17 lines · Eric Blake
Quoted 4 lines · Daniel P. Berrangé
Quoted 3 lines · Vladimir Sementsov-Ogievskiy
In "if (
saddr->keep_alive) {" we may already be on error path, with invalid sock < 0. Fix it by returning error earlier.Quoted 8 lines
Quoted 6 lines
Reported-by Coverity (CID 1405300)Suggested-by Peter Maydell <[email protected]>Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>---
util/qemu-sockets.c| 5 +++--1 file changed, 3 insertions(+), 2 deletions(-)Reviewed-by Daniel P. Berrangé <[email protected]>Thanks. Will queue through my NBD tree, since that's where the original problem was introduced.
Quoted 6 lines
Quoted 4 lines
Please add when queueing:
Fixes aec21d31756cbdHmm, don't you forget? Don't see it neither in pull request nor in your branches.
Thanks for catching this. Fixing now...
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org