[Qemu-commits] [qemu/qemu] 67f328: slirp: fix segv when init failed

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 67f3280c062d622dc077246b483702096d11dcc0
      
https://github.com/qemu/qemu/commit/67f3280c062d622dc077246b483702096d11dcc0
  Author: Marc-André Lureau <address@hidden>
  Date:   2016-08-22 (Mon, 22 Aug 2016)

  Changed paths:
    M net/slirp.c

  Log Message:
  -----------
  slirp: fix segv when init failed

Since commit f6c2e66ae8c8a, slirp uses an exit notifier to call
slirp_smb_cleanup. However, if init() failed, the notifier isn't added,
and removing it will fail:

==18447== Invalid write of size 8
==18447==    at 0x7EF2B5: notifier_remove (notify.c:32)
==18447==    by 0x48E80C: qemu_remove_exit_notifier (vl.c:2661)
==18447==    by 0x6A2187: net_slirp_cleanup (slirp.c:134)
==18447==    by 0x69419D: qemu_cleanup_net_client (net.c:338)
==18447==    by 0x69445B: qemu_del_net_client (net.c:401)
==18447==    by 0x6A2B81: net_slirp_init (slirp.c:366)
==18447==    by 0x6A4241: net_init_slirp (slirp.c:865)
==18447==    by 0x695C6D: net_client_init1 (net.c:1051)
==18447==    by 0x695F6E: net_client_init (net.c:1108)
==18447==    by 0x696DBA: net_init_netdev (net.c:1498)
==18447==    by 0x7F1F99: qemu_opts_foreach (qemu-option.c:1116)
==18447==    by 0x696E60: net_init_clients (net.c:1516)
==18447==  Address 0x0 is not stack'd, malloc'd or (recently) free'd

Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: e0af5a0e8b74c674d29be3224b7ec16ba278e99c
      
https://github.com/qemu/qemu/commit/e0af5a0e8b74c674d29be3224b7ec16ba278e99c
  Author: Cao jin <address@hidden>
  Date:   2016-08-22 (Mon, 22 Aug 2016)

  Changed paths:
    M hw/net/e1000e.c

  Log Message:
  -----------
  e1000e: remove internal interrupt flag

Commit 66bf7d58 removed internal msi state flag E1000E_USE_MSI, E1000E_USE_MSIX
is not necessary too, remove it now. And interrupt flag field intr_state also
can be removed now.

CC: Dmitry Fleytman <address@hidden>
CC: Jason Wang <address@hidden>
CC: Markus Armbruster <address@hidden>
CC: Marcel Apfelbaum <address@hidden>
CC: Michael S. Tsirkin <address@hidden>
CC: Paolo Bonzini <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Acked-by: Dmitry Fleytman <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 62680fad7fd63b1f5cfd049a85993e4b24b03958
      
https://github.com/qemu/qemu/commit/62680fad7fd63b1f5cfd049a85993e4b24b03958
  Author: Peter Maydell <address@hidden>
  Date:   2016-08-22 (Mon, 22 Aug 2016)

  Changed paths:
    M hw/net/e1000e.c
    M net/slirp.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into 
staging

# gpg: Signature made Mon 22 Aug 2016 09:06:32 BST
# gpg:                using RSA key 0xEF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <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: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* remotes/jasowang/tags/net-pull-request:
  e1000e: remove internal interrupt flag
  slirp: fix segv when init failed

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


Compare: https://github.com/qemu/qemu/compare/5f9f818ea88a...62680fad7fd6