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

Commit e57b641d authored by Adrian Bunk's avatar Adrian Bunk Committed by Jeff Garzik
Browse files

[netdrvr/usb] hso_create_bulk_serial_device(): fix a double free 



hso_serial_common_free() mustn't be called if
hso_serial_common_create() fails.

Reported-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 54069511

drivers/net/usb/hso.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -2211,14 +2211,14 @@ static struct hso_device *hso_create_bulk_serial_device( 
				     USB_DIR_IN);

				     USB_DIR_IN);

	if (!serial->in_endp) {

	if (!serial->in_endp) {

		dev_err(&interface->dev, "Failed to find BULK IN ep\n");

		dev_err(&interface->dev, "Failed to find BULK IN ep\n");

		goto exit;

		goto exit2;

	}

	}





	if (!

	if (!

	    (serial->out_endp =

	    (serial->out_endp =

	     hso_get_ep(interface, USB_ENDPOINT_XFER_BULK, USB_DIR_OUT))) {

	     hso_get_ep(interface, USB_ENDPOINT_XFER_BULK, USB_DIR_OUT))) {

		dev_err(&interface->dev, "Failed to find BULK IN ep\n");

		dev_err(&interface->dev, "Failed to find BULK IN ep\n");

		goto exit;

		goto exit2;

	}

	}





	serial->write_data = hso_std_serial_write_data;

	serial->write_data = hso_std_serial_write_data;
@@ -2231,9 +2231,10 @@ static struct hso_device *hso_create_bulk_serial_device( 




	/* done, return it */

	/* done, return it */

	return hso_dev;

	return hso_dev;

exit:



	if (hso_dev && serial)

exit2:

	hso_serial_common_free(serial);

	hso_serial_common_free(serial);

exit:

	kfree(serial);

	kfree(serial);

	hso_free_device(hso_dev);

	hso_free_device(hso_dev);

	return NULL;

	return NULL;