Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 961be09e authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: qcserial: fix interface-data memory leak in error path 



Move interface data allocation to attach so that it is deallocated
should usb-serial probe fail.

Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c2dd4a8e

drivers/usb/serial/qcserial.c

+16 −15
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ MODULE_DEVICE_TABLE(usb, id_table); 


static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)

{

	struct usb_wwan_intf_private *data;

	struct usb_host_interface *intf = serial->interface->cur_altsetting;

	struct device *dev = &serial->dev->dev;

	int retval = -ENODEV;
@@ -154,13 +153,6 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id) 
	ifnum = intf->desc.bInterfaceNumber;

	dev_dbg(dev, "This Interface = %d\n", ifnum);



	data = kzalloc(sizeof(struct usb_wwan_intf_private),

					 GFP_KERNEL);

	if (!data)

		return -ENOMEM;



	spin_lock_init(&data->susp_lock);



	if (nintf == 1) {

		/* QDL mode */

		/* Gobi 2000 has a single altsetting, older ones have two */
@@ -253,20 +245,28 @@ done: 
		}

	}



	/* Set serial->private if not returning error */

	if (retval == 0)

	return retval;

}



static int qc_attach(struct usb_serial *serial)

{

	struct usb_wwan_intf_private *data;



	data = kzalloc(sizeof(*data), GFP_KERNEL);

	if (!data)

		return -ENOMEM;



	spin_lock_init(&data->susp_lock);



	usb_set_serial_data(serial, data);

	else

		kfree(data);



	return retval;

	return 0;

}



static void qc_release(struct usb_serial *serial)

{

	struct usb_wwan_intf_private *priv = usb_get_serial_data(serial);



	/* Free the private data allocated in qcprobe */

	usb_set_serial_data(serial, NULL);

	kfree(priv);

}
@@ -285,6 +285,7 @@ static struct usb_serial_driver qcdevice = { 
	.write		     = usb_wwan_write,

	.write_room	     = usb_wwan_write_room,

	.chars_in_buffer     = usb_wwan_chars_in_buffer,

	.attach              = qc_attach,

	.release	     = qc_release,

	.port_probe          = usb_wwan_port_probe,

	.port_remove	     = usb_wwan_port_remove,