[Qemu-commits] [qemu/qemu] a7f85e: virtio-gpu: fix unmap in error path

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a7f85e03b94ffaca75332cddf06426fc85ac611a
      
https://github.com/qemu/qemu/commit/a7f85e03b94ffaca75332cddf06426fc85ac611a
  Author: Gerd Hoffmann <address@hidden>
  Date:   2019-07-03 (Wed, 03 Jul 2019)

  Changed paths:
    M hw/display/virtio-gpu.c

  Log Message:
  -----------
  virtio-gpu: fix unmap in error path

We land here in case not everything we've asked for could be mapped.
So unmap only the bytes which have actually been mapped.

Also we didn't access anything, so acces_len can be 0.

Reported-by: Laszlo Ersek <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Li Qiang <address@hidden>
Message-id: address@hidden


  Commit: b0ee78ff31617937f44161bde7515a67c88748c7
      
https://github.com/qemu/qemu/commit/b0ee78ff31617937f44161bde7515a67c88748c7
  Author: Li Qiang <address@hidden>
  Date:   2019-07-03 (Wed, 03 Jul 2019)

  Changed paths:
    M hw/display/virtio-gpu.c

  Log Message:
  -----------
  virtio-gpu: check if the resource already exists in virtio_gpu_load()

While loading virtio-gpu, the data can be malicious, we
should check if the resource already exists.

Signed-off-by: Li Qiang <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 41742927ee37527462a13160380860653d4f1c84
      
https://github.com/qemu/qemu/commit/41742927ee37527462a13160380860653d4f1c84
  Author: Peter Maydell <address@hidden>
  Date:   2019-07-03 (Wed, 03 Jul 2019)

  Changed paths:
    M hw/display/ati.c
    M hw/display/ati_int.h
    M hw/i2c/bitbang_i2c.c
    M hw/i2c/ppc4xx_i2c.c
    M hw/i2c/versatile_i2c.c
    M include/hw/i2c/bitbang_i2c.h
    M include/hw/i2c/ppc4xx_i2c.h

  Log Message:
  -----------
  hw/i2c/bitbang_i2c: Use in-place rather than malloc'd bitbang_i2c_interface 
struct

Currently the bitbang_i2c_init() function allocates a
bitbang_i2c_interface struct which it returns.  This is unfortunate
because it means that if the function is used from a DeviceState
init method then the memory will be leaked by an "init then delete"
cycle, as used by the qmp/hmp commands that list device properties.

Since three out of four of the uses of this function are in
device init methods, switch the function to do an in-place
initialization of a struct that can be embedded in the
device state struct of the caller.

This fixes LeakSanitizer leak warnings that have appeared in the
patchew configuration (which only tries to run the sanitizers
for the x86_64-softmmu target) now that we use the bitbang-i2c
code in an x86-64 config.

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: BALATON Zoltan <address@hidden>
Tested-by: BALATON Zoltan <address@hidden>
Acked-by: David Gibson <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 0a87fd693d4e955a6877a2166b65bb7b7192aaaa
      
https://github.com/qemu/qemu/commit/0a87fd693d4e955a6877a2166b65bb7b7192aaaa
  Author: Gerd Hoffmann <address@hidden>
  Date:   2019-07-03 (Wed, 03 Jul 2019)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Add ati vgabios to INSTALL_BLOBS.

Fixes: 0cca7e7bfd6c81cc3c29ec2b3a0a98954c4ba71a
Reported-by: Bruce Rogers <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden


  Commit: f0577c616cde85f8bc06da2b2db705ca2fffae49
      
https://github.com/qemu/qemu/commit/f0577c616cde85f8bc06da2b2db705ca2fffae49
  Author: Peter Maydell <address@hidden>
  Date:   2019-07-03 (Wed, 03 Jul 2019)

  Changed paths:
    M Makefile
    M hw/display/ati.c
    M hw/display/ati_int.h
    M hw/display/virtio-gpu.c
    M hw/i2c/bitbang_i2c.c
    M hw/i2c/ppc4xx_i2c.c
    M hw/i2c/versatile_i2c.c
    M include/hw/i2c/bitbang_i2c.h
    M include/hw/i2c/ppc4xx_i2c.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190703-pull-request' 
into staging

vga: virtio fixes, bitbang i2c asan fix, install ati vgabios.

# gpg: Signature made Wed 03 Jul 2019 09:53:44 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>" [full]
# gpg:                 aka "Gerd Hoffmann <address@hidden>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/vga-20190703-pull-request:
  Add ati vgabios to INSTALL_BLOBS.
  hw/i2c/bitbang_i2c: Use in-place rather than malloc'd bitbang_i2c_interface 
struct
  virtio-gpu: check if the resource already exists in virtio_gpu_load()
  virtio-gpu: fix unmap in error path

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


Compare: https://github.com/qemu/qemu/compare/c204e342e861...f0577c616cde