[Qemu-devel] [PULL (for 2.11) v1 0/1] Merge io 2017/11/28

[Qemu-devel] [PULL (for 2.11) v1 0/1] Merge io 2017/11/28

[Daniel P. Berrange]

The following changes since commit 5e19aed59ab48ca3c7f1e2da203eed27b91bef2d:

  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.11-20171127' into staging (2017-11-27 11:16:20 +0000)

are available in the Git repository at:

  git://github.com/berrange/qemu tags/pull-qio-2017-11-28-1

for you to fetch changes up to 2d7ad7c05e762d5b10a57eba9af1bb6b41700854:

  sockets: avoid crash when cleaning up sockets for an invalid FD (2017-11-28 10:48:04 +0000)

----------------------------------------------------------------
Merge qio 2017/11/28 v1

----------------------------------------------------------------

Daniel P. Berrange (1):
  sockets: avoid crash when cleaning up sockets for an invalid FD

 util/qemu-sockets.c | 3 +++
 1 file changed, 3 insertions(+)

-- 
2.14.3

[Qemu-devel] [PULL (for 2.11) v1 1/1] sockets: avoid crash when cleaning up sockets for an invalid FD

[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>
Reviewed-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 8b75541ce4..a1cf47e625 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -1079,6 +1079,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.14.3

Re: [Qemu-devel] [PULL (for 2.11) v1 0/1] Merge io 2017/11/28

[Peter Maydell]

On 28 November 2017 at 11:23, Daniel P. Berrange <berrange@redhat.com> wrote:
> The following changes since commit 5e19aed59ab48ca3c7f1e2da203eed27b91bef2d:
>
>   Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.11-20171127' into staging (2017-11-27 11:16:20 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/berrange/qemu tags/pull-qio-2017-11-28-1
>
> for you to fetch changes up to 2d7ad7c05e762d5b10a57eba9af1bb6b41700854:
>
>   sockets: avoid crash when cleaning up sockets for an invalid FD (2017-11-28 10:48:04 +0000)
>
> ----------------------------------------------------------------
> Merge qio 2017/11/28 v1
>
> ----------------------------------------------------------------
>
> Daniel P. Berrange (1):
>   sockets: avoid crash when cleaning up sockets for an invalid FD
>
>  util/qemu-sockets.c | 3 +++
>  1 file changed, 3 insertions(+)

Applied, thanks.

-- PMM