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

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: 185c926283da ("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>

authored by

Masami Ichikawa and committed by
Jiri Kosina
53f731f5 4d3a13af

+2 -5
+2 -5
drivers/hid/hid-ntrig.c
··· 142 142 int ret; 143 143 char buf[20]; 144 144 struct usb_device *usb_dev = hid_to_usb_dev(hdev); 145 - unsigned char *data = kmalloc(8, GFP_KERNEL); 145 + unsigned char *data __free(kfree) = kmalloc(8, GFP_KERNEL); 146 146 147 147 if (!hid_is_usb(hdev)) 148 148 return; 149 149 150 150 if (!data) 151 - goto err_free; 151 + return; 152 152 153 153 ret = usb_control_msg(usb_dev, usb_rcvctrlpipe(usb_dev, 0), 154 154 USB_REQ_CLEAR_FEATURE, ··· 163 163 hid_info(hdev, "Firmware version: %s (%02x%02x %02x%02x)\n", 164 164 buf, data[2], data[3], data[4], data[5]); 165 165 } 166 - 167 - err_free: 168 - kfree(data); 169 166 } 170 167 171 168 static ssize_t show_phys_width(struct device *dev,