Commit 0658a336 authored by Jan Safrata's avatar Jan Safrata Committed by Greg Kroah-Hartman
Browse files

usb: use usb_serial_put in usb_serial_probe errors 



The use of kfree(serial) in error cases of usb_serial_probe
was invalid - usb_serial structure allocated in create_serial()
gets reference of usb_device that needs to be put, so we need
to use usb_serial_put() instead of simple kfree().

Signed-off-by: default avatarJan Safrata <jan.nikitenko@gmail.com>
Acked-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 07828b10

drivers/usb/serial/usb-serial.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -757,7 +757,7 @@ static int usb_serial_probe(struct usb_interface *interface, 




		if (retval) {

		if (retval) {

			dbg("sub driver rejected device");

			dbg("sub driver rejected device");

			kfree(serial);

			usb_serial_put(serial);

			module_put(type->driver.owner);

			module_put(type->driver.owner);

			return retval;

			return retval;

		}

		}
@@ -829,7 +829,7 @@ static int usb_serial_probe(struct usb_interface *interface, 
		 */

		 */

		if (num_bulk_in == 0 || num_bulk_out == 0) {

		if (num_bulk_in == 0 || num_bulk_out == 0) {

			dev_info(&interface->dev, "PL-2303 hack: descriptors matched but endpoints did not\n");

			dev_info(&interface->dev, "PL-2303 hack: descriptors matched but endpoints did not\n");

			kfree(serial);

			usb_serial_put(serial);

			module_put(type->driver.owner);

			module_put(type->driver.owner);

			return -ENODEV;

			return -ENODEV;

		}

		}
@@ -843,7 +843,7 @@ static int usb_serial_probe(struct usb_interface *interface, 
		if (num_ports == 0) {

		if (num_ports == 0) {

			dev_err(&interface->dev,

			dev_err(&interface->dev,

			    "Generic device with no bulk out, not allowed.\n");

			    "Generic device with no bulk out, not allowed.\n");

			kfree(serial);

			usb_serial_put(serial);

			module_put(type->driver.owner);

			module_put(type->driver.owner);

			return -EIO;

			return -EIO;

		}

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE