diff options
author | Armin Kuster <akuster@mvista.com> | 2016-02-10 08:14:19 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-21 09:37:33 +0000 |
commit | 7fe17a2942ff03e2ec47d566fd5393f52b2eb736 (patch) | |
tree | 3e5ef0b0273a33e3db486c3ff6eb6e990ff42f4a /meta | |
parent | 50700a7da68489e6d3bc8a3336875d8274302ea9 (diff) | |
download | poky-7fe17a2942ff03e2ec47d566fd5393f52b2eb736.tar.gz |
qemu: Security fix CVE-2016-2198
CVE-2016-2198 Qemu: usb: ehci null pointer dereference in ehci_caps_write
(From OE-Core rev: 646a8cfa5398a22062541ba9c98539180ba85d58)
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/CVE-2016-2198.patch | 45 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu_2.4.0.bb | 1 |
2 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2016-2198.patch b/meta/recipes-devtools/qemu/qemu/CVE-2016-2198.patch new file mode 100644 index 0000000000..f1201f0613 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2016-2198.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From: Prasad J Pandit <address@hidden> | ||
2 | |||
3 | USB Ehci emulation supports host controller capability registers. | ||
4 | But its mmio '.write' function was missing, which lead to a null | ||
5 | pointer dereference issue. Add a do nothing 'ehci_caps_write' | ||
6 | definition to avoid it; Do nothing because capability registers | ||
7 | are Read Only(RO). | ||
8 | |||
9 | Reported-by: Zuozhi Fzz <address@hidden> | ||
10 | Signed-off-by: Prasad J Pandit <address@hidden> | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | https://lists.gnu.org/archive/html/qemu-devel/2016-01/msg05899.html | ||
14 | |||
15 | CVE: CVE-2016-2198 | ||
16 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
17 | |||
18 | --- | ||
19 | hw/usb/hcd-ehci.c | 6 ++++++ | ||
20 | 1 file changed, 6 insertions(+) | ||
21 | |||
22 | Index: qemu-2.5.0/hw/usb/hcd-ehci.c | ||
23 | =================================================================== | ||
24 | --- qemu-2.5.0.orig/hw/usb/hcd-ehci.c | ||
25 | +++ qemu-2.5.0/hw/usb/hcd-ehci.c | ||
26 | @@ -893,6 +893,11 @@ static uint64_t ehci_caps_read(void *ptr | ||
27 | return s->caps[addr]; | ||
28 | } | ||
29 | |||
30 | +static void ehci_caps_write(void *ptr, hwaddr addr, | ||
31 | + uint64_t val, unsigned size) | ||
32 | +{ | ||
33 | +} | ||
34 | + | ||
35 | static uint64_t ehci_opreg_read(void *ptr, hwaddr addr, | ||
36 | unsigned size) | ||
37 | { | ||
38 | @@ -2310,6 +2315,7 @@ static void ehci_frame_timer(void *opaqu | ||
39 | |||
40 | static const MemoryRegionOps ehci_mmio_caps_ops = { | ||
41 | .read = ehci_caps_read, | ||
42 | + .write = ehci_caps_write, | ||
43 | .valid.min_access_size = 1, | ||
44 | .valid.max_access_size = 4, | ||
45 | .impl.min_access_size = 1, | ||
diff --git a/meta/recipes-devtools/qemu/qemu_2.4.0.bb b/meta/recipes-devtools/qemu/qemu_2.4.0.bb index e6f2cf3fd3..8d47b16e64 100644 --- a/meta/recipes-devtools/qemu/qemu_2.4.0.bb +++ b/meta/recipes-devtools/qemu/qemu_2.4.0.bb | |||
@@ -19,6 +19,7 @@ SRC_URI += "file://configure-fix-Darwin-target-detection.patch \ | |||
19 | file://CVE-2015-7295_2.patch \ | 19 | file://CVE-2015-7295_2.patch \ |
20 | file://CVE-2015-7295_3.patch \ | 20 | file://CVE-2015-7295_3.patch \ |
21 | file://CVE-2016-2197.patch \ | 21 | file://CVE-2016-2197.patch \ |
22 | file://CVE-2016-2198.patch \ | ||
22 | " | 23 | " |
23 | SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" | 24 | SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" |
24 | SRC_URI[md5sum] = "186ee8194140a484a455f8e3c74589f4" | 25 | SRC_URI[md5sum] = "186ee8194140a484a455f8e3c74589f4" |