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