qemu: Security fix CVE-2016-2198
CVE-2016-2198 Qemu: usb: ehci null pointer dereference in ehci_caps_write (From OE-Core rev: 33b5c3b4822b6bbb06ad5fdf7a120acd520f665d) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
093835335e
commit
914ff148fa
|
@ -0,0 +1,45 @@
|
|||
From: Prasad J Pandit <address@hidden>
|
||||
|
||||
USB Ehci emulation supports host controller capability registers.
|
||||
But its mmio '.write' function was missing, which lead to a null
|
||||
pointer dereference issue. Add a do nothing 'ehci_caps_write'
|
||||
definition to avoid it; Do nothing because capability registers
|
||||
are Read Only(RO).
|
||||
|
||||
Reported-by: Zuozhi Fzz <address@hidden>
|
||||
Signed-off-by: Prasad J Pandit <address@hidden>
|
||||
|
||||
Upstream-Status: Backport
|
||||
https://lists.gnu.org/archive/html/qemu-devel/2016-01/msg05899.html
|
||||
|
||||
CVE: CVE-2016-2198
|
||||
Signed-off-by: Armin Kuster <akuster@mvista.com>
|
||||
|
||||
---
|
||||
hw/usb/hcd-ehci.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
Index: qemu-2.5.0/hw/usb/hcd-ehci.c
|
||||
===================================================================
|
||||
--- qemu-2.5.0.orig/hw/usb/hcd-ehci.c
|
||||
+++ qemu-2.5.0/hw/usb/hcd-ehci.c
|
||||
@@ -893,6 +893,11 @@ static uint64_t ehci_caps_read(void *ptr
|
||||
return s->caps[addr];
|
||||
}
|
||||
|
||||
+static void ehci_caps_write(void *ptr, hwaddr addr,
|
||||
+ uint64_t val, unsigned size)
|
||||
+{
|
||||
+}
|
||||
+
|
||||
static uint64_t ehci_opreg_read(void *ptr, hwaddr addr,
|
||||
unsigned size)
|
||||
{
|
||||
@@ -2310,6 +2315,7 @@ static void ehci_frame_timer(void *opaqu
|
||||
|
||||
static const MemoryRegionOps ehci_mmio_caps_ops = {
|
||||
.read = ehci_caps_read,
|
||||
+ .write = ehci_caps_write,
|
||||
.valid.min_access_size = 1,
|
||||
.valid.max_access_size = 4,
|
||||
.impl.min_access_size = 1,
|
|
@ -9,6 +9,7 @@ SRC_URI += "file://configure-fix-Darwin-target-detection.patch \
|
|||
file://no-valgrind.patch \
|
||||
file://CVE-2016-1568.patch \
|
||||
file://CVE-2016-2197.patch \
|
||||
file://CVE-2016-2198.patch \
|
||||
"
|
||||
SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2"
|
||||
SRC_URI[md5sum] = "f469f2330bbe76e3e39db10e9ac4f8db"
|
||||
|
|
Loading…
Reference in New Issue