Patch "rsi: fix memory leak on buf and usb_reg_buf" has been added to the 4.14-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
rsi: fix memory leak on buf and usb_reg_buf
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
rsi-fix-memory-leak-on-buf-and-usb_reg_buf.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Tue Dec 12 10:32:42 CET 2017
From: Colin Ian King <[email protected]>
Date: Thu, 16 Nov 2017 17:39:18 +0000
Subject: rsi: fix memory leak on buf and usb_reg_buf
From: Colin Ian King <[email protected]>
[ Upstream commit d35ef8f846c72d84bfccf239c248c84f79c3a7e8 ]
In the cases where len is too long, the error return path fails to kfree allocated buffers buf and usb_reg_buf. The simplest fix is to perform the sanity check on len before the allocations to avoid having to do the kfree'ing in the first place.
Detected by CoverityScan, CID#1452258,1452259 ("Resource Leak")
--- drivers/net/wireless/rsi/rsi_91x_usb.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/wireless/rsi/rsi_91x_usb.c +6 -6
@@ -162,13 +162,13 @@ static int rsi_usb_reg_read(struct usb_du8 *buf;int status = -ENOMEM ; +if (len >RSI_USB_CTRL_BUF_SIZE ) +return -EINVAL ; + buf =kmalloc (RSI_USB_CTRL_BUF_SIZE ,GFP_KERNEL );if (!buf)return status; -if (len >RSI_USB_CTRL_BUF_SIZE ) -return -EINVAL ; - status = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), USB_VENDOR_REGISTER_READ,
@@ -207,13 +207,13 @@ static int rsi_usb_reg_write(struct usb_u8 *usb_reg_buf;int status = -ENOMEM ; +if (len >RSI_USB_CTRL_BUF_SIZE ) +return -EINVAL ; + usb_reg_buf =kmalloc (RSI_USB_CTRL_BUF_SIZE ,GFP_KERNEL );if (!usb_reg_buf)return status; -if (len >RSI_USB_CTRL_BUF_SIZE ) -return -EINVAL ; - usb_reg_buf[0 ] = (value &0x00ff ); usb_reg_buf[1 ] = (value &0xff00 ) >>8 ; usb_reg_buf[2 ] =0x0 ;
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/rsi-fix-memory-leak-on-buf-and-usb_reg_buf.patch queue-4.14/irqchip-qcom-fix-u32-comparison-with-value-less-than-zero.patch