platform/x86: think-lmi: Create ksets consecutively

commit 8dab34ca77293b409c3223636dde915a22656748 upstream.

Avoid entering tlmi_release_attr() in error paths if both ksets are not
yet created.

This is accomplished by initializing them side by side.

Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: Kurt Borja <kuurtb@gmail.com>
Link: https://lore.kernel.org/r/20250630-lmi-fix-v3-1-ce4f81c9c481@gmail.com
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c
index 626990d103e36fe7d37086912c517cd40c19c90a..62f03a66a619e07e6e42d4c86b0f0cf545561d86 100644 (file)
--- a/drivers/platform/x86/think-lmi.c
+++ b/drivers/platform/x86/think-lmi.c
@@ -1285,6 +1285,14 @@ static int tlmi_sysfs_init(void)
                goto fail_device_created;
        }
 
+       tlmi_priv.authentication_kset = kset_create_and_add("authentication", NULL,
+                                                           &tlmi_priv.class_dev->kobj);
+       if (!tlmi_priv.authentication_kset) {
+               kset_unregister(tlmi_priv.attribute_kset);
+               ret = -ENOMEM;
+               goto fail_device_created;
+       }
+
        for (i = 0; i < TLMI_SETTINGS_COUNT; i++) {
                /* Check if index is a valid setting - skip if it isn't */
                if (!tlmi_priv.setting[i])
@@ -1322,12 +1330,6 @@ static int tlmi_sysfs_init(void)
        }
 
        /* Create authentication entries */
-       tlmi_priv.authentication_kset = kset_create_and_add("authentication", NULL,
-                                                               &tlmi_priv.class_dev->kobj);
-       if (!tlmi_priv.authentication_kset) {
-               ret = -ENOMEM;
-               goto fail_create_attr;
-       }
        tlmi_priv.pwd_admin->kobj.kset = tlmi_priv.authentication_kset;
        ret = kobject_add(&tlmi_priv.pwd_admin->kobj, NULL, "%s", "Admin");
        if (ret)