From: Dave Penkler <dpenkler@gmail.com>
To: Zilin Guan <zilin@seu.edu.cn>
Cc: gregkh@linuxfoundation.org, matchstick@neverthere.org,
mingo@kernel.org, tglx@linutronix.de,
linux-kernel@vger.kernel.org, jianhao.xu@seu.edu.cn
Subject: Re: [PATCH] staging: gpib: Fix memory leak in ni_usb_init()
Date: Mon, 29 Dec 2025 13:19:22 +0100 [thread overview]
Message-ID: <aVJxyppYTrVi3Iyh@egonzo> (raw)
In-Reply-To: <20251228081926.3503643-1-zilin@seu.edu.cn>
On Sun, Dec 28, 2025 at 08:19:26AM +0000, Zilin Guan wrote:
> In ni_usb_init(), if ni_usb_setup_init() fails, the function returns
> immediately without freeing the allocated memory for writes, leading
> to a memory leak.
>
> Fix this by jumping to the out label to ensure the memory is properly
> freed.
>
> Fixes: 4e127de14fa7 ("staging: gpib: Add National Instruments USB GPIB driver")
> Co-developed-by: Jianhao Xu <jianhao.xu@seu.edu.cn>
> Signed-off-by: Jianhao Xu <jianhao.xu@seu.edu.cn>
> Signed-off-by: Zilin Guan <zilin@seu.edu.cn>
> ---
> drivers/gpib/ni_usb/ni_usb_gpib.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpib/ni_usb/ni_usb_gpib.c b/drivers/gpib/ni_usb/ni_usb_gpib.c
> index 1f8412de9fa3..4cf45e94c750 100644
> --- a/drivers/gpib/ni_usb/ni_usb_gpib.c
> +++ b/drivers/gpib/ni_usb/ni_usb_gpib.c
> @@ -1802,7 +1802,7 @@ static int ni_usb_init(struct gpib_board *board)
> if (writes_len)
> retval = ni_usb_write_registers(ni_priv, writes, writes_len, &ibsta);
> else
> - return -EFAULT;
> + goto out;
> kfree(writes);
> if (retval) {
> dev_err(&usb_dev->dev, "register write failed, retval=%i\n", retval);
> @@ -1810,6 +1810,10 @@ static int ni_usb_init(struct gpib_board *board)
> }
> ni_usb_soft_update_status(board, ibsta, 0);
> return 0;
> +
> +out:
> + kfree(writes);
> + return -EFAULT;
> }
>
> static void ni_usb_interrupt_complete(struct urb *urb)
Good catch.
Prefer simpler variant with check for failure first:
if (!writes_len) {
kfree(writes);
return -EFAULT;
}
retval = ni_usb_write_registers(ni_priv, writes, writes_len, &ibsta);
kfree(writes);
if (retval) {
...
cheers,
-Dave
> --
> 2.34.1
>
next prev parent reply other threads:[~2025-12-29 12:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-28 8:19 [PATCH] staging: gpib: Fix memory leak in ni_usb_init() Zilin Guan
2025-12-29 12:19 ` Dave Penkler [this message]
2025-12-29 15:16 ` Zilin Guan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aVJxyppYTrVi3Iyh@egonzo \
--to=dpenkler@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jianhao.xu@seu.edu.cn \
--cc=linux-kernel@vger.kernel.org \
--cc=matchstick@neverthere.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=zilin@seu.edu.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.