Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HID: hid-ntrig: Prevent memory leak in ntrig_report_version() 

Use a scope-based cleanup helper for the buffer allocated with kmalloc()
in ntrig_report_version() to simplify the cleanup logic and prevent
memory leaks (specifically the !hid_is_usb()-case one).

[jkosina@suse.com: elaborate on the actual existing leak]
Fixes: 185c926283 ("HID: hid-ntrig: fix unable to handle page fault in ntrig_report_version()")
Signed-off-by: Masami Ichikawa <masami256@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
This commit is contained in:
Masami Ichikawa 2025-09-21 14:31:02 +09:00 committed by Jiri Kosina
parent 4d3a13afa8
commit 53f731f5bb
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/hid/hid-ntrig.c
View File

@ -142,13 +142,13 @@ static void ntrig_report_version(struct hid_device *hdev)
int ret; int ret;
char buf[20]; char buf[20];
struct usb_device *usb_dev = hid_to_usb_dev(hdev); struct usb_device *usb_dev = hid_to_usb_dev(hdev);
unsigned char *data = kmalloc(8, GFP_KERNEL); unsigned char *data __free(kfree) = kmalloc(8, GFP_KERNEL);
if (!hid_is_usb(hdev)) if (!hid_is_usb(hdev))
return; return;
if (!data) if (!data)
goto err_free; return;
ret = usb_control_msg(usb_dev, usb_rcvctrlpipe(usb_dev, 0), ret = usb_control_msg(usb_dev, usb_rcvctrlpipe(usb_dev, 0),
USB_REQ_CLEAR_FEATURE, USB_REQ_CLEAR_FEATURE,
@ -163,9 +163,6 @@ static void ntrig_report_version(struct hid_device *hdev)
hid_info(hdev, "Firmware version: %s (%02x%02x %02x%02x)\n", hid_info(hdev, "Firmware version: %s (%02x%02x %02x%02x)\n",
buf, data[2], data[3], data[4], data[5]); buf, data[2], data[3], data[4], data[5]);
} }
err_free:
kfree(data);
} }
static ssize_t show_phys_width(struct device *dev, static ssize_t show_phys_width(struct device *dev,