Commit 30e78435 authored by Hans de Goede's avatar Hans de Goede
Browse files

platform/x86: think-lmi: Split kobject_init() and kobject_add() calls 



tlmi_sysfs_init() calls tlmi_release_attr() on errors which calls
kobject_put() for attributes created by tlmi_analyze(), but if we
bail early because of an error, then this means that some of the
kobjects will not have been initialized yet; and we should thus not
call kobject_put() on them.

Switch from using kobject_init_and_add() inside tlmi_sysfs_init() to
initializing all the created kobjects directly in tlmi_analyze() and
only adding them from tlmi_sysfs_init(). This way all kobjects will
always be initialized when tlmi_release_attr() gets called.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20210717143607.3580-2-hdegoede@redhat.com
parent e62fb1e3

drivers/platform/x86/think-lmi.c

+9 −6
Original line number Diff line number Diff line
@@ -723,8 +723,8 @@ static int tlmi_sysfs_init(void) 


		/* Build attribute */

		tlmi_priv.setting[i]->kobj.kset = tlmi_priv.attribute_kset;

		ret = kobject_init_and_add(&tlmi_priv.setting[i]->kobj, &tlmi_attr_setting_ktype,

				NULL, "%s", tlmi_priv.setting[i]->display_name);

		ret = kobject_add(&tlmi_priv.setting[i]->kobj, NULL,

				  "%s", tlmi_priv.setting[i]->display_name);

		if (ret)

			goto fail_create_attr;
@@ -745,8 +745,7 @@ static int tlmi_sysfs_init(void) 
		goto fail_create_attr;

	}

	tlmi_priv.pwd_admin->kobj.kset = tlmi_priv.authentication_kset;

	ret = kobject_init_and_add(&tlmi_priv.pwd_admin->kobj, &tlmi_pwd_setting_ktype,

			NULL, "%s", "Admin");

	ret = kobject_add(&tlmi_priv.pwd_admin->kobj, NULL, "%s", "Admin");

	if (ret)

		goto fail_create_attr;
@@ -755,8 +754,7 @@ static int tlmi_sysfs_init(void) 
		goto fail_create_attr;



	tlmi_priv.pwd_power->kobj.kset = tlmi_priv.authentication_kset;

	ret = kobject_init_and_add(&tlmi_priv.pwd_power->kobj, &tlmi_pwd_setting_ktype,

			NULL, "%s", "System");

	ret = kobject_add(&tlmi_priv.pwd_power->kobj, NULL, "%s", "System");

	if (ret)

		goto fail_create_attr;
@@ -836,6 +834,7 @@ static int tlmi_analyze(void) 
				pr_info("Error retrieving possible values for %d : %s\n",

						i, setting->display_name);

		}

		kobject_init(&setting->kobj, &tlmi_attr_setting_ktype);

		tlmi_priv.setting[i] = setting;

		tlmi_priv.settings_count++;

		kfree(item);
@@ -862,6 +861,8 @@ static int tlmi_analyze(void) 
	if (pwdcfg.password_state & TLMI_PAP_PWD)

		tlmi_priv.pwd_admin->valid = true;



	kobject_init(&tlmi_priv.pwd_admin->kobj, &tlmi_pwd_setting_ktype);



	tlmi_priv.pwd_power = kzalloc(sizeof(struct tlmi_pwd_setting), GFP_KERNEL);

	if (!tlmi_priv.pwd_power) {

		ret = -ENOMEM;
@@ -877,6 +878,8 @@ static int tlmi_analyze(void) 
	if (pwdcfg.password_state & TLMI_POP_PWD)

		tlmi_priv.pwd_power->valid = true;



	kobject_init(&tlmi_priv.pwd_power->kobj, &tlmi_pwd_setting_ktype);



	return 0;



fail_clear_attr: