diff options
author | Peter Maydell | 2016-05-09 14:42:25 +0200 |
---|---|---|
committer | Peter Maydell | 2016-05-09 14:42:25 +0200 |
commit | 53db932604dfa7bb9241d132e0173894cf54261c (patch) | |
tree | e1c9e10a7d4db068afb8d39707f66a40340f050c /include/hw/misc/imx6_src.h | |
parent | Update version for v2.6.0-rc4 release (diff) | |
parent | vga: make sure vga register setup for vbe stays intact (CVE-2016-3712). (diff) | |
download | qemu-53db932604dfa7bb9241d132e0173894cf54261c.tar.gz qemu-53db932604dfa7bb9241d132e0173894cf54261c.tar.xz qemu-53db932604dfa7bb9241d132e0173894cf54261c.zip |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20160509-1' into staging
vga security fixes (CVE-2016-3710, CVE-2016-3712)
# gpg: Signature made Mon 09 May 2016 13:39:30 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-vga-20160509-1:
vga: make sure vga register setup for vbe stays intact (CVE-2016-3712).
vga: update vga register setup on vbe changes
vga: factor out vga register setup
vga: add vbe_enabled() helper
vga: fix banked access bounds checking (CVE-2016-3710)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/misc/imx6_src.h')
0 files changed, 0 insertions, 0 deletions