[Qemu-commits] [qemu/qemu] c25119: hw/arm/orangepi: check for potential NULL pointer ...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: c251191eae40e0e26680d0d8a8a065735acadef8
      
https://github.com/qemu/qemu/commit/c251191eae40e0e26680d0d8a8a065735acadef8
  Author: Niek Linnenbank <address@hidden>
  Date:   2020-03-30 (Mon, 30 Mar 2020)

  Changed paths:
    M hw/arm/orangepi.c

  Log Message:
  -----------
  hw/arm/orangepi: check for potential NULL pointer when calling 
blk_is_available

The Orange Pi PC initialization function needs to verify that the SD card
block backend is usable before calling the Boot ROM setup routine. When
calling blk_is_available() the input parameter should not be NULL.
This commit ensures that blk_is_available is only called with non-NULL input.

Reported-by: Peter Maydell <address@hidden>
Signed-off-by: Niek Linnenbank <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 34d8df2a1d8cd9f24e29cc9b27c233da471b2ad1
      
https://github.com/qemu/qemu/commit/34d8df2a1d8cd9f24e29cc9b27c233da471b2ad1
  Author: Niek Linnenbank <address@hidden>
  Date:   2020-03-30 (Mon, 30 Mar 2020)

  Changed paths:
    M hw/misc/allwinner-h3-dramc.c

  Log Message:
  -----------
  hw/misc/allwinner-h3-dramc: enforce 64-bit multiply when calculating row 
mirror address

The allwinner_h3_dramc_map_rows function simulates row addressing behavior
when bootloader software attempts to detect the amount of available SDRAM.

Currently the line that calculates the 64-bit address of the mirrored row
uses a signed 32-bit multiply operation that in theory could result in the
upper 32-bit be all 1s. This commit ensures that the row mirror address
is calculated using only 64-bit operations.

Reported-by: Peter Maydell <address@hidden>
Signed-off-by: Niek Linnenbank <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>


  Commit: e22684e34d41d4ea24ec31602a75f1224eeb1e12
      
https://github.com/qemu/qemu/commit/e22684e34d41d4ea24ec31602a75f1224eeb1e12
  Author: Peter Maydell <address@hidden>
  Date:   2020-03-30 (Mon, 30 Mar 2020)

  Changed paths:
    M docs/conf.py

  Log Message:
  -----------
  docs/conf.py: Raise ConfigError for bad Sphinx Python version

Raise ConfigError rather than VersionRequirementError when we detect
that the Python being used by Sphinx is too old.

Currently the way we flag the Python version problem up to the user
causes Sphinx to print an unnecessary Python stack trace as well as
the information about the problem; in most versions of Sphinx this is
unavoidable.

The upstream Sphinx developers kindly added a feature to allow
conf.py to report errors to the user without the backtrace:
  
https://github.com/sphinx-doc/sphinx/commit/be608ca2313fc08eb842f3dc19d0f5d2d8227d08
but the exception type they chose for this was ConfigError.

Switch to ConfigError, which won't make any difference with currently
deployed Sphinx versions, but will be prettier one day when the user
is using a Sphinx version with the new feature.

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: John Snow <address@hidden>
Message-id: address@hidden


  Commit: 63fef6287e555651e1a27d595ad677f21e04de32
      
https://github.com/qemu/qemu/commit/63fef6287e555651e1a27d595ad677f21e04de32
  Author: Peter Maydell <address@hidden>
  Date:   2020-03-30 (Mon, 30 Mar 2020)

  Changed paths:
    M hw/arm/xlnx-zynqmp.c

  Log Message:
  -----------
  hw/arm/xlnx-zynqmp.c: Avoid memory leak in error-return path

In xlnx_zynqmp_realize() if the attempt to realize the SD
controller object fails then the error-return path will leak
the 'bus_name' string. Fix this by deferring the allocation
until after the realize has succeeded.

Fixes: Coverity CID 1421911
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Message-id: address@hidden


  Commit: 660b4e70422bd19b09fa979733645ad6a55d88f2
      
https://github.com/qemu/qemu/commit/660b4e70422bd19b09fa979733645ad6a55d88f2
  Author: Peter Maydell <address@hidden>
  Date:   2020-03-30 (Mon, 30 Mar 2020)

  Changed paths:
    M hw/arm/xlnx-zynqmp.c

  Log Message:
  -----------
  hw/arm/xlnx-zynqmp.c: Add missing error-propagation code

In some places in xlnx_zynqmp_realize() we were putting an
error into our local Error*, but forgetting to check for
failure and pass it back to the caller. Add the missing code.

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Message-id: address@hidden


  Commit: 88828bf133b64b7a860c166af3423ef1a47c5d3b
      
https://github.com/qemu/qemu/commit/88828bf133b64b7a860c166af3423ef1a47c5d3b
  Author: Changbin Du <address@hidden>
  Date:   2020-03-30 (Mon, 30 Mar 2020)

  Changed paths:
    M target/arm/helper.c

  Log Message:
  -----------
  target/arm: fix incorrect current EL bug in aarch32 exception emulation

The arm_current_el() should be invoked after mode switching. Otherwise, we
get a wrong current EL value, since current EL is also determined by
current mode.

Fixes: 4a2696c0d4 ("target/arm: Set PAN bit as required on exception entry")
Signed-off-by: Changbin Du <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 83019e81d1002650947c3e992508cdab7b89e3f5
      
https://github.com/qemu/qemu/commit/83019e81d1002650947c3e992508cdab7b89e3f5
  Author: Peter Maydell <address@hidden>
  Date:   2020-03-30 (Mon, 30 Mar 2020)

  Changed paths:
    M docs/conf.py
    M hw/arm/orangepi.c
    M hw/arm/xlnx-zynqmp.c
    M hw/misc/allwinner-h3-dramc.c
    M target/arm/helper.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200330' 
into staging

target-arm queue:
 * hw/arm/orangepi: check for potential NULL pointer when calling 
blk_is_available
 * hw/misc/allwinner-h3-dramc: enforce 64-bit multiply when calculating row 
mirror address
 * docs/conf.py: Raise ConfigError for bad Sphinx Python version
 * hw/arm/xlnx-zynqmp.c: Avoid memory leak in error-return path
 * hw/arm/xlnx-zynqmp.c: Add missing error-propagation code
 * target/arm: fix incorrect current EL bug in aarch32 exception emulation

# gpg: Signature made Mon 30 Mar 2020 14:36:02 BST
# gpg:                using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
# gpg:                issuer "address@hidden"
# gpg: Good signature from "Peter Maydell <address@hidden>" [ultimate]
# gpg:                 aka "Peter Maydell <address@hidden>" [ultimate]
# gpg:                 aka "Peter Maydell <address@hidden>" [ultimate]
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20200330:
  target/arm: fix incorrect current EL bug in aarch32 exception emulation
  hw/arm/xlnx-zynqmp.c: Add missing error-propagation code
  hw/arm/xlnx-zynqmp.c: Avoid memory leak in error-return path
  docs/conf.py: Raise ConfigError for bad Sphinx Python version
  hw/misc/allwinner-h3-dramc: enforce 64-bit multiply when calculating row 
mirror address
  hw/arm/orangepi: check for potential NULL pointer when calling 
blk_is_available

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


Compare: https://github.com/qemu/qemu/compare/f9fe8450fa7c...83019e81d100