| Message ID | 20210917101204.10147-1-johan@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e8f69b16ee776da88589b5271e3f46020efc8f6c |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: hso: fix muxed tty registration | expand |
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Fri, 17 Sep 2021 12:12:04 +0200 you wrote: > 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. > > [...] Here is the summary with links: - [net] net: hso: fix muxed tty registration https://git.kernel.org/netdev/net/c/e8f69b16ee77 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c index a57251ba5991..f97813a4e8d1 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c @@ -2719,14 +2719,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; @@ -2742,11 +2742,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); - kfree(serial); - } +err_free_serial: + kfree(serial); +err_free_dev: kfree(hso_dev); return NULL;
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: 72dc1c096c70 ("HSO: add option hso driver") Cc: stable@vger.kernel.org # 2.6.27 Signed-off-by: Johan Hovold <johan@kernel.org> --- drivers/net/usb/hso.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)