]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/jnsnow/tags/cve-2015-5154-pull-request' into...
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 27 Jul 2015 12:10:00 +0000 (13:10 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 27 Jul 2015 12:10:00 +0000 (13:10 +0100)
commite40db4c6d391419c0039fe274c74df32a6ca1a28
treeefca83e551a1e5af9b2fa90b87ccfb50e0f85477
parentf793d97e454a56d17e404004867985622ca1a63b
parentcb72cba83021fa42719e73a5249c12096a4d1cfc
Merge remote-tracking branch 'remotes/jnsnow/tags/cve-2015-5154-pull-request' into staging

# gpg: Signature made Mon Jul 27 13:01:10 2015 BST using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
#      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E

* remotes/jnsnow/tags/cve-2015-5154-pull-request:
  ide: Clear DRQ after handling all expected accesses
  ide/atapi: Fix START STOP UNIT command completion
  ide: Check array bounds before writing to io_buffer (CVE-2015-5154)

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