| commit | ea5b201a0acfb4c3029afd4e7999b4278e1351d4 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 18 Nov 2014 12:29:05 +0000 (18 12:29 +0000) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 18 Nov 2014 12:29:05 +0000 (18 12:29 +0000) | ||
| tree | 135bed3afc90dde3d2d998ef6fc0f53de48ff373 | treesnapshot (tar.gz zip) |
| parent | 444b1996cb3769d8636b223c281fb09ab89b7a31 | commitdiff |
| parent | 0be839a2701369f669532ea5884c15bead1c6e08 | commitdiff |
Merge remote-tracking branch 'remotes/amit-migration/tags/for-2.2' into staging
Fix for CVE-2014-7840, avoiding arbitrary qemu memory overwrite for
migration by Michael S. Tsirkin.
# gpg: Signature made Tue 18 Nov 2014 11:23:00 GMT using RSA key ID 854083B6
# gpg: Good signature from "Amit Shah <amit@amitshah.net>"
# gpg: aka "Amit Shah <amit@kernel.org>"
# gpg: aka "Amit Shah <amitshah@gmx.net>"
* remotes/amit-migration/tags/for-2.2:
migration: fix parameter validation on ram load
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Fix for CVE-2014-7840, avoiding arbitrary qemu memory overwrite for
migration by Michael S. Tsirkin.
# gpg: Signature made Tue 18 Nov 2014 11:23:00 GMT using RSA key ID 854083B6
# gpg: Good signature from "Amit Shah <amit@amitshah.net>"
# gpg: aka "Amit Shah <amit@kernel.org>"
# gpg: aka "Amit Shah <amitshah@gmx.net>"
* remotes/amit-migration/tags/for-2.2:
migration: fix parameter validation on ram load
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>