From: Hyunjung Ko pcan_usb arms pdev->restart_timer from pcan_usb_restart_pending() (the restart-command URB completion) during CAN bus-off auto-restart; the timer callback pcan_usb_restart() obtains the pcan_usb via container_of() and calls peak_usb_restart_complete(&pdev->dev). Unlike the other PEAK USB adapters, pcan_usb provides no dev_stop callback, so restart_timer is never cancelled on teardown. When the interface is brought down or the USB device is disconnected, peak_usb_ndo_stop() / unregister_candev() tear the device down and free_candev() frees the peak_usb_device (and the containing pcan_usb) without deleting restart_timer. A restart timer still pending then fires pcan_usb_restart() against the freed pcan_usb (use-after-free). Add a pcan_usb dev_stop callback that deletes restart_timer, so it is drained on ndo_stop() - which unregister_candev() invokes on disconnect while the interface is up. pcan_usb_restart() does not re-arm the timer, so a single timer_delete_sync() drains it. Found by static analysis and code review; not tested on real hardware (needs a PEAK PCAN-USB adapter and a bus-off auto-restart racing unbind). Fixes: 46be265d3388 ("can: usb: PEAK-System Technik PCAN-USB specific part") Cc: stable@vger.kernel.org Signed-off-by: Hyunjung Ko --- drivers/net/can/usb/peak_usb/pcan_usb.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/net/can/usb/peak_usb/pcan_usb.c b/drivers/net/can/usb/peak_usb/pcan_usb.c index 8fd058c..4c13195 100644 --- a/drivers/net/can/usb/peak_usb/pcan_usb.c +++ b/drivers/net/can/usb/peak_usb/pcan_usb.c @@ -882,6 +882,14 @@ static int pcan_usb_start(struct peak_usb_device *dev) return pcan_usb_set_ext_vcc(dev, 0); } +static int pcan_usb_stop(struct peak_usb_device *dev) +{ + struct pcan_usb *pdev = container_of(dev, struct pcan_usb, dev); + + timer_delete_sync(&pdev->restart_timer); + return 0; +} + static int pcan_usb_init(struct peak_usb_device *dev) { struct pcan_usb *pdev = container_of(dev, struct pcan_usb, dev); @@ -1051,6 +1059,7 @@ const struct peak_usb_adapter pcan_usb = { .dev_decode_buf = pcan_usb_decode_buf, .dev_encode_msg = pcan_usb_encode_msg, .dev_start = pcan_usb_start, + .dev_stop = pcan_usb_stop, .dev_restart_async = pcan_usb_restart_async, .do_get_berr_counter = pcan_usb_get_berr_counter, }; -- 2.43.0