diff options
| author | Marius Bakke <[email protected]> | 2017-09-02 15:57:56 +0200 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2017-09-02 15:57:56 +0200 |
| commit | 30dfac27a5642c36e7bb1ba7966566864ba2d28d (patch) | |
| tree | 3b59623014eeea1df02cda5f926d803b9a36a828 /gnu/packages/patches/qemu-CVE-2017-8112.patch | |
| parent | d2ee294c0400ac8f2a10f10c3c9644da513a3712 (diff) | |
| parent | 65e4109cdc96fbaee088f50d0138af8acef43141 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/qemu-CVE-2017-8112.patch')
| -rw-r--r-- | gnu/packages/patches/qemu-CVE-2017-8112.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/gnu/packages/patches/qemu-CVE-2017-8112.patch b/gnu/packages/patches/qemu-CVE-2017-8112.patch deleted file mode 100644 index 88b33aa2f0..0000000000 --- a/gnu/packages/patches/qemu-CVE-2017-8112.patch +++ /dev/null @@ -1,41 +0,0 @@ -Fix CVE-2017-8112: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-8112 - -Patch copied from upstream source repository: - -http://git.qemu.org/?p=qemu.git;a=commitdiff;h=f68826989cd4d1217797251339579c57b3c0934e - -From f68826989cd4d1217797251339579c57b3c0934e Mon Sep 17 00:00:00 2001 -From: P J P <[email protected]> -Date: Tue, 25 Apr 2017 18:36:23 +0530 -Subject: [PATCH] vmw_pvscsi: check message ring page count at initialisation - -A guest could set the message ring page count to zero, resulting in -infinite loop. Add check to avoid it. - -Reported-by: YY Z <[email protected]> -Signed-off-by: P J P <[email protected]> -Message-Id: <[email protected]> -Reviewed-by: Dmitry Fleytman <[email protected]> -Signed-off-by: Paolo Bonzini <[email protected]> ---- - hw/scsi/vmw_pvscsi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c -index 75575461e2..4a106da856 100644 ---- a/hw/scsi/vmw_pvscsi.c -+++ b/hw/scsi/vmw_pvscsi.c -@@ -202,7 +202,7 @@ pvscsi_ring_init_msg(PVSCSIRingInfo *m, PVSCSICmdDescSetupMsgRing *ri) - uint32_t len_log2; - uint32_t ring_size; - -- if (ri->numPages > PVSCSI_SETUP_MSG_RING_MAX_NUM_PAGES) { -+ if (!ri->numPages || ri->numPages > PVSCSI_SETUP_MSG_RING_MAX_NUM_PAGES) { - return -1; - } - ring_size = ri->numPages * PVSCSI_MAX_NUM_MSG_ENTRIES_PER_PAGE; --- -2.13.0 - |