* [Qemu-devel] [PATCH] sockets: avoid crash when cleaning up sockets for an invalid FD
@ 2017-10-27 8:56 Daniel P. Berrange
2017-10-27 12:29 ` Dr. David Alan Gilbert
0 siblings, 1 reply; 2+ messages in thread
From: Daniel P. Berrange @ 2017-10-27 8:56 UTC (permalink / raw)
To: qemu-devel
Cc: Dr . David Alan Gilbert, Paolo Bonzini, Gerd Hoffmann,
Daniel P. Berrange
If socket_listen_cleanup is passed an invalid FD, then querying the socket
local address will fail. We must thus be prepared for the returned addr to
be NULL
Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
util/qemu-sockets.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index b47fb45885..c7fdaa63fb 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -1073,6 +1073,9 @@ void socket_listen_cleanup(int fd, Error **errp)
SocketAddress *addr;
addr = socket_local_address(fd, errp);
+ if (!addr) {
+ return;
+ }
if (addr->type == SOCKET_ADDRESS_TYPE_UNIX
&& addr->u.q_unix.path) {
--
2.13.6
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [Qemu-devel] [PATCH] sockets: avoid crash when cleaning up sockets for an invalid FD
2017-10-27 8:56 [Qemu-devel] [PATCH] sockets: avoid crash when cleaning up sockets for an invalid FD Daniel P. Berrange
@ 2017-10-27 12:29 ` Dr. David Alan Gilbert
0 siblings, 0 replies; 2+ messages in thread
From: Dr. David Alan Gilbert @ 2017-10-27 12:29 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-devel, Paolo Bonzini, Gerd Hoffmann
* Daniel P. Berrange (berrange@redhat.com) wrote:
> If socket_listen_cleanup is passed an invalid FD, then querying the socket
> local address will fail. We must thus be prepared for the returned addr to
> be NULL
>
> Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> util/qemu-sockets.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
> index b47fb45885..c7fdaa63fb 100644
> --- a/util/qemu-sockets.c
> +++ b/util/qemu-sockets.c
> @@ -1073,6 +1073,9 @@ void socket_listen_cleanup(int fd, Error **errp)
> SocketAddress *addr;
>
> addr = socket_local_address(fd, errp);
> + if (!addr) {
> + return;
> + }
>
> if (addr->type == SOCKET_ADDRESS_TYPE_UNIX
> && addr->u.q_unix.path) {
> --
> 2.13.6
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-10-27 12:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-27 8:56 [Qemu-devel] [PATCH] sockets: avoid crash when cleaning up sockets for an invalid FD Daniel P. Berrange
2017-10-27 12:29 ` Dr. David Alan Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).