GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-25 08:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

HID: hidraw_connect() memleak fix

Browse source 
It looks like hidraw_connect() is leaking memory in case of failure.
Also it should return -ENOMEM when kzalloc fails.

Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Mariusz Kozlowski 2007-09-27 11:24:55 +02:00 • committed by Jiri Kosina
parent 86166b7bcd
commit 709d27c04f
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/hid/hidraw.c
View file

@ -282,7 +282,7 @@ EXPORT_SYMBOL_GPL(hidraw_report_event);
int hidraw_connect(struct hid_device *hid) int hidraw_connect(struct hid_device *hid)
{ {
int minor, result = -EINVAL; int minor, result;
struct hidraw *dev; struct hidraw *dev;
/* TODO currently we accept any HID device. This should later /* TODO currently we accept any HID device. This should later
@ -290,8 +290,11 @@ int hidraw_connect(struct hid_device *hid)
* non-input applications * non-input applications
*/ */
if (!(dev = kzalloc(sizeof(struct hidraw), GFP_KERNEL))) dev = kzalloc(sizeof(struct hidraw), GFP_KERNEL);
return -1; if (!dev)
return -ENOMEM;
result = -EINVAL;
spin_lock(&minors_lock); spin_lock(&minors_lock);
@ -305,8 +308,10 @@ int hidraw_connect(struct hid_device *hid)
spin_unlock(&minors_lock); spin_unlock(&minors_lock);
if (result) if (result) {
kfree(dev);
goto out; goto out;
}
dev->dev = device_create(hidraw_class, NULL, MKDEV(hidraw_major, minor), dev->dev = device_create(hidraw_class, NULL, MKDEV(hidraw_major, minor),
"%s%d", "hidraw", minor); "%s%d", "hidraw", minor);
@ -316,6 +321,7 @@ int hidraw_connect(struct hid_device *hid)
hidraw_table[minor] = NULL; hidraw_table[minor] = NULL;
spin_unlock(&minors_lock); spin_unlock(&minors_lock);
result = PTR_ERR(dev->dev); result = PTR_ERR(dev->dev);
kfree(dev);
goto out; goto out;
} }