Skip to content

Commit e8f69b1

Browse files
jhovolddavem330
authored andcommitted
net: hso: fix muxed tty registration
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: 72dc1c0 ("HSO: add option hso driver") Cc: [email protected] # 2.6.27 Signed-off-by: Johan Hovold <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent fc0c054 commit e8f69b1

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

drivers/net/usb/hso.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2719,14 +2719,14 @@ struct hso_device *hso_create_mux_serial_device(struct usb_interface *interface,
27192719

27202720
serial = kzalloc(sizeof(*serial), GFP_KERNEL);
27212721
if (!serial)
2722-
goto exit;
2722+
goto err_free_dev;
27232723

27242724
hso_dev->port_data.dev_serial = serial;
27252725
serial->parent = hso_dev;
27262726

27272727
if (hso_serial_common_create
27282728
(serial, 1, CTRL_URB_RX_SIZE, CTRL_URB_TX_SIZE))
2729-
goto exit;
2729+
goto err_free_serial;
27302730

27312731
serial->tx_data_length--;
27322732
serial->write_data = hso_mux_serial_write_data;
@@ -2742,11 +2742,9 @@ struct hso_device *hso_create_mux_serial_device(struct usb_interface *interface,
27422742
/* done, return it */
27432743
return hso_dev;
27442744

2745-
exit:
2746-
if (serial) {
2747-
tty_unregister_device(tty_drv, serial->minor);
2748-
kfree(serial);
2749-
}
2745+
err_free_serial:
2746+
kfree(serial);
2747+
err_free_dev:
27502748
kfree(hso_dev);
27512749
return NULL;
27522750

0 commit comments

Comments
 (0)