tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

gpib: Fix memory leak in ni_usb_init()

In ni_usb_init(), if ni_usb_setup_init() fails, the function returns
-EFAULT without freeing the allocated writes buffer, leading to a
memory leak.

Additionally, ni_usb_setup_init() returns 0 on failure, which causes
ni_usb_init() to return -EFAULT, an inappropriate error code for this
situation.

Fix the leak by freeing writes in the error path. Modify
ni_usb_setup_init() to return -EINVAL on failure and propagate this
error code in ni_usb_init().

Fixes: 4e127de14fa7 ("staging: gpib: Add National Instruments USB GPIB driver")
Suggested-by: Greg KH <gregkh@linuxfoundation.org>
Suggested-by: Dave Penkler <dpenkler@gmail.com>
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>
Link: https://patch.msgid.link/20251230034546.929452-1-zilin@seu.edu.cn
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Zilin Guan and committed by
Greg Kroah-Hartman b89921ee 484e6225

+7 -5
+7 -5
drivers/gpib/ni_usb/ni_usb_gpib.c
··· 1780 1780 i++; 1781 1781 if (i > NUM_INIT_WRITES) { 1782 1782 dev_err(&usb_dev->dev, "bug!, buffer overrun, i=%i\n", i); 1783 - return 0; 1783 + return -EINVAL; 1784 1784 } 1785 1785 return i; 1786 1786 } ··· 1799 1799 return -ENOMEM; 1800 1800 1801 1801 writes_len = ni_usb_setup_init(board, writes); 1802 - if (writes_len) 1803 - retval = ni_usb_write_registers(ni_priv, writes, writes_len, &ibsta); 1804 - else 1805 - return -EFAULT; 1802 + if (writes_len < 0) { 1803 + kfree(writes); 1804 + return writes_len; 1805 + } 1806 + 1807 + retval = ni_usb_write_registers(ni_priv, writes, writes_len, &ibsta); 1806 1808 kfree(writes); 1807 1809 if (retval) { 1808 1810 dev_err(&usb_dev->dev, "register write failed, retval=%i\n", retval);