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

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

net: hso: fix muxed tty registration 



commit e8f69b16ee776da88589b5271e3f46020efc8f6c upstream.

If resource allocation and registration fail for a muxed tty device
(e.g. if there are no more minor numbers) the driver should not try to
deregister the never-registered (or already-deregistered) tty.

Fix up the error handling to avoid dereferencing a NULL pointer when
attempting to remove the character device.

Fixes: 72dc1c09 ("HSO: add option hso driver")
Cc: stable@vger.kernel.org	# 2.6.27
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 494260e2

drivers/net/usb/hso.c

+5 −7
Original line number Diff line number Diff line
@@ -2704,14 +2704,14 @@ struct hso_device *hso_create_mux_serial_device(struct usb_interface *interface, 


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

	if (!serial)

		goto exit;

		goto err_free_dev;



	hso_dev->port_data.dev_serial = serial;

	serial->parent = hso_dev;



	if (hso_serial_common_create

	    (serial, 1, CTRL_URB_RX_SIZE, CTRL_URB_TX_SIZE))

		goto exit;

		goto err_free_serial;



	serial->tx_data_length--;

	serial->write_data = hso_mux_serial_write_data;
@@ -2727,11 +2727,9 @@ struct hso_device *hso_create_mux_serial_device(struct usb_interface *interface, 
	/* done, return it */

	return hso_dev;



exit:

	if (serial) {

		tty_unregister_device(tty_drv, serial->minor);

err_free_serial:

	kfree(serial);

	}

err_free_dev:

	kfree(hso_dev);

	return NULL;