Skip to contentSkip to conversation

can: fix use-after-free on USB disconnect

PATCH Applied Johan Hovold 2 participants 4 messages Oct 1, 2019 – Oct 4, 2019

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

cover can: fix use-after-free on USB disconnect

Syzbot reported a use-after-free on disconnect in mcba_usb and a quick grep revealed a similar issue in usb_8dev.

Compile-tested only.

Johan

Johan Hovold (2):
can: mcba_usb: fix use-after-free on disconnect
can: usb_8dev: fix use-after-free on disconnect

 drivers/net/can/usb/mcba_usb.c | 3 +--
 drivers/net/can/usb/usb_8dev.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
Signature · 1 line
2.23.0
#1 lore raw

PATCH 1/2 can: mcba_usb: fix use-after-free on disconnect

The driver was accessing its driver data after having freed it.

Fixes 51f3baad7de9 ("can: mcba_usb: Add support for Microchip CAN BUS Analyzer")
Cc stable <[email protected]> # 4.12
Cc Remigiusz Kołłątaj <[email protected]>
Reported-by [email protected]
---
 drivers/net/can/usb/mcba_usb.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/can/usb/mcba_usb.c +1 -2
index 19a702ac49e4..21faa2ec4632 100644
@@ -876,9 +876,8 @@ static void mcba_usb_disconnect(struct usb_interface *intf)
 	netdev_info(priv->netdev, "device disconnected\n");
 
 	unregister_candev(priv->netdev);
-	free_candev(priv->netdev);
-
 	mcba_urb_unlink(priv);
+	free_candev(priv->netdev);
 }
 
 static struct usb_driver mcba_usb_driver = {
Signature · 1 line
2.23.0
#2 lore raw

PATCH 2/2 can: usb_8dev: fix use-after-free on disconnect

In reply to Johan Hovold

The driver was accessing its driver data after having freed it.

Fixes 0024d8ad1639 ("can: usb_8dev: Add support for USB2CAN interface from 8 devices")
Cc stable <[email protected]> # 3.9
Cc Bernd Krumboeck <[email protected]>
Cc Wolfgang Grandegger <[email protected]>
---
 drivers/net/can/usb/usb_8dev.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/can/usb/usb_8dev.c +1 -2
index d596a2ad7f78..8fa224b28218 100644
@@ -996,9 +996,8 @@ static void usb_8dev_disconnect(struct usb_interface *intf)
 		netdev_info(priv->netdev, "device disconnected\n");
 
 		unregister_netdev(priv->netdev);
-		free_candev(priv->netdev);
-
 		unlink_all_urbs(priv);
+		free_candev(priv->netdev);
 	}
 
 }
Signature · 1 line
2.23.0
maintainer Applied
#3 lore raw
In reply to Johan Hovold
Quoted 4 lines · Johan Hovold

Syzbot reported a use-after-free on disconnect in mcba_usb and a quick grep revealed a similar issue in usb_8dev.

Compile-tested only.

Applied to can.

tnx,
Marc

Signature · 4 lines
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |