47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
|
From dff0367cf66f489aa772320fa2937a8cac1ca30d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Prasad J Pandit <pjp@fedoraproject.org>
|
||
|
|
Date: Fri, 29 Jan 2016 18:30:34 +0530
|
||
|
|
Subject: [PATCH] usb: ehci: add capability mmio write function
|
||
|
|
|
||
|
|
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 <zuozhi.fzz@alibaba-inc.com>
|
||
|
|
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
||
|
|
Message-id: 1454072434-16045-1-git-send-email-ppandit@redhat.com
|
||
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
||
|
|
---
|
||
|
|
hw/usb/hcd-ehci.c | 6 ++++++
|
||
|
|
1 file changed, 6 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
|
||
|
|
index 1b50601..0f95d0d 100644
|
||
|
|
--- a/hw/usb/hcd-ehci.c
|
||
|
|
+++ b/hw/usb/hcd-ehci.c
|
||
|
|
@@ -895,6 +895,11 @@ static uint64_t ehci_caps_read(void *ptr, hwaddr addr,
|
||
|
|
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)
|
||
|
|
{
|
||
|
|
@@ -2315,6 +2320,7 @@ static void ehci_frame_timer(void *opaque)
|
||
|
|
|
||
|
|
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,
|
||
|
|
--
|
||
|
|
2.7.4
|
||
|
|
|