summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSarah Sharp <sarah.a.sharp@linux.intel.com>2011-08-09 16:31:54 -0700
committerSarah Sharp <sarah.a.sharp@linux.intel.com>2011-08-15 09:22:40 -0700
commit8a9af4fdf6d5eeb3200a088354d266a87e8260b0 (patch)
tree697e4a7c0558d108ee31cc9ad04631ad6bbc6284
parent585df1d90cb07a02ca6c7a7d339e56e46d50dafb (diff)
downloadblackbird-op-linux-8a9af4fdf6d5eeb3200a088354d266a87e8260b0.tar.gz
blackbird-op-linux-8a9af4fdf6d5eeb3200a088354d266a87e8260b0.zip
USB: Avoid NULL pointer deref in usb_hcd_alloc_bandwidth.
usb_ifnum_to_if() can return NULL if the USB device does not have a configuration installed (usb_device->actconfig == NULL), or if we can't find the interface number in the installed configuration. Return an error instead of crashing. Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
-rw-r--r--drivers/usb/core/hcd.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 8669ba3fe794..73cbbd85219f 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -1775,6 +1775,8 @@ int usb_hcd_alloc_bandwidth(struct usb_device *udev,
struct usb_interface *iface = usb_ifnum_to_if(udev,
cur_alt->desc.bInterfaceNumber);
+ if (!iface)
+ return -EINVAL;
if (iface->resetting_device) {
/*
* The USB core just reset the device, so the xHCI host
OpenPOWER on IntegriCloud