cpuidle: Fix three reference count leaks
authorQiushi Wu <wu000273@umn.edu>
Thu, 28 May 2020 18:20:46 +0000 (13:20 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Jun 2020 07:31:10 +0000 (09:31 +0200)
[ Upstream commit c343bf1ba5efcbf2266a1fe3baefec9cc82f867f ]

kobject_init_and_add() takes reference even when it fails.
If this function returns an error, kobject_put() must be called to
properly clean up the memory associated with the object.

Previous commit "b8eb718348b8" fixed a similar problem.

Signed-off-by: Qiushi Wu <wu000273@umn.edu>
[ rjw: Subject ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/cpuidle/sysfs.c

index 2bb2683..f874732 100644 (file)
@@ -480,7 +480,7 @@ static int cpuidle_add_state_sysfs(struct cpuidle_device *device)
                ret = kobject_init_and_add(&kobj->kobj, &ktype_state_cpuidle,
                                           &kdev->kobj, "state%d", i);
                if (ret) {
-                       kfree(kobj);
+                       kobject_put(&kobj->kobj);
                        goto error_state;
                }
                cpuidle_add_s2idle_attr_group(kobj);
@@ -611,7 +611,7 @@ static int cpuidle_add_driver_sysfs(struct cpuidle_device *dev)
        ret = kobject_init_and_add(&kdrv->kobj, &ktype_driver_cpuidle,
                                   &kdev->kobj, "driver");
        if (ret) {
-               kfree(kdrv);
+               kobject_put(&kdrv->kobj);
                return ret;
        }
 
@@ -705,7 +705,7 @@ int cpuidle_add_sysfs(struct cpuidle_device *dev)
        error = kobject_init_and_add(&kdev->kobj, &ktype_cpuidle, &cpu_dev->kobj,
                                   "cpuidle");
        if (error) {
-               kfree(kdev);
+               kobject_put(&kdev->kobj);
                return error;
        }