[Qemu-commits] [qemu/qemu] eb398a: virtio-gpu: fix unmap the already mapped items

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: eb398a54e33ab2ac9701839be9b660af3e50a32e
      
https://github.com/qemu/qemu/commit/eb398a54e33ab2ac9701839be9b660af3e50a32e
  Author: Li Zhijian <lizhijian@cn.fujitsu.com>
  Date:   2020-09-04 (Fri, 04 Sep 2020)

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

  Log Message:
  -----------
  virtio-gpu: fix unmap the already mapped items

we go here either (!(*iov)[i].iov_base) or (len != l), so we need to consider
to unmap the 'i'th item as well when the 'i'th item is not nil

CC: Li Qiang <liq3ea@gmail.com>
Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
Message-id: 20200827035855.24354-1-lizhijian@cn.fujitsu.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>


  Commit: 5fcf787582dd911df3a971718010bfca5a20e61d
      
https://github.com/qemu/qemu/commit/5fcf787582dd911df3a971718010bfca5a20e61d
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-04 (Fri, 04 Sep 2020)

  Changed paths:
    M hw/display/cirrus_vga.c

  Log Message:
  -----------
  cirrus: handle wraparound in cirrus_invalidate_region

Code simply asserts that there is no wraparound instead of handling
it properly.  The assert() can be triggered by the guest (must be
privilidged inside the guest though).  Fix it.

Buglink: https://bugs.launchpad.net/qemu/+bug/1880189
Cc: Li Qiang <liq3ea@163.com>
Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Li Qiang <liq3ea@163.com>
Message-id: 20200901140944.24101-1-kraxel@redhat.com


  Commit: 62f9256052df85194faa33137bbe0afb1c95b6e6
      
https://github.com/qemu/qemu/commit/62f9256052df85194faa33137bbe0afb1c95b6e6
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-09-07 (Mon, 07 Sep 2020)

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

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

vga: fixes for cirrus and virtio-gpu.

# gpg: Signature made Fri 04 Sep 2020 12:26:36 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/vga-20200904-pull-request:
  cirrus: handle wraparound in cirrus_invalidate_region
  virtio-gpu: fix unmap the already mapped items

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/7c37270b3fbe...62f9256052df