[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/9] ohci: check device is not NULL before calling us
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 5/9] ohci: check device is not NULL before calling usb_ep_get() |
Date: |
Wed, 20 Feb 2019 12:13:42 +0100 |
From: Liam Merwick <address@hidden>
A call to ohci_find_device() can return NULL if it doesn't find a
device matching 'addr' so for the two callers, explicitly check
the return value before passing it to usb_ep_get().
Signed-off-by: Liam Merwick <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/hcd-ohci.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c
index c34cf5b73a..196a9f7200 100644
--- a/hw/usb/hcd-ohci.c
+++ b/hw/usb/hcd-ohci.c
@@ -848,6 +848,10 @@ static int ohci_service_iso_td(OHCIState *ohci, struct
ohci_ed *ed,
bool int_req = relative_frame_number == frame_count &&
OHCI_BM(iso_td.flags, TD_DI) == 0;
dev = ohci_find_device(ohci, OHCI_BM(ed->flags, ED_FA));
+ if (dev == NULL) {
+ trace_usb_ohci_td_dev_error();
+ return 1;
+ }
ep = usb_ep_get(dev, pid, OHCI_BM(ed->flags, ED_EN));
usb_packet_setup(&ohci->usb_packet, pid, ep, 0, addr, false, int_req);
usb_packet_addbuf(&ohci->usb_packet, ohci->usb_buf, len);
@@ -1071,6 +1075,10 @@ static int ohci_service_td(OHCIState *ohci, struct
ohci_ed *ed)
return 1;
}
dev = ohci_find_device(ohci, OHCI_BM(ed->flags, ED_FA));
+ if (dev == NULL) {
+ trace_usb_ohci_td_dev_error();
+ return 1;
+ }
ep = usb_ep_get(dev, pid, OHCI_BM(ed->flags, ED_EN));
usb_packet_setup(&ohci->usb_packet, pid, ep, 0, addr, !flag_r,
OHCI_BM(td.flags, TD_DI) == 0);
--
2.9.3
- [Qemu-devel] [PULL 0/9] Usb 20190220 patches, Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 3/9] xhci: check device is not NULL before calling usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 7/9] usb: check device is not NULL before calling usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 9/9] usb: remove unnecessary NULL device check from usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 1/9] usb: rearrange usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 5/9] ohci: check device is not NULL before calling usb_ep_get(),
Gerd Hoffmann <=
- [Qemu-devel] [PULL 2/9] xhci: add asserts to help with static code analysis, Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 6/9] uhci: check device is not NULL before calling usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 8/9] usb: add device checks before redirector calls to usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 4/9] ehci: check device is not NULL before calling usb_ep_get(), Gerd Hoffmann, 2019/02/20
- Re: [Qemu-devel] [PULL 0/9] Usb 20190220 patches, Peter Maydell, 2019/02/21