Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge patch series "can: usb: f81604: handle short interrupt urb messages properly"
In this series Greg Kroah-Hartman takes the recent fixes on the gs_usb
driver and applies similar fixes to the f81604 driver.
Link: https://patch.msgid.link/2026022331-opal-evaluator-a928@gregkh
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+40
-5
+40
-5
drivers/net/can/usb/f81604.c
+40
-5
drivers/net/can/usb/f81604.c
···
413
413
{
414
414
struct f81604_can_frame *frame = urb->transfer_buffer;
415
415
struct net_device *netdev = urb->context;
416
+
struct f81604_port_priv *priv = netdev_priv(netdev);
416
417
int ret;
417
418
418
419
if (!netif_device_present(netdev))
···
446
445
f81604_process_rx_packet(netdev, frame);
447
446
448
447
resubmit_urb:
448
+
usb_anchor_urb(urb, &priv->urbs_anchor);
449
449
ret = usb_submit_urb(urb, GFP_ATOMIC);
450
+
if (!ret)
451
+
return;
452
+
usb_unanchor_urb(urb);
453
+
450
454
if (ret == -ENODEV)
451
455
netif_device_detach(netdev);
452
-
else if (ret)
456
+
else
453
457
netdev_err(netdev,
454
458
"%s: failed to resubmit read bulk urb: %pe\n",
455
459
__func__, ERR_PTR(ret));
···
626
620
netdev_info(netdev, "%s: Int URB aborted: %pe\n", __func__,
627
621
ERR_PTR(urb->status));
628
622
623
+
if (urb->actual_length < sizeof(*data)) {
624
+
netdev_warn(netdev, "%s: short int URB: %u < %zu\n",
625
+
__func__, urb->actual_length, sizeof(*data));
626
+
goto resubmit_urb;
627
+
}
628
+
629
629
switch (urb->status) {
630
630
case 0: /* success */
631
631
break;
···
658
646
f81604_handle_tx(priv, data);
659
647
660
648
resubmit_urb:
649
+
usb_anchor_urb(urb, &priv->urbs_anchor);
661
650
ret = usb_submit_urb(urb, GFP_ATOMIC);
651
+
if (!ret)
652
+
return;
653
+
usb_unanchor_urb(urb);
654
+
662
655
if (ret == -ENODEV)
663
656
netif_device_detach(netdev);
664
-
else if (ret)
657
+
else
665
658
netdev_err(netdev, "%s: failed to resubmit int urb: %pe\n",
666
659
__func__, ERR_PTR(ret));
667
660
}
···
891
874
if (!netif_device_present(netdev))
892
875
return;
893
876
894
-
if (urb->status)
895
-
netdev_info(netdev, "%s: Tx URB error: %pe\n", __func__,
896
-
ERR_PTR(urb->status));
877
+
if (!urb->status)
878
+
return;
879
+
880
+
switch (urb->status) {
881
+
case -ENOENT:
882
+
case -ECONNRESET:
883
+
case -ESHUTDOWN:
884
+
return;
885
+
default:
886
+
break;
887
+
}
888
+
889
+
if (net_ratelimit())
890
+
netdev_err(netdev, "%s: Tx URB error: %pe\n", __func__,
891
+
ERR_PTR(urb->status));
892
+
893
+
can_free_echo_skb(netdev, 0, NULL);
894
+
netdev->stats.tx_dropped++;
895
+
netdev->stats.tx_errors++;
896
+
897
+
netif_wake_queue(netdev);
897
898
}
898
899
899
900
static void f81604_clear_reg_work(struct work_struct *work)