diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-07-27 18:23:49 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-07-27 18:50:35 -0400 |
| commit | 7ef4119f0a4dcf32668f4f7f1ef730d35890a247 (patch) | |
| tree | 6fb24112f7806bfce8626b67f8fd2679f9a97acc /gnu/packages/patches/qemu-CVE-2015-5158.patch | |
| parent | bae877624e2dfa49d7326929167834236e35a74d (diff) | |
| download | guix-7ef4119f0a4dcf32668f4f7f1ef730d35890a247.tar.gz | |
gnu: qemu: Add fixes for CVE-2015-5154 and CVE-2015-5158.
* gnu/packages/patches/qemu-CVE-2015-5154-pt1.patch, gnu/packages/patches/qemu-CVE-2015-5154-pt2.patch, gnu/packages/patches/qemu-CVE-2015-5154-pt3.patch, gnu/packages/patches/qemu-CVE-2015-5158.patch: New files. * gnu-system.am (dist_patch_DATA): Add them. * gnu/packages/qemu.scm (qemu-headless)[source]: Add patches.
Diffstat (limited to 'gnu/packages/patches/qemu-CVE-2015-5158.patch')
| -rw-r--r-- | gnu/packages/patches/qemu-CVE-2015-5158.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/gnu/packages/patches/qemu-CVE-2015-5158.patch b/gnu/packages/patches/qemu-CVE-2015-5158.patch new file mode 100644 index 0000000000..bedbfc8fa4 --- /dev/null +++ b/gnu/packages/patches/qemu-CVE-2015-5158.patch @@ -0,0 +1,45 @@ +c170aad8b057223b1139d72e5ce7acceafab4fa9 +Author: Paolo Bonzini <pbonzini@redhat.com> +Date: Tue Jul 21 08:59:39 2015 +0200 + + scsi: fix buffer overflow in scsi_req_parse_cdb (CVE-2015-5158) + + This is a guest-triggerable buffer overflow present in QEMU 2.2.0 + and newer. scsi_cdb_length returns -1 as an error value, but the + caller does not check it. + + Luckily, the massive overflow means that QEMU will just SIGSEGV, + making the impact much smaller. + + Reported-by: Zhu Donghai (朱东海) <donghai.zdh@alibaba-inc.com> + Fixes: 1894df02811f6b79ea3ffbf1084599d96f316173 + Reviewed-by: Fam Zheng <famz@redhat.com> + Cc: qemu-stable@nongnu.org + Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> + +1 file changed, 6 insertions(+), 1 deletion(-) + hw/scsi/scsi-bus.c | 7 ++++++- + + Modified hw/scsi/scsi-bus.c +diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c +index f50b2f0..f0ae462 100644 +--- a/hw/scsi/scsi-bus.c ++++ b/hw/scsi/scsi-bus.c +@@ -1239,10 +1239,15 @@ int scsi_cdb_length(uint8_t *buf) { + int scsi_req_parse_cdb(SCSIDevice *dev, SCSICommand *cmd, uint8_t *buf) + { + int rc; ++ int len; + + cmd->lba = -1; +- cmd->len = scsi_cdb_length(buf); ++ len = scsi_cdb_length(buf); ++ if (len < 0) { ++ return -1; ++ } + ++ cmd->len = len; + switch (dev->type) { + case TYPE_TAPE: + rc = scsi_req_stream_xfer(cmd, dev, buf); + |