[Qemu-commits] [qemu/qemu] 4577b0: slirp: Check qemu_socket() return value in udp_lis...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 4577b09a278fe9134ecb9192c2ae2ed67a0d0aa7
      
https://github.com/qemu/qemu/commit/4577b09a278fe9134ecb9192c2ae2ed67a0d0aa7
  Author: Peter Maydell <address@hidden>
  Date:   2017-02-26 (Sun, 26 Feb 2017)

  Changed paths:
    M slirp/udp.c

  Log Message:
  -----------
  slirp: Check qemu_socket() return value in udp_listen()

Check the return value from qemu_socket() rather than trying to
pass it to bind() as an fd argument even if it's negative.
This wouldn't have caused any negative consequences, because
it won't be a valid fd number and the bind call will fail;
but Coverity complains (CID 1005723).

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>


  Commit: 70f2e64e4dde21ba8b2e8d3fd682533c89a53487
      
https://github.com/qemu/qemu/commit/70f2e64e4dde21ba8b2e8d3fd682533c89a53487
  Author: Peter Maydell <address@hidden>
  Date:   2017-02-26 (Sun, 26 Feb 2017)

  Changed paths:
    M slirp/mbuf.c

  Log Message:
  -----------
  slirp: Convert mbufs to use g_malloc() and g_free()

The mbuf code currently doesn't check the result of doing a malloc()
or realloc() of its data (spotted by Coverity, CID 1238946).
Since the m_inc() API assumes that extending an mbuf must succeed,
just convert to g_malloc() and g_free().

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>


  Commit: bd5d2353aa69e68e45d8a89787bab17c155e9e24
      
https://github.com/qemu/qemu/commit/bd5d2353aa69e68e45d8a89787bab17c155e9e24
  Author: Peter Maydell <address@hidden>
  Date:   2017-02-26 (Sun, 26 Feb 2017)

  Changed paths:
    M slirp/socket.c

  Log Message:
  -----------
  slirp: tcp_listen(): Don't try to close() an fd we never opened

Coverity points out (CID 1005725) that an error-exit path in tcp_listen()
will try to close(s) even if the reason it got there was that the
qemu_socket() failed and s was never opened.  Not only that, this isn't even
the right function to use, because we need closesocket() to do the right
thing on Windows.  Change to using the right function and only calling it if
needed.

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>


  Commit: 685783c5b69c83c942d1fc21679311eeb8f79ab9
      
https://github.com/qemu/qemu/commit/685783c5b69c83c942d1fc21679311eeb8f79ab9
  Author: Peter Maydell <address@hidden>
  Date:   2017-02-26 (Sun, 26 Feb 2017)

  Changed paths:
    M slirp/mbuf.c
    M slirp/socket.c
    M slirp/udp.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into 
staging

slirp updates

# gpg: Signature made Sun 26 Feb 2017 14:40:00 GMT
# gpg:                using RSA key 0xB0A51BF58C9179C5
# gpg: Good signature from "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 900C B024 B679 31D4 0F82  304B D017 8C76 7D06 9EE6
#      Subkey fingerprint: AEBF 7448 FAB9 453A 4552  390E B0A5 1BF5 8C91 79C5

* remotes/thibault/tags/samuel-thibault:
  slirp: tcp_listen(): Don't try to close() an fd we never opened
  slirp: Convert mbufs to use g_malloc() and g_free()
  slirp: Check qemu_socket() return value in udp_listen()

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/6b4e463ff352...685783c5b69c