can: pcan_usb_core: fix memory leak on failure paths in peak_usb_start()
Subsystems (3)
PATCH 1/1 can: pcan_usb_core: fix memory leak on failure paths in peak_usb_start()
Tx and rx urbs are not deallocated if something goes wrong in peak_usb_start(). The patch fixes error handling to deallocate all the resources.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/net/can/usb/peak_usb/pcan_usb_core.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/net/can/usb/peak_usb/pcan_usb_core.c +11 -4
@@ -463,7 +463,7 @@ static int peak_usb_start(struct peak_usb_device *dev)if (i <PCAN_USB_MAX_TX_URBS ) {if (i ==0 ) {netdev_err (netdev,"couldn't setup any tx URB\n" ); -return err; + goto err_tx; }netdev_warn (netdev,"tx performance may be slow\n" );
@@ -472,7 +472,7 @@ static int peak_usb_start(struct peak_usb_device *dev)if (dev->adapter->dev_start) { err = dev->adapter->dev_start (dev);if (err) - goto failed; + goto err_adapter; } dev->state |=PCAN_USB_STATE_STARTED ;
@@ -481,19 +481,26 @@ static int peak_usb_start(struct peak_usb_device *dev)if (dev->adapter->dev_set_bus) { err = dev->adapter->dev_set_bus (dev,1 );if (err) - goto failed; + goto err_adapter; } dev->can.state =CAN_STATE_ERROR_ACTIVE ;return 0 ; -failed: +err_adapter:if (err == -ENODEV )netif_device_detach (dev->netdev);netdev_warn (netdev,"couldn't submit control: %d\n" , err); +for (i =0 ; i <PCAN_USB_MAX_TX_URBS ; i++) { +usb_free_urb (dev->tx_contexts[i].urb); + dev->tx_contexts[i].urb =NULL ; + } +err_tx: +usb_kill_anchored_urbs (&dev->rx_submitted); +return err; }
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-can" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
PEAK-System Technik GmbH, Otto-Roehm-Strasse 69, D-64293 Darmstadt
Geschaeftsleitung: A.Gach/U.Wilhelm,St.Nr.:007/241/13586 FA Darmstadt HRB-9183 Darmstadt, Ust.IdNr.:DE 202220078, WEE-Reg.-Nr.: DE39305391 Tel.+49 (0)6151-817320 / Fax:+49 (0)6151-817329, [email protected]
Marc Kleine-Budde
maintainerQuoted 7 lines · Stephane Grosjean
Tx and rx urbs are not deallocated if something goes wrong in
peak_usb_start(). The patch fixes error handling to deallocate all the resources.Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by Alexey Khoroshilov <[email protected]>
Tnx,
Marc
BTW: A simply reply to the original patch with your Acked-by is sufficient.
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 |
Quoted 4 lines · Marc Kleine-Budde
Quoted 3 lines · Stephane Grosjean
Tx and rx urbs are not deallocated if something goes wrong in
peak_usb_start(). The patch fixes error handling to deallocate all the resources.
Quoted 9 lines
Quoted 4 lines
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by Alexey Khoroshilov <[email protected]>Tnx,
MarcBTW: A simply reply to the original patch with your Acked-by is sufficient.
Ok, thx Marc. I keep it in mind for the next time (if any ;-))
Stéphane
--
PEAK-System Technik GmbH, Otto-Roehm-Strasse 69, D-64293 Darmstadt Geschaeftsleitung: A.Gach/U.Wilhelm,St.Nr.:007/241/13586 FA Darmstadt HRB-9183 Darmstadt, Ust.IdNr.:DE 202220078, WEE-Reg.-Nr.: DE39305391 Tel.+49 (0)6151-817320 / Fax:+49 (0)6151-817329, [email protected]