Unverified Commit 60d7cc48 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2276 cpuidle: Fix kobject memory leaks in error paths 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xia Fukun <xiafukun@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/M36MGF6ZONRQVHMZHRLUPG6BUHCZZPMR/ 
 
https://gitee.com/openeuler/kernel/issues/I81G0T 
 
Link:https://gitee.com/openeuler/kernel/pulls/2276

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 352d135f 7fc33a36

drivers/cpuidle/sysfs.c

+4 −1
Original line number Diff line number Diff line
@@ -481,6 +481,7 @@ static int cpuidle_add_state_sysfs(struct cpuidle_device *device) 
					   &kdev->kobj, "state%d", i);

		if (ret) {

			kobject_put(&kobj->kobj);

			kfree(kobj);

			goto error_state;

		}

		cpuidle_add_s2idle_attr_group(kobj);
@@ -612,6 +613,7 @@ static int cpuidle_add_driver_sysfs(struct cpuidle_device *dev) 
				   &kdev->kobj, "driver");

	if (ret) {

		kobject_put(&kdrv->kobj);

		kfree(kdrv);

		return ret;

	}
@@ -698,7 +700,6 @@ int cpuidle_add_sysfs(struct cpuidle_device *dev) 
	if (!kdev)

		return -ENOMEM;

	kdev->dev = dev;

	dev->kobj_dev = kdev;



	init_completion(&kdev->kobj_unregister);
@@ -706,9 +707,11 @@ int cpuidle_add_sysfs(struct cpuidle_device *dev) 
				   "cpuidle");

	if (error) {

		kobject_put(&kdev->kobj);

		kfree(kdev);

		return error;

	}



	dev->kobj_dev = kdev;

	kobject_uevent(&kdev->kobj, KOBJ_ADD);



	return 0;