[Qemu-commits] [qemu/qemu] d52680: qxl: check release info object

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: d52680fc932efb8a2f334cc6993e705ed1e31e99
      
https://github.com/qemu/qemu/commit/d52680fc932efb8a2f334cc6993e705ed1e31e99
  Author: Prasad J Pandit <address@hidden>
  Date:   2019-05-07 (Tue, 07 May 2019)

  Changed paths:
    M hw/display/qxl.c

  Log Message:
  -----------
  qxl: check release info object

When releasing spice resources in release_resource() routine,
if release info object 'ext.info' is null, it leads to null
pointer dereference. Add check to avoid it.

Reported-by: Bugs SysSec <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 295854686eaff0edb7e27b14c8b47ca18a9f31b9
      
https://github.com/qemu/qemu/commit/295854686eaff0edb7e27b14c8b47ca18a9f31b9
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-05-07 (Tue, 07 May 2019)

  Changed paths:
    M hw/display/cirrus_vga.c

  Log Message:
  -----------
  hw/display/cirrus_vga: Update the documentation URL

The documentation URL is not working, but is backed up by the
Wayback Machine on the Internet Archive.
Replace the outdated link by a captured one.
Add another link to the VGADOC4b.ZIP archive content.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: fad691db49454f3cd64283ccc6cdf554a68c727f
      
https://github.com/qemu/qemu/commit/fad691db49454f3cd64283ccc6cdf554a68c727f
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-05-07 (Tue, 07 May 2019)

  Changed paths:
    M hw/display/cirrus_vga.c

  Log Message:
  -----------
  hw/display/cirrus_vga: Remove unused include

Commit ce3cf70edaaf split the ISA device out of the PCI one,
but forgot to remove the "hw/loader.h" header inclusion (the ISA
device calls rom_add_vga()).  Remove the now unused include.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 53b93511f1fbd9ac78e3acba4ac672eb00a2b16f
      
https://github.com/qemu/qemu/commit/53b93511f1fbd9ac78e3acba4ac672eb00a2b16f
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-05-07 (Tue, 07 May 2019)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  vl: constify VGAInterfaceInfo

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: dceb885255b8f7c79ab440ea242c9180bfaf4a84
      
https://github.com/qemu/qemu/commit/dceb885255b8f7c79ab440ea242c9180bfaf4a84
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-05-07 (Tue, 07 May 2019)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  vl: add -vga help support

Provide help output similar to other argument help handling:

$ qemu-system-x86_64 -vga help
none
std                  standard VGA (default)
cirrus               Cirrus VGA
vmware               VMWare SVGA
xenfb
qxl                  QXL VGA
virtio               Virtio VG

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 94932c95c10400acd286fd768a6b411e7ebbec8f
      
https://github.com/qemu/qemu/commit/94932c95c10400acd286fd768a6b411e7ebbec8f
  Author: Daniel P. Berrangé <address@hidden>
  Date:   2019-05-07 (Tue, 07 May 2019)

  Changed paths:
    M hw/display/qxl.c

  Log Message:
  -----------
  qxl: avoid unaligned pointer reads/writes

The SPICE_RING_PROD_ITEM() macro is initializing a local
'uint64_t *' variable to point to the 'el' field inside
the QXLReleaseRing struct. This uint64_t field is not
guaranteed aligned as the struct is packed.

Code should not take the address of fields within a
packed struct. Changing the SPICE_RING_PROD_ITEM()
macro to avoid taking the address of the field is
impractical. It is clearer to just remove the macro
and inline its functionality in the three call sites
that need it.

Signed-off-by: Daniel P. Berrangé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 349ebdd76d3a932204f5831950a2af413c29c477
      
https://github.com/qemu/qemu/commit/349ebdd76d3a932204f5831950a2af413c29c477
  Author: BALATON Zoltan <address@hidden>
  Date:   2019-05-07 (Tue, 07 May 2019)

  Changed paths:
    M hw/display/ati_2d.c

  Log Message:
  -----------
  ati-vga: Fix check for blt outside vram

Fix the check preventing calling pixman functions that would access
memory outside allocated vram. The r128 X driver sometimes seem to try
blits that span outside vram, this check prevents crashing QEMU in
that case. (The r128 X driver may have problems even on real hardware
so I'm not sure if it's a client bug or emulation problem but at least
QEMU should survive.)

Signed-off-by: BALATON Zoltan <address@hidden>
Tested-by: Andrew Randrianasulu <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 6306cae275c7091aa4e785809d956b475bfedab4
      
https://github.com/qemu/qemu/commit/6306cae275c7091aa4e785809d956b475bfedab4
  Author: Paolo Bonzini <address@hidden>
  Date:   2019-05-07 (Tue, 07 May 2019)

  Changed paths:
    M hw/display/Kconfig
    M hw/display/Makefile.objs
    A hw/display/i2c-ddc.c
    M hw/display/sii9022.c
    M hw/display/sm501.c
    M hw/i2c/Kconfig
    M hw/i2c/Makefile.objs
    R hw/i2c/i2c-ddc.c
    A include/hw/display/i2c-ddc.h
    M include/hw/display/xlnx_dp.h
    R include/hw/i2c/i2c-ddc.h

  Log Message:
  -----------
  i2c-ddc: move it to hw/display

Move it together with the other EDID code.  hw/i2c should only
include the core and the adapters, not the slaves.

Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: a6f6d24757a73f7176989134b97284a1a7df11e5
      
https://github.com/qemu/qemu/commit/a6f6d24757a73f7176989134b97284a1a7df11e5
  Author: Peter Maydell <address@hidden>
  Date:   2019-05-07 (Tue, 07 May 2019)

  Changed paths:
    M hw/display/Kconfig
    M hw/display/Makefile.objs
    M hw/display/ati_2d.c
    M hw/display/cirrus_vga.c
    A hw/display/i2c-ddc.c
    M hw/display/qxl.c
    M hw/display/sii9022.c
    M hw/display/sm501.c
    M hw/i2c/Kconfig
    M hw/i2c/Makefile.objs
    R hw/i2c/i2c-ddc.c
    A include/hw/display/i2c-ddc.h
    M include/hw/display/xlnx_dp.h
    R include/hw/i2c/i2c-ddc.h
    M vl.c

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

vga: bugfixes for qxl, cirrus, ati.
vga: add "-vga help" support.
vga: move i2c-ddc to display.

# gpg: Signature made Tue 07 May 2019 09:19:32 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-20190507-pull-request:
  i2c-ddc: move it to hw/display
  ati-vga: Fix check for blt outside vram
  qxl: avoid unaligned pointer reads/writes
  vl: add -vga help support
  vl: constify VGAInterfaceInfo
  hw/display/cirrus_vga: Remove unused include
  hw/display/cirrus_vga: Update the documentation URL
  qxl: check release info object

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


Compare: https://github.com/qemu/qemu/compare/d6de7fed802f...a6f6d24757a7