Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=709d27c04f4eccbc99d57a5569bce028915a4345
Commit:     709d27c04f4eccbc99d57a5569bce028915a4345
Parent:     86166b7bcda0bcb53525114fa1c87ac432be478e
Author:     Mariusz Kozlowski <[EMAIL PROTECTED]>
AuthorDate: Thu Sep 27 11:24:55 2007 +0200
Committer:  Jiri Kosina <[EMAIL PROTECTED]>
CommitDate: Sun Oct 14 14:47:26 2007 +0200

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Jiri Kosina <[EMAIL PROTECTED]>
---
 drivers/hid/hidraw.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index 20ebba1..8503197 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;
        }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to