Skip to content

Commit

Permalink
HID: hidraw_connect() memleak fix
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mariusz Kozlowski authored and Jiri Kosina committed Oct 14, 2007
1 parent 86166b7 commit 709d27c
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions drivers/hid/hidraw.c
Original file line number Diff line number Diff line change
Expand Up @@ -282,16 +282,19 @@ EXPORT_SYMBOL_GPL(hidraw_report_event);

int hidraw_connect(struct hid_device *hid)
{
int minor, result = -EINVAL;
int minor, result;
struct hidraw *dev;

/* TODO currently we accept any HID device. This should later
* probably be fixed to accept only those devices which provide
* non-input applications
*/

if (!(dev = kzalloc(sizeof(struct hidraw), GFP_KERNEL)))
return -1;
dev = kzalloc(sizeof(struct hidraw), GFP_KERNEL);
if (!dev)
return -ENOMEM;

result = -EINVAL;

spin_lock(&minors_lock);

Expand All @@ -305,8 +308,10 @@ int hidraw_connect(struct hid_device *hid)

spin_unlock(&minors_lock);

if (result)
if (result) {
kfree(dev);
goto out;
}

dev->dev = device_create(hidraw_class, NULL, MKDEV(hidraw_major, minor),
"%s%d", "hidraw", minor);
Expand All @@ -316,6 +321,7 @@ int hidraw_connect(struct hid_device *hid)
hidraw_table[minor] = NULL;
spin_unlock(&minors_lock);
result = PTR_ERR(dev->dev);
kfree(dev);
goto out;
}

Expand Down

0 comments on commit 709d27c

Please sign in to comment.