evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

USB: whci-hcd: fix NULL dereference on allocation failure

Browse source 
If usb_create_hcd() fails here then we dereference "whc" inside the call
to whc_clean_up() before it has been set.  The compiler would have
warned about this if we hadn't initialized all the pointers to NULL at
the start of the function.  I've cleaned that up as well.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dan Carpenter 2012-07-20 09:58:16 +03:00 • committed by Greg Kroah-Hartman
parent 644034c212
commit 3821bf4abb
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/usb/host/whci/hcd.c
View file

@ -238,16 +238,16 @@ static struct hc_driver whc_hc_driver = {
static int whc_probe(struct umc_dev *umc) static int whc_probe(struct umc_dev *umc)
{ {
int ret = -ENOMEM; int ret;
struct usb_hcd *usb_hcd; struct usb_hcd *usb_hcd;
struct wusbhc *wusbhc = NULL; struct wusbhc *wusbhc;
struct whc *whc = NULL; struct whc *whc;
struct device *dev = &umc->dev; struct device *dev = &umc->dev;
usb_hcd = usb_create_hcd(&whc_hc_driver, dev, "whci"); usb_hcd = usb_create_hcd(&whc_hc_driver, dev, "whci");
if (usb_hcd == NULL) { if (usb_hcd == NULL) {
dev_err(dev, "unable to create hcd\n"); dev_err(dev, "unable to create hcd\n");
goto error; return -ENOMEM;
} }
usb_hcd->wireless = 1; usb_hcd->wireless = 1;