]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
Merge remote-tracking branch 'remotes/kraxel/tags/pull-cve-2014-8106-20141204-1'...
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 4 Dec 2014 12:22:46 +0000 (12:22 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 4 Dec 2014 12:22:46 +0000 (12:22 +0000)
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>

Trivial merge