Commit 5eeb3014 authored by Alexey Khoroshilov's avatar Alexey Khoroshilov Committed by Mauro Carvalho Chehab

[media] cx231xx: fix usbdev leak on failure paths in cx231xx_usb_probe()

Commit b7085c08 ("cx231xx: convert from pr_foo to dev_foo")
moves usb_get_dev(interface_to_usbdev(interface)) to the beginning
of cx231xx_usb_probe() to use udev->dev in dev_err(),
but it does not make sure usbdev is put on all failure paths.

Later dev_err(udev->dev) was replaced by dev_err(d).
So the patch moves usb_get_dev() below (before the first use)
and fixes another failure path.

Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: default avatarAlexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent e99f0115
...@@ -1403,7 +1403,6 @@ static int cx231xx_usb_probe(struct usb_interface *interface, ...@@ -1403,7 +1403,6 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
struct usb_interface_assoc_descriptor *assoc_desc; struct usb_interface_assoc_descriptor *assoc_desc;
ifnum = interface->altsetting[0].desc.bInterfaceNumber; ifnum = interface->altsetting[0].desc.bInterfaceNumber;
udev = usb_get_dev(interface_to_usbdev(interface));
/* /*
* Interface number 0 - IR interface (handled by mceusb driver) * Interface number 0 - IR interface (handled by mceusb driver)
...@@ -1424,11 +1423,13 @@ static int cx231xx_usb_probe(struct usb_interface *interface, ...@@ -1424,11 +1423,13 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
} }
} while (test_and_set_bit(nr, &cx231xx_devused)); } while (test_and_set_bit(nr, &cx231xx_devused));
udev = usb_get_dev(interface_to_usbdev(interface));
/* allocate memory for our device state and initialize it */ /* allocate memory for our device state and initialize it */
dev = devm_kzalloc(&udev->dev, sizeof(*dev), GFP_KERNEL); dev = devm_kzalloc(&udev->dev, sizeof(*dev), GFP_KERNEL);
if (dev == NULL) { if (dev == NULL) {
clear_bit(nr, &cx231xx_devused); retval = -ENOMEM;
return -ENOMEM; goto err_if;
} }
snprintf(dev->name, 29, "cx231xx #%d", nr); snprintf(dev->name, 29, "cx231xx #%d", nr);
......
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