diff options
author | Kai Kang <kai.kang@windriver.com> | 2015-06-18 17:02:42 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-01 21:19:41 +0100 |
commit | 328d35b53db61c86717c68cc564a790ccfa2956c (patch) | |
tree | 6feab80e4eb7b1df81c6d6fdad6977726ed0f442 /meta/recipes-devtools/qemu/qemu/05-xen-pt-consolidate-PM-capability-emu_mask-CVE-2015-4106.patch | |
parent | 2adb210c8cc5a11bb899e7dc76c31159ff3d4116 (diff) | |
download | poky-328d35b53db61c86717c68cc564a790ccfa2956c.tar.gz |
qemu: backport patches to fix CVE issues
Backport patches to fix CVE-2015-4103, CVE-2015-4104, CVE-2015-4105 and
CVE-2015-4106. These patches are from debian, but they are originally
from:
http://git.qemu.org/?p=qemu.git;a=shortlog;h=c25bbf1
(From OE-Core master rev: 496b3ffba6755bb76709c88cf81399c9d23f830a)
(From OE-Core rev: 29746e78ca000f4464c8e0a1da55c77e02c651e4)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Refresh the following patches to apply cleanly to our qemu-2.2.0:
07-xen-pt-split-out-calculation-of-throughable-mask-CVE-2015-4106.patch
10-xen-pt-add-a-few-PCI-config-space-field-descriptions-CVE-2015-4106.patch
Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/05-xen-pt-consolidate-PM-capability-emu_mask-CVE-2015-4106.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/05-xen-pt-consolidate-PM-capability-emu_mask-CVE-2015-4106.patch | 86 |
1 files changed, 86 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/05-xen-pt-consolidate-PM-capability-emu_mask-CVE-2015-4106.patch b/meta/recipes-devtools/qemu/qemu/05-xen-pt-consolidate-PM-capability-emu_mask-CVE-2015-4106.patch new file mode 100644 index 0000000000..e9e4fccb4d --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/05-xen-pt-consolidate-PM-capability-emu_mask-CVE-2015-4106.patch | |||
@@ -0,0 +1,86 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
4 | |||
5 | From d61bb2482dc0c7426f451f23ba7e2748ae2cc06d Mon Sep 17 00:00:00 2001 | ||
6 | From: Jan Beulich <jbeulich@suse.com> | ||
7 | Date: Tue, 2 Jun 2015 15:07:01 +0000 | ||
8 | Subject: xen/pt: consolidate PM capability emu_mask | ||
9 | Bug-Debian: http://bugs.debian.org/787547 | ||
10 | |||
11 | There's no point in xen_pt_pmcsr_reg_{read,write}() each ORing | ||
12 | PCI_PM_CTRL_STATE_MASK and PCI_PM_CTRL_NO_SOFT_RESET into a local | ||
13 | emu_mask variable - we can have the same effect by setting the field | ||
14 | descriptor's emu_mask member suitably right away. Note that | ||
15 | xen_pt_pmcsr_reg_write() is being retained in order to allow later | ||
16 | patches to be less intrusive. | ||
17 | |||
18 | This is a preparatory patch for XSA-131. | ||
19 | |||
20 | Signed-off-by: Jan Beulich <jbeulich@suse.com> | ||
21 | Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> | ||
22 | Acked-by: Ian Campbell <ian.campbell@citrix.com> | ||
23 | --- | ||
24 | hw/xen/xen_pt_config_init.c | 25 ++++--------------------- | ||
25 | 1 file changed, 4 insertions(+), 21 deletions(-) | ||
26 | |||
27 | diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c | ||
28 | index 436d0fd..516236a 100644 | ||
29 | --- a/hw/xen/xen_pt_config_init.c | ||
30 | +++ b/hw/xen/xen_pt_config_init.c | ||
31 | @@ -933,38 +933,21 @@ static XenPTRegInfo xen_pt_emu_reg_pcie[] = { | ||
32 | * Power Management Capability | ||
33 | */ | ||
34 | |||
35 | -/* read Power Management Control/Status register */ | ||
36 | -static int xen_pt_pmcsr_reg_read(XenPCIPassthroughState *s, XenPTReg *cfg_entry, | ||
37 | - uint16_t *value, uint16_t valid_mask) | ||
38 | -{ | ||
39 | - XenPTRegInfo *reg = cfg_entry->reg; | ||
40 | - uint16_t valid_emu_mask = reg->emu_mask; | ||
41 | - | ||
42 | - valid_emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; | ||
43 | - | ||
44 | - valid_emu_mask = valid_emu_mask & valid_mask; | ||
45 | - *value = XEN_PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); | ||
46 | - | ||
47 | - return 0; | ||
48 | -} | ||
49 | /* write Power Management Control/Status register */ | ||
50 | static int xen_pt_pmcsr_reg_write(XenPCIPassthroughState *s, | ||
51 | XenPTReg *cfg_entry, uint16_t *val, | ||
52 | uint16_t dev_value, uint16_t valid_mask) | ||
53 | { | ||
54 | XenPTRegInfo *reg = cfg_entry->reg; | ||
55 | - uint16_t emu_mask = reg->emu_mask; | ||
56 | uint16_t writable_mask = 0; | ||
57 | uint16_t throughable_mask = 0; | ||
58 | |||
59 | - emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; | ||
60 | - | ||
61 | /* modify emulate register */ | ||
62 | - writable_mask = emu_mask & ~reg->ro_mask & valid_mask; | ||
63 | + writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; | ||
64 | cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); | ||
65 | |||
66 | /* create value for writing to I/O device register */ | ||
67 | - throughable_mask = ~emu_mask & valid_mask; | ||
68 | + throughable_mask = ~reg->emu_mask & valid_mask; | ||
69 | *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); | ||
70 | |||
71 | return 0; | ||
72 | @@ -1000,9 +983,9 @@ static XenPTRegInfo xen_pt_emu_reg_pm[] = { | ||
73 | .size = 2, | ||
74 | .init_val = 0x0008, | ||
75 | .ro_mask = 0xE1FC, | ||
76 | - .emu_mask = 0x8100, | ||
77 | + .emu_mask = 0x810B, | ||
78 | .init = xen_pt_common_reg_init, | ||
79 | - .u.w.read = xen_pt_pmcsr_reg_read, | ||
80 | + .u.w.read = xen_pt_word_reg_read, | ||
81 | .u.w.write = xen_pt_pmcsr_reg_write, | ||
82 | }, | ||
83 | { | ||
84 | -- | ||
85 | 2.1.4 | ||
86 | |||