Commit a40973ff authored by Sean Young's avatar Sean Young Committed by Mauro Carvalho Chehab

[media] igorplugusb: fix leaks in error path

Since rc_allocate_device() uses kmalloc, it can returns NULL,
so need to check,  otherwise, NULL derefenrece can happen.
Reported-by: default avatarInsu Yun <wuninsu@gmail.com>
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 050b6c98
...@@ -152,7 +152,7 @@ static int igorplugusb_probe(struct usb_interface *intf, ...@@ -152,7 +152,7 @@ static int igorplugusb_probe(struct usb_interface *intf,
struct usb_endpoint_descriptor *ep; struct usb_endpoint_descriptor *ep;
struct igorplugusb *ir; struct igorplugusb *ir;
struct rc_dev *rc; struct rc_dev *rc;
int ret; int ret = -ENOMEM;
udev = interface_to_usbdev(intf); udev = interface_to_usbdev(intf);
idesc = intf->cur_altsetting; idesc = intf->cur_altsetting;
...@@ -182,7 +182,7 @@ static int igorplugusb_probe(struct usb_interface *intf, ...@@ -182,7 +182,7 @@ static int igorplugusb_probe(struct usb_interface *intf,
ir->urb = usb_alloc_urb(0, GFP_KERNEL); ir->urb = usb_alloc_urb(0, GFP_KERNEL);
if (!ir->urb) if (!ir->urb)
return -ENOMEM; goto fail;
usb_fill_control_urb(ir->urb, udev, usb_fill_control_urb(ir->urb, udev,
usb_rcvctrlpipe(udev, 0), (uint8_t *)&ir->request, usb_rcvctrlpipe(udev, 0), (uint8_t *)&ir->request,
...@@ -191,6 +191,9 @@ static int igorplugusb_probe(struct usb_interface *intf, ...@@ -191,6 +191,9 @@ static int igorplugusb_probe(struct usb_interface *intf,
usb_make_path(udev, ir->phys, sizeof(ir->phys)); usb_make_path(udev, ir->phys, sizeof(ir->phys));
rc = rc_allocate_device(); rc = rc_allocate_device();
if (!rc)
goto fail;
rc->input_name = DRIVER_DESC; rc->input_name = DRIVER_DESC;
rc->input_phys = ir->phys; rc->input_phys = ir->phys;
usb_to_input_id(udev, &rc->input_id); usb_to_input_id(udev, &rc->input_id);
...@@ -214,9 +217,7 @@ static int igorplugusb_probe(struct usb_interface *intf, ...@@ -214,9 +217,7 @@ static int igorplugusb_probe(struct usb_interface *intf,
ret = rc_register_device(rc); ret = rc_register_device(rc);
if (ret) { if (ret) {
dev_err(&intf->dev, "failed to register rc device: %d", ret); dev_err(&intf->dev, "failed to register rc device: %d", ret);
rc_free_device(rc); goto fail;
usb_free_urb(ir->urb);
return ret;
} }
usb_set_intfdata(intf, ir); usb_set_intfdata(intf, ir);
...@@ -224,6 +225,12 @@ static int igorplugusb_probe(struct usb_interface *intf, ...@@ -224,6 +225,12 @@ static int igorplugusb_probe(struct usb_interface *intf,
igorplugusb_cmd(ir, SET_INFRABUFFER_EMPTY); igorplugusb_cmd(ir, SET_INFRABUFFER_EMPTY);
return 0; return 0;
fail:
rc_free_device(ir->rc);
usb_free_urb(ir->urb);
del_timer(&ir->timer);
return ret;
} }
static void igorplugusb_disconnect(struct usb_interface *intf) static void igorplugusb_disconnect(struct usb_interface *intf)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment