From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B71F21FC0F3; Tue, 8 Jul 2025 16:46:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751993198; cv=none; b=MtDYVDDwXZiJRSSge2M3biRVket9RC7tMLp5xdOAo4kIN+5M/bZhQgp/cDvWWHW34/g61KBYn/bW7Y/UiNNh5aTY1qtsHfzMH64WJfqZORpGSqnlZELua18/+mht3/qFJH43eTEG+9iUeEcA59yaL6D5tsLQjqO0326zz8CdvnM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751993198; c=relaxed/simple; bh=zPU7uOWNv2lUB/KTt8ImUP57EuU3mrpP4lscLwgSsvA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bXAc9nTsF2i272eOk0m9SoDNGaflne/UkB6QNo5zqbD4GtHgWhgEj7ayGho2WjlnOmQKgbwrvFt+QEpQgV7/XPIowyNlR3CJ+ZitSDXC+I3TAujDotAeMbLq6Zw99M2XXpl1B2pCjHR/EJWbgEJj9gWt9zbv5om3HacK4iA/sbU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lLCzABmy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="lLCzABmy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43E7EC4CEED; Tue, 8 Jul 2025 16:46:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1751993198; bh=zPU7uOWNv2lUB/KTt8ImUP57EuU3mrpP4lscLwgSsvA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lLCzABmyMUMZV8fLwBXn5S9PtvIjpEp2BCqAFvU1rsGMoIgDv7x1N/erRHiTWfMuN mZXrrkMq/UH12Cc+wLTvl9DIYxBQCoxKGnsOfk2Evf6I1vxjG+XYqh4lFDYyrkxWnk Zn9XaTP2UcwyT2pwa58UUpqTzFWghiortaCQ4yXk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mark Pearson , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Kurt Borja Subject: [PATCH 6.12 221/232] platform/x86: think-lmi: Create ksets consecutively Date: Tue, 8 Jul 2025 18:23:37 +0200 Message-ID: <20250708162247.216096070@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250708162241.426806072@linuxfoundation.org> References: <20250708162241.426806072@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kurt Borja 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 Reviewed-by: Ilpo Järvinen Cc: stable@vger.kernel.org Signed-off-by: Kurt Borja Link: https://lore.kernel.org/r/20250630-lmi-fix-v3-1-ce4f81c9c481@gmail.com Signed-off-by: Ilpo Järvinen Signed-off-by: Greg Kroah-Hartman --- drivers/platform/x86/think-lmi.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) --- a/drivers/platform/x86/think-lmi.c +++ b/drivers/platform/x86/think-lmi.c @@ -1388,6 +1388,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]) @@ -1429,12 +1437,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)