diff options
| author | Mathias Nyman <mathias.nyman@linux.intel.com> | 2014-09-11 14:55:48 +0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-10-13 17:41:00 +0400 |
| commit | adcf3f05c962eee62864d3bd61b0b7534cb7015a (patch) | |
| tree | 6fce81c22ab2d0de93a379d07db5b65f8666ff05 /drivers/usb/host | |
| parent | cd410f34b10e5e1b1581ceba98dd9d5cd3bdb259 (diff) | |
| download | linux-adcf3f05c962eee62864d3bd61b0b7534cb7015a.tar.xz | |
xhci: Fix null pointer dereference if xhci initialization fails
commit c207e7c50f31113c24a9f536fcab1e8a256985d7 upstream.
If xhci initialization fails before the roothub bandwidth
domains (xhci->rh_bw[i]) are allocated it will oops when
trying to access rh_bw members in xhci_mem_cleanup().
Reported-by: Manuel Reimer <manuel.reimer@gmx.de>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/xhci-mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index 4483e6a307c0..837c333c827f 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -1723,7 +1723,7 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci) } num_ports = HCS_MAX_PORTS(xhci->hcs_params1); - for (i = 0; i < num_ports; i++) { + for (i = 0; i < num_ports && xhci->rh_bw; i++) { struct xhci_interval_bw_table *bwt = &xhci->rh_bw[i].bw_table; for (j = 0; j < XHCI_MAX_INTERVAL; j++) { struct list_head *ep = &bwt->interval_bw[j].endpoints; |