From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 4 Dec 2014 12:22:46 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-cve-2014-8106-20141204-1'... 
X-Git-Tag: qemu-xen-4.6.0-rc1~42
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=54f3a180a3d0b334c55d0f61d6e9fe5c7c6d42d5;p=qemu-upstream-4.6-testing.git

Merge remote-tracking branch 'remotes/kraxel/tags/pull-cve-2014-8106-20141204-1' into staging

cirrus: fix blit region check

# gpg: Signature made Thu 04 Dec 2014 11:54:57 GMT 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-cve-2014-8106-20141204-1:
  cirrus: don't overflow CirrusVGAState->cirrus_bltbuf
  cirrus: fix blit region check

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

54f3a180a3d0b334c55d0f61d6e9fe5c7c6d42d5