[Qemu-commits] [qemu/qemu] 22e4a2: Fix linux-user crashes in ioctl(SIOCGIFCONF) when ...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 22e4a267a6627e5b5b1b13bfc1b92445775704be
      
https://github.com/qemu/qemu/commit/22e4a267a6627e5b5b1b13bfc1b92445775704be
  Author: Kan Li <address@hidden>
  Date:   2019-02-07 (Thu, 07 Feb 2019)

  Changed paths:
    M linux-user/syscall.c

  Log Message:
  -----------
  Fix linux-user crashes in ioctl(SIOCGIFCONF) when ifc_buf is NULL.

Summary:
This is to fix bug https://bugs.launchpad.net/qemu/+bug/1796754.
It is valid for ifc_buf to be NULL according to
http://man7.org/linux/man-pages/man7/netdevice.7.html.

Signed-off-by: Kan Li <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Message-Id: <address@hidden>
[lv: fix errors reported by checkpatch.pl]
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 9d0bd0cdd011edf15949ecdf08c25d8385028983
      
https://github.com/qemu/qemu/commit/9d0bd0cdd011edf15949ecdf08c25d8385028983
  Author: Peter Maydell <address@hidden>
  Date:   2019-02-07 (Thu, 07 Feb 2019)

  Changed paths:
    M linux-user/syscall.c

  Log Message:
  -----------
  linux-user: Check sscanf return value in open_net_route()

Coverity warns (CID 1390634) that open_net_route() is not
checking the return value from sscanf(), which means that
it might then use values that aren't initialized.

Errors here should in general not happen since we're passing
an assumed-good /proc/net/route from the host kernel, but
if we do fail to parse a line then just skip it in the output
we pass to the guest.

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 0f5faca78267beb16d8a096e9729f39d552e5c14
      
https://github.com/qemu/qemu/commit/0f5faca78267beb16d8a096e9729f39d552e5c14
  Author: Laurent Vivier <address@hidden>
  Date:   2019-02-07 (Thu, 07 Feb 2019)

  Changed paths:
    M linux-user/fd-trans.c

  Log Message:
  -----------
  linux-user: add new netlink types

Add QEMU_IFLA_MIN_MTU, QEMU_IFLA_MAX_MTU (from linux v4.19)
    QEMU_IFLA_BRPORT_ISOLATED (from linux v4.18) and
    QEMU_IFLA_BRPORT_BACKUP_PORT (from linux v4.19).

These new types fix this error flow with sudo:
...
Unknown host QEMU_IFLA type: 50
Unknown host QEMU_IFLA type: 51
Unknown QEMU_IFLA_BRPORT type 33
...

Signed-off-by: Laurent Vivier <address@hidden>
Message-Id: <address@hidden>


  Commit: ff372bb5c469e14d6d64f788710b7c3e37c12e01
      
https://github.com/qemu/qemu/commit/ff372bb5c469e14d6d64f788710b7c3e37c12e01
  Author: Peter Maydell <address@hidden>
  Date:   2019-02-07 (Thu, 07 Feb 2019)

  Changed paths:
    M linux-user/fd-trans.c
    M linux-user/syscall.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/vivier2/tags/linux-user-for-4.0-pull-request' into staging

- add new netlink type from linux v4.18 and v4.19
- fix coverity warning (CID 1390634)
- fix ioctl(SIOCGIFCONF) crash

# gpg: Signature made Thu 07 Feb 2019 13:12:53 GMT
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <address@hidden>" [full]
# gpg:                 aka "Laurent Vivier <address@hidden>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <address@hidden>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/linux-user-for-4.0-pull-request:
  linux-user: add new netlink types
  linux-user: Check sscanf return value in open_net_route()
  Fix linux-user crashes in ioctl(SIOCGIFCONF) when ifc_buf is NULL.

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


Compare: https://github.com/qemu/qemu/compare/d55451dcdee0...ff372bb5c469