Skip to content

Commit a6ecfb3

Browse files
mudongliangdavem330
authored andcommitted
usb: hso: fix error handling code of hso_create_net_device
The current error handling code of hso_create_net_device is hso_free_net_device, no matter which errors lead to. For example, WARNING in hso_free_net_device [1]. Fix this by refactoring the error handling code of hso_create_net_device by handling different errors by different code. [1] https://syzkaller.appspot.com/bug?id=66eff8d49af1b28370ad342787413e35bbe76efe Reported-by: syzbot+44d53c7255bb1aea22d2@syzkaller.appspotmail.com Fixes: 5fcfb6d ("hso: fix bailout in error case of probe") Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 6206b79 commit a6ecfb3

File tree

1 file changed

+23
-10
lines changed

1 file changed

+23
-10
lines changed

drivers/net/usb/hso.c

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2495,7 +2495,7 @@ static struct hso_device *hso_create_net_device(struct usb_interface *interface,
24952495
hso_net_init);
24962496
if (!net) {
24972497
dev_err(&interface->dev, "Unable to create ethernet device\n");
2498-
goto exit;
2498+
goto err_hso_dev;
24992499
}
25002500

25012501
hso_net = netdev_priv(net);
@@ -2508,13 +2508,13 @@ static struct hso_device *hso_create_net_device(struct usb_interface *interface,
25082508
USB_DIR_IN);
25092509
if (!hso_net->in_endp) {
25102510
dev_err(&interface->dev, "Can't find BULK IN endpoint\n");
2511-
goto exit;
2511+
goto err_net;
25122512
}
25132513
hso_net->out_endp = hso_get_ep(interface, USB_ENDPOINT_XFER_BULK,
25142514
USB_DIR_OUT);
25152515
if (!hso_net->out_endp) {
25162516
dev_err(&interface->dev, "Can't find BULK OUT endpoint\n");
2517-
goto exit;
2517+
goto err_net;
25182518
}
25192519
SET_NETDEV_DEV(net, &interface->dev);
25202520
SET_NETDEV_DEVTYPE(net, &hso_type);
@@ -2523,35 +2523,48 @@ static struct hso_device *hso_create_net_device(struct usb_interface *interface,
25232523
for (i = 0; i < MUX_BULK_RX_BUF_COUNT; i++) {
25242524
hso_net->mux_bulk_rx_urb_pool[i] = usb_alloc_urb(0, GFP_KERNEL);
25252525
if (!hso_net->mux_bulk_rx_urb_pool[i])
2526-
goto exit;
2526+
goto err_mux_bulk_rx;
25272527
hso_net->mux_bulk_rx_buf_pool[i] = kzalloc(MUX_BULK_RX_BUF_SIZE,
25282528
GFP_KERNEL);
25292529
if (!hso_net->mux_bulk_rx_buf_pool[i])
2530-
goto exit;
2530+
goto err_mux_bulk_rx;
25312531
}
25322532
hso_net->mux_bulk_tx_urb = usb_alloc_urb(0, GFP_KERNEL);
25332533
if (!hso_net->mux_bulk_tx_urb)
2534-
goto exit;
2534+
goto err_mux_bulk_rx;
25352535
hso_net->mux_bulk_tx_buf = kzalloc(MUX_BULK_TX_BUF_SIZE, GFP_KERNEL);
25362536
if (!hso_net->mux_bulk_tx_buf)
2537-
goto exit;
2537+
goto err_free_tx_urb;
25382538

25392539
add_net_device(hso_dev);
25402540

25412541
/* registering our net device */
25422542
result = register_netdev(net);
25432543
if (result) {
25442544
dev_err(&interface->dev, "Failed to register device\n");
2545-
goto exit;
2545+
goto err_free_tx_buf;
25462546
}
25472547

25482548
hso_log_port(hso_dev);
25492549

25502550
hso_create_rfkill(hso_dev, interface);
25512551

25522552
return hso_dev;
2553-
exit:
2554-
hso_free_net_device(hso_dev, true);
2553+
2554+
err_free_tx_buf:
2555+
remove_net_device(hso_dev);
2556+
kfree(hso_net->mux_bulk_tx_buf);
2557+
err_free_tx_urb:
2558+
usb_free_urb(hso_net->mux_bulk_tx_urb);
2559+
err_mux_bulk_rx:
2560+
for (i = 0; i < MUX_BULK_RX_BUF_COUNT; i++) {
2561+
usb_free_urb(hso_net->mux_bulk_rx_urb_pool[i]);
2562+
kfree(hso_net->mux_bulk_rx_buf_pool[i]);
2563+
}
2564+
err_net:
2565+
free_netdev(net);
2566+
err_hso_dev:
2567+
kfree(hso_dev);
25552568
return NULL;
25562569
}
25572570

0 commit comments

Comments
 (0)