summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu/qemu/06-xen-pt-correctly-handle-PM-status-bit-CVE-2015-4106.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/06-xen-pt-correctly-handle-PM-status-bit-CVE-2015-4106.patch')
-rw-r--r--meta/recipes-devtools/qemu/qemu/06-xen-pt-correctly-handle-PM-status-bit-CVE-2015-4106.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/06-xen-pt-correctly-handle-PM-status-bit-CVE-2015-4106.patch b/meta/recipes-devtools/qemu/qemu/06-xen-pt-correctly-handle-PM-status-bit-CVE-2015-4106.patch
deleted file mode 100644
index 37758cdd58..0000000000
--- a/meta/recipes-devtools/qemu/qemu/06-xen-pt-correctly-handle-PM-status-bit-CVE-2015-4106.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1Upstream-Status: Backport
2
3Signed-off-by: Kai Kang <kai.kang@windriver.com>
4
5From c4ff1e68c621928abc680266cad0a451686c403b Mon Sep 17 00:00:00 2001
6From: Jan Beulich <jbeulich@suse.com>
7Date: Tue, 2 Jun 2015 15:07:01 +0000
8Subject: xen/pt: correctly handle PM status bit
9Bug-Debian: http://bugs.debian.org/787547
10
11xen_pt_pmcsr_reg_write() needs an adjustment to deal with the RW1C
12nature of the not passed through bit 15 (PCI_PM_CTRL_PME_STATUS).
13
14This is a preparatory patch for XSA-131.
15
16Signed-off-by: Jan Beulich <jbeulich@suse.com>
17Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
18---
19 hw/xen/xen_pt_config_init.c | 3 ++-
20 1 file changed, 2 insertions(+), 1 deletion(-)
21
22diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c
23index 516236a..027ac32 100644
24--- a/hw/xen/xen_pt_config_init.c
25+++ b/hw/xen/xen_pt_config_init.c
26@@ -948,7 +948,8 @@ static int xen_pt_pmcsr_reg_write(XenPCIPassthroughState *s,
27
28 /* create value for writing to I/O device register */
29 throughable_mask = ~reg->emu_mask & valid_mask;
30- *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask);
31+ *val = XEN_PT_MERGE_VALUE(*val, dev_value & ~PCI_PM_CTRL_PME_STATUS,
32+ throughable_mask);
33
34 return 0;
35 }
36--
372.1.4
38