xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: hso: add failure handler for add_net_device

Browse Source 
[ Upstream commit ecdc28defc46af476566fffd9e5cb4495a2f176e ]

If the network devices connected to the system beyond
HSO_MAX_NET_DEVICES. add_net_device() in hso_create_net_device()
will be failed for the network_table is full. It will lead to
business failure which rely on network_table, for example,
hso_suspend() and hso_resume(). It will also lead to memory leak
because resource release process can not search the hso_device
object from network_table in hso_free_interface().

Add failure handler for add_net_device() in hso_create_net_device()
to solve the above problems.

Fixes: 72dc1c096c ("HSO: add option hso driver")
Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Ziyang Xuan
2021-09-02 16:36:09 +08:00
committed by Greg Kroah-Hartman
parent f450958f7f
commit f89b0d032f
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/usb/hso.c
View File

@@ -2537,13 +2537,17 @@ static struct hso_device *hso_create_net_device(struct usb_interface *interface,
if (!hso_net->mux_bulk_tx_buf) if (!hso_net->mux_bulk_tx_buf)
goto err_free_tx_urb; goto err_free_tx_urb;
add_net_device(hso_dev); result = add_net_device(hso_dev);
if (result) {
dev_err(&interface->dev, "Failed to add net device\n");
goto err_free_tx_buf;
}
/* registering our net device */ /* registering our net device */
result = register_netdev(net); result = register_netdev(net);
if (result) { if (result) {
dev_err(&interface->dev, "Failed to register device\n"); dev_err(&interface->dev, "Failed to register device\n");
goto err_free_tx_buf; goto err_rmv_ndev;
} }
hso_log_port(hso_dev); hso_log_port(hso_dev);
@@ -2552,8 +2556,9 @@ static struct hso_device *hso_create_net_device(struct usb_interface *interface,
return hso_dev; return hso_dev;
err_free_tx_buf: err_rmv_ndev:
remove_net_device(hso_dev); remove_net_device(hso_dev);
err_free_tx_buf:
kfree(hso_net->mux_bulk_tx_buf); kfree(hso_net->mux_bulk_tx_buf);
err_free_tx_urb: err_free_tx_urb:
usb_free_urb(hso_net->mux_bulk_tx_urb); usb_free_urb(hso_net->mux_bulk_tx_urb);