Re: [PATCH 1/6] can: esd_usb: Fix possible calls to kfree() with NULL
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: 2025-08-13 09:20:29
Also in:
linux-can
On 11.08.2025 23:06:06, Stefan Mätje wrote:
quoted hunk ↗ jump to hunk
In esd_usb_start() kfree() is called with the msg variable even if the allocation of *msg failed. Move the kfree() call to a line before the allocation error exit label out: and adjust the exits for other errors to the new free_msg: label just before kfree(). In esd_usb_probe() add free_dev: label and skip calling kfree() if allocation of *msg failed. Fixes: fae37f81fdf3 ( "net: can: esd_usb2: Do not do dma on the stack" ) Signed-off-by: Stefan Mätje <stefan.maetje@esd.eu> --- drivers/net/can/usb/esd_usb.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)diff --git a/drivers/net/can/usb/esd_usb.c b/drivers/net/can/usb/esd_usb.c index 27a3818885c2..05ed664cf59d 100644 --- a/drivers/net/can/usb/esd_usb.c +++ b/drivers/net/can/usb/esd_usb.c@@ -3,7 +3,7 @@ * CAN driver for esd electronics gmbh CAN-USB/2, CAN-USB/3 and CAN-USB/Micro * * Copyright (C) 2010-2012 esd electronic system design gmbh, Matthias Fuchs <socketcan@esd.eu> - * Copyright (C) 2022-2024 esd electronics gmbh, Frank Jungclaus <frank.jungclaus@esd.eu> + * Copyright (C) 2022-2025 esd electronics gmbh, Frank Jungclaus <frank.jungclaus@esd.eu> */ #include <linux/can.h>@@ -746,21 +746,22 @@ static int esd_usb_start(struct esd_usb_net_priv *priv)
msg = kmalloc(sizeof(*msg), GFP_KERNEL);
if (!msg) {
err = -ENOMEM;
goto out;
}
Can you adjust the jump label for the kmalloc() fail. There's no need to
check for -ENODEV
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung Nürnberg | Phone: +49-5121-206917-129 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 | Attachments
- signature.asc [application/pgp-signature] 488 bytes