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/10-xen-pt-add-a-few-PCI-config-space-field-descriptions-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/10-xen-pt-add-a-few-PCI-config-space-field-descriptions-CVE-2015-4106.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/10-xen-pt-add-a-few-PCI-config-space-field-descriptions-CVE-2015-4106.patch | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/10-xen-pt-add-a-few-PCI-config-space-field-descriptions-CVE-2015-4106.patch b/meta/recipes-devtools/qemu/qemu/10-xen-pt-add-a-few-PCI-config-space-field-descriptions-CVE-2015-4106.patch new file mode 100644 index 0000000000..f30b40a93e --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/10-xen-pt-add-a-few-PCI-config-space-field-descriptions-CVE-2015-4106.patch | |||
@@ -0,0 +1,77 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
4 | |||
5 | From a88a3f887181605f4487a22bdfb7d87ffafde5d9 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: add a few PCI config space field descriptions | ||
9 | Bug-Debian: http://bugs.debian.org/787547 | ||
10 | |||
11 | Since the next patch will turn all not explicitly described fields | ||
12 | read-only by default, those fields that have guest writable bits need | ||
13 | to be given explicit descriptors. | ||
14 | |||
15 | This is a preparatory patch for XSA-131. | ||
16 | |||
17 | Signed-off-by: Jan Beulich <jbeulich@suse.com> | ||
18 | --- | ||
19 | hw/xen/xen_pt_config_init.c | 28 ++++++++++++++++++++++++++++ | ||
20 | 1 file changed, 28 insertions(+) | ||
21 | |||
22 | diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c | ||
23 | index efd8bac..19f926b 100644 | ||
24 | --- a/hw/xen/xen_pt_config_init.c | ||
25 | +++ b/hw/xen/xen_pt_config_init.c | ||
26 | @@ -754,6 +754,15 @@ static XenPTRegInfo xen_pt_emu_reg_vpd[] = { | ||
27 | .u.b.write = xen_pt_byte_reg_write, | ||
28 | }, | ||
29 | { | ||
30 | + .offset = PCI_VPD_ADDR, | ||
31 | + .size = 2, | ||
32 | + .ro_mask = 0x0003, | ||
33 | + .emu_mask = 0x0003, | ||
34 | + .init = xen_pt_common_reg_init, | ||
35 | + .u.w.read = xen_pt_word_reg_read, | ||
36 | + .u.w.write = xen_pt_word_reg_write, | ||
37 | + }, | ||
38 | + { | ||
39 | .size = 0, | ||
40 | }, | ||
41 | }; | ||
42 | @@ -889,6 +898,16 @@ static XenPTRegInfo xen_pt_emu_reg_pcie[] = { | ||
43 | .u.w.read = xen_pt_word_reg_read, | ||
44 | .u.w.write = xen_pt_word_reg_write, | ||
45 | }, | ||
46 | + /* Device Status reg */ | ||
47 | + { | ||
48 | + .offset = PCI_EXP_DEVSTA, | ||
49 | + .size = 2, | ||
50 | + .res_mask = 0xFFC0, | ||
51 | + .ro_mask = 0x0030, | ||
52 | + .init = xen_pt_common_reg_init, | ||
53 | + .u.w.read = xen_pt_word_reg_read, | ||
54 | + .u.w.write = xen_pt_word_reg_write, | ||
55 | + }, | ||
56 | /* Link Control reg */ | ||
57 | { | ||
58 | .offset = PCI_EXP_LNKCTL, | ||
59 | @@ -900,6 +919,15 @@ static XenPTRegInfo xen_pt_emu_reg_pcie[] = { | ||
60 | .u.w.read = xen_pt_word_reg_read, | ||
61 | .u.w.write = xen_pt_word_reg_write, | ||
62 | }, | ||
63 | + /* Link Status reg */ | ||
64 | + { | ||
65 | + .offset = PCI_EXP_LNKSTA, | ||
66 | + .size = 2, | ||
67 | + .ro_mask = 0x3FFF, | ||
68 | + .init = xen_pt_common_reg_init, | ||
69 | + .u.w.read = xen_pt_word_reg_read, | ||
70 | + .u.w.write = xen_pt_word_reg_write, | ||
71 | + }, | ||
72 | /* Device Control 2 reg */ | ||
73 | { | ||
74 | .offset = 0x28, | ||
75 | -- | ||
76 | 2.1.4 | ||
77 | |||