[Qemu-commits] [qemu/qemu] da34fe: hw/ppc/spapr: Fix crash when specifying bad parame...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: da34fed707a3a3ffa229f4e724aea06da1b53fb0
      
https://github.com/qemu/qemu/commit/da34fed707a3a3ffa229f4e724aea06da1b53fb0
  Author: Thomas Huth <address@hidden>
  Date:   2016-04-23 (Sat, 23 Apr 2016)

  Changed paths:
    M hw/ppc/spapr.c
    M hw/ppc/spapr_pci.c

  Log Message:
  -----------
  hw/ppc/spapr: Fix crash when specifying bad parameters to 
spapr-pci-host-bridge

QEMU currently crashes when using bad parameters for the
spapr-pci-host-bridge device:

$ qemu-system-ppc64 -device 
spapr-pci-host-bridge,buid=0x123,liobn=0x321,mem_win_addr=0x1,io_win_addr=0x10
Segmentation fault

The problem is that spapr_tce_find_by_liobn() might return NULL, but
the code in spapr_populate_pci_dt() does not check for this condition
and then tries to dereference this NULL pointer.
Apart from that, the return value of spapr_populate_pci_dt() also
has to be checked for all PCI buses, not only for the last one, to
make sure we catch all errors.

Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 3123bd8ebf3749be5b6ef815229c8c9dfb13c16d
      
https://github.com/qemu/qemu/commit/3123bd8ebf3749be5b6ef815229c8c9dfb13c16d
  Author: Peter Maydell <address@hidden>
  Date:   2016-04-25 (Mon, 25 Apr 2016)

  Changed paths:
    M hw/ppc/spapr.c
    M hw/ppc/spapr_pci.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.6-20160423' into 
staging

ppc patch queue for 2016-03-23

A single fix for a bug in parameter handling for the spapr PCI host
bridge.

# gpg: Signature made Sat 23 Apr 2016 07:55:29 BST using RSA key ID 20D9B392
# gpg: Good signature from "David Gibson <address@hidden>"
# gpg:                 aka "David Gibson (Red Hat) <address@hidden>"
# gpg:                 aka "David Gibson (ozlabs.org) <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: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-2.6-20160423:
  hw/ppc/spapr: Fix crash when specifying bad parameters to 
spapr-pci-host-bridge

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


Compare: https://github.com/qemu/qemu/compare/53343338a6e7...3123bd8ebf37