]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
platform/x86: dell-smbios: Fix memory leaks in build_tokens_sysfs()
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 16 Mar 2018 12:10:15 +0000 (15:10 +0300)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Mon, 27 Aug 2018 14:40:05 +0000 (16:40 +0200)
BugLink: http://bugs.launchpad.net/bugs/1786352
[ Upstream commit 0e5b09b165510e2ea5c526e962c4edadd849ef4c ]

We're freeing "value_name" which is NULL, so that's a no-op, but we
intended to free "location_name" instead.  And then we don't free the
names in token_location_attrs[0] and token_value_attrs[0].

Fixes: 33b9ca1e53b4 ("platform/x86: dell-smbios: Add a sysfs interface for SMBIOS tokens")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/platform/x86/dell-smbios.c

index 6a60db515bdabcb490410b35ea85bb7a3fd621f1..2ad2855d1cd3e9f73644e8566e373057ba3907ea 100644 (file)
@@ -512,7 +512,7 @@ static int build_tokens_sysfs(struct platform_device *dev)
                continue;
 
 loop_fail_create_value:
-               kfree(value_name);
+               kfree(location_name);
                goto out_unwind_strings;
        }
        smbios_attribute_group.attrs = token_attrs;
@@ -523,7 +523,7 @@ loop_fail_create_value:
        return 0;
 
 out_unwind_strings:
-       for (i = i-1; i > 0; i--) {
+       while (i--) {
                kfree(token_location_attrs[i].attr.name);
                kfree(token_value_attrs[i].attr.name);
        }