From: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Date: Thu, 27 Sep 2007 09:24:55 +0000 (+0200)
Subject: HID: hidraw_connect() memleak fix
X-Git-Tag: v2.6.24-rc1~1323^2^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=709d27c04f4eccbc99d57a5569bce028915a4345;p=linux-2.6

HID: hidraw_connect() memleak fix

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>
---

diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index 20ebba1032..8503197a81 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -282,7 +282,7 @@ 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
@@ -290,8 +290,11 @@ int hidraw_connect(struct hid_device *hid)
 	 * 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);
 
@@ -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);
@@ -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;
 	}