b5fb5e90fb
memory in rtl8139 device model xsa140-qemuu-1.patch xsa140-qemuu-2.patch xsa140-qemuu-3.patch xsa140-qemuu-4.patch xsa140-qemuu-5.patch xsa140-qemuu-6.patch xsa140-qemuu-7.patch xsa140-qemut-1.patch xsa140-qemut-2.patch xsa140-qemut-3.patch xsa140-qemut-4.patch xsa140-qemut-5.patch xsa140-qemut-6.patch xsa140-qemut-7.patch - bsc#939709 - VUL-0: XSA-139: xen: Use after free in QEMU/Xen block unplug protocol xsa139-qemuu.patch - bsc#937371 - xen vm's running after reboot xendomains-libvirtd-conflict.patch - bsc#938344 - VUL-0: CVE-2015-5154: qemu,kvm,xen: host code execution via IDE subsystem CD-ROM CVE-2015-5154-qemuu-check-array-bounds-before-writing-to-io_buffer.patch CVE-2015-5154-qemut-check-array-bounds-before-writing-to-io_buffer.patch CVE-2015-5154-qemuu-fix-START-STOP-UNIT-command-completion.patch CVE-2015-5154-qemut-fix-START-STOP-UNIT-command-completion.patch CVE-2015-5154-qemuu-clear-DRQ-after-handling-all-expected-accesses.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=371
69 lines
2.1 KiB
Diff
69 lines
2.1 KiB
Diff
From 1d3c2268f8708126a34064c2e0c1000b40e6f3e5 Mon Sep 17 00:00:00 2001
|
|
From: Kevin Wolf <kwolf@redhat.com>
|
|
Date: Wed, 3 Jun 2015 14:41:27 +0200
|
|
Subject: [PATCH 3/3] ide: Clear DRQ after handling all expected accesses
|
|
|
|
This is additional hardening against an end_transfer_func that fails to
|
|
clear the DRQ status bit. The bit must be unset as soon as the PIO
|
|
transfer has completed, so it's better to do this in a central place
|
|
instead of duplicating the code in all commands (and forgetting it in
|
|
some).
|
|
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
---
|
|
hw/ide/core.c | 16 ++++++++++++----
|
|
1 file changed, 12 insertions(+), 4 deletions(-)
|
|
|
|
Index: xen-4.2.5-testing/tools/qemu-xen-traditional-dir-remote/hw/ide.c
|
|
===================================================================
|
|
--- xen-4.2.5-testing.orig/tools/qemu-xen-traditional-dir-remote/hw/ide.c
|
|
+++ xen-4.2.5-testing/tools/qemu-xen-traditional-dir-remote/hw/ide.c
|
|
@@ -3016,8 +3016,10 @@ static void ide_data_writew(void *opaque
|
|
*(uint16_t *)p = le16_to_cpu(val);
|
|
p += 2;
|
|
s->data_ptr = p;
|
|
- if (p >= s->data_end)
|
|
+ if (p >= s->data_end) {
|
|
+ s->status &= ~DRQ_STAT;
|
|
s->end_transfer_func(s);
|
|
+ }
|
|
}
|
|
|
|
static uint32_t ide_data_readw(void *opaque, uint32_t addr)
|
|
@@ -3039,8 +3041,10 @@ static uint32_t ide_data_readw(void *opa
|
|
ret = cpu_to_le16(*(uint16_t *)p);
|
|
p += 2;
|
|
s->data_ptr = p;
|
|
- if (p >= s->data_end)
|
|
+ if (p >= s->data_end) {
|
|
+ s->status &= ~DRQ_STAT;
|
|
s->end_transfer_func(s);
|
|
+ }
|
|
return ret;
|
|
}
|
|
|
|
@@ -3062,8 +3066,10 @@ static void ide_data_writel(void *opaque
|
|
*(uint32_t *)p = le32_to_cpu(val);
|
|
p += 4;
|
|
s->data_ptr = p;
|
|
- if (p >= s->data_end)
|
|
+ if (p >= s->data_end) {
|
|
+ s->status &= ~DRQ_STAT;
|
|
s->end_transfer_func(s);
|
|
+ }
|
|
}
|
|
|
|
static uint32_t ide_data_readl(void *opaque, uint32_t addr)
|
|
@@ -3085,8 +3091,10 @@ static uint32_t ide_data_readl(void *opa
|
|
ret = cpu_to_le32(*(uint32_t *)p);
|
|
p += 4;
|
|
s->data_ptr = p;
|
|
- if (p >= s->data_end)
|
|
+ if (p >= s->data_end) {
|
|
+ s->status &= ~DRQ_STAT;
|
|
s->end_transfer_func(s);
|
|
+ }
|
|
return ret;
|
|
}
|
|
|