From nobody Wed Oct 8 10:56:38 2025 Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 79A457404E; Sun, 29 Jun 2025 02:33:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751164402; cv=none; b=CvWRAdfT5hj+6JeiR3VPvgsMEj9M06GSNg5kLxuyk+z8dqWIgHgJ7+CWxOy9VDP1R5TK/64PA4LElTybO+ivyUFwdcmmiI16FHVsqMkSo7qJF8Wob9J9H9K6tl8VrnoUWZhpY1eCcITh5uxtbQV34Y3cQeXnD9wLlfRpq7yzBzg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751164402; c=relaxed/simple; bh=+qnxFMit2UysN/GO8pTAWOPkGXfCmQLCYvzY64P/LJk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=R3SGylplaI2l51mkcESvHVK+qH8kImBtxaZ/qzhSUQay6Zb9G1gEAX7JN7SgLty4YRXlQbtROShuSHEaXpuS6MRmU6AWd1Py9Xm/k70DODbIZYvPwR8zStTMkmf7ti1J/YqNZs28eSSs4shl5m4Q3UmBhU7Skf3SQE4Msa6oynQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KH+780Mk; arc=none smtp.client-ip=209.85.222.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KH+780Mk" Received: by mail-qk1-f170.google.com with SMTP id af79cd13be357-7d3900f90f6so104052485a.1; Sat, 28 Jun 2025 19:33:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751164399; x=1751769199; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=A2yrRl6Cx7gw+xBQ3mnPZPT2NGv2W+bvziSVeIuhSDk=; b=KH+780MkjcAeCTt3M4lvb10brJGUWWUqsvM79xeK4u5CiNLMNy0ke2tKMqaAOhUChq VF+WozZRD3ib931+ieFuo/Ak/6RcDTodWY3Qv0XRNRg+uH7KGzchB8g/0niyF5R4quzU JE5XxYUFwM6fDpLTPixcgxZtvNBp23F9rvULQJQdJvnXNMaPtiElxOc17YdevPHJKT82 PNLoGH6ZRTu9wa6zG6+M8jc5tT7bjGr1CHqKHv1sWmX+Yz8GWOYK5qK9tNFZ8fg7LGMN Ou3oi8NdRi7ZzMywa5+nPFSTPSJAAGAbjKa/6jJmaJ9bKKlyLO7KE19WOWcdyCwfUy1q KoBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751164399; x=1751769199; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A2yrRl6Cx7gw+xBQ3mnPZPT2NGv2W+bvziSVeIuhSDk=; b=MW8xWlVQZvUyX6+55Y9eWjUPAm3QrLmxevFHtmL9PRu+z+X1yWqAZXme9TnNKw8tTy uMZjmOHcqL3Pmue7rK/x8FvdV58AfjCnKk7A1izZfYiuxApU6FyKPE2drMNlgI1tJUZT TUN6f8wOHxAqtklKj8LDeopcSkl5ehNugQAdOLXVhBotMrohvglAeF/gNTX9mfvyFrs7 b2c/xKyce4xUzZf8slKcyZ+/9Dux+aFiGtQ+QbiR/d50H97IGxQU0+4/YjCa1OLmaOQD 6tk/ZJz4faIWTi/E/KWfea7yi6JpcirBwHQ6ttwKWO5TCKsc9G87bEifTDtevrhRuJOD v07A== X-Forwarded-Encrypted: i=1; AJvYcCUr4FbrCPldj5cLxUeLq3QkHUJqfBTiz/vqk/Gs6o+WF5CXJkuuNARcjjec5Hed+AjiiRai0x8m9IwE8rQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yw/ioJBhjrxAtRfbRoTA9MyRUOZ1KuO+kjogoIAGIuziQL8byOp IkaPkWI1GyunwvvO3xWwqv/ctQnCyxF/rYCJIsi7qiSdicdlSkNrKZeFiYg47muF X-Gm-Gg: ASbGncu7HSIb1L7aGrERl39LoqCsI5ykzhDDWioqQtHmKgtjoYjxdgUKlU4l0rhz/fu iGGAjUzOopmTALTkxBjQjNaQH5n6FF2z3RO5ee011ykRU4WlbaAau2ni0hpedHwpnMZdustbSP7 QUEo4/x7dvfAOIMqDGxmGgoC9DPb1eqf3maQFyU9wdcsGE/8Xp3EvuJ3ckZ4wyoSi2819J19n0n H6d8fmuaFTFPhJkmJeD70qbyw9aVdybO+SsTIetheu8wmwgFzt87uVHY5xAbTvG754jq3iiSrnO /PaIvdakhFxrAzi95qfIscBJ7D2v7SOQO5TjNRd8oGFfOGjjttCvBQK+EVRTCw== X-Google-Smtp-Source: AGHT+IGbzInNG7RUEPmg4Ego2xXLmZuQ32seAioI3CutA3ElLKI9yH9tCBMk2yShY0GmN/zlcboLJQ== X-Received: by 2002:a05:620a:31f7:b0:7d3:c5b7:2511 with SMTP id af79cd13be357-7d443994f1fmr1247335785a.36.1751164399213; Sat, 28 Jun 2025 19:33:19 -0700 (PDT) Received: from [192.168.1.26] ([181.88.247.122]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7d44317e285sm374242985a.45.2025.06.28.19.33.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Jun 2025 19:33:18 -0700 (PDT) From: Kurt Borja Date: Sat, 28 Jun 2025 23:32:53 -0300 Subject: [PATCH v2 1/3] platform/x86: think-lmi: Create ksets consecutively Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250628-lmi-fix-v2-1-c530e1c959d7@gmail.com> References: <20250628-lmi-fix-v2-0-c530e1c959d7@gmail.com> In-Reply-To: <20250628-lmi-fix-v2-0-c530e1c959d7@gmail.com> To: Mark Pearson , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Kurt Borja X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1636; i=kuurtb@gmail.com; h=from:subject:message-id; bh=+qnxFMit2UysN/GO8pTAWOPkGXfCmQLCYvzY64P/LJk=; b=owGbwMvMwCUmluBs8WX+lTTG02pJDBkJS18rq9gLGiu08e8IrEjfZZlerHJTTLHkhmPPPFkDb qc7Unc7SlkYxLgYZMUUWdoTFn17FJX31u9A6H2YOaxMIEMYuDgFYCIbdzP80/n+9dLhY6X7np3s lHfdKXIs9MivPnHLdosojhnLbaYoBTAydPFP23spKSa6eq9hy9XI5oT0xMdzo3xXFM9/O+PwPZZ KTgA= X-Developer-Key: i=kuurtb@gmail.com; a=openpgp; fpr=54D3BE170AEF777983C3C63B57E3B6585920A69A 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 Signed-off-by: Kurt Borja Reviewed-by: Ilpo J=C3=A4rvinen --- drivers/platform/x86/lenovo/think-lmi.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/platform/x86/lenovo/think-lmi.c b/drivers/platform/x86= /lenovo/think-lmi.c index 34a47269e3d34d2eda6b71af73892656cd2bf67d..b3e7d76cccf7840a5bcf7f849f2= a70e164cb7086 100644 --- a/drivers/platform/x86/lenovo/think-lmi.c +++ b/drivers/platform/x86/lenovo/think-lmi.c @@ -1457,6 +1457,14 @@ static int tlmi_sysfs_init(void) goto fail_device_created; } =20 + tlmi_priv.authentication_kset =3D kset_create_and_add("authentication", N= ULL, + &tlmi_priv.class_dev->kobj); + if (!tlmi_priv.authentication_kset) { + kset_unregister(tlmi_priv.attribute_kset); + ret =3D -ENOMEM; + goto fail_device_created; + } + for (i =3D 0; i < TLMI_SETTINGS_COUNT; i++) { /* Check if index is a valid setting - skip if it isn't */ if (!tlmi_priv.setting[i]) @@ -1498,12 +1506,6 @@ static int tlmi_sysfs_init(void) } =20 /* Create authentication entries */ - tlmi_priv.authentication_kset =3D kset_create_and_add("authentication", N= ULL, - &tlmi_priv.class_dev->kobj); - if (!tlmi_priv.authentication_kset) { - ret =3D -ENOMEM; - goto fail_create_attr; - } tlmi_priv.pwd_admin->kobj.kset =3D tlmi_priv.authentication_kset; ret =3D kobject_add(&tlmi_priv.pwd_admin->kobj, NULL, "%s", "Admin"); if (ret) --=20 2.50.0 From nobody Wed Oct 8 10:56:38 2025 Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5D69C18A953; Sun, 29 Jun 2025 02:33:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751164404; cv=none; b=P5uBkhEbgELdtD23silCOAiGY5UpPTt1XyMIcs5g6+talWTbwqpNRegQyZUXIXXC1f3pYQrkIEL6aHBGIEtg21ieK1t2UUdQqB6BZrOsg790DkTdn9sKOqHwLrBLXk0HIb0wCrXJsal+9d51swuA7656IrXDul/a1tjTpbVTYYQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751164404; c=relaxed/simple; bh=4frRl+NjI8ze8KHkLHFuHYY6hNNUOhVMtf0yzK6KW4U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=R4QoGceBXZ6h/oSWjmr/rf9Tr4wnImOglsx3nyJjruiOTq/0jTDrQVf93u038EqwpwzoaY3h7tfpvP79en0ZVZlI8UwG0wJXEJ1gRIgvnCxi2009ZBv6n+39k388kgWZfuAyCyLp1ewOgHJC1JImbSCxauJVyaJ2eLi28lsTuys= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=SKlx3Sef; arc=none smtp.client-ip=209.85.160.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SKlx3Sef" Received: by mail-qt1-f175.google.com with SMTP id d75a77b69052e-4a442a3a2bfso21350421cf.1; Sat, 28 Jun 2025 19:33:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751164401; x=1751769201; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=QtVZw/a0Pmqsz5CdBXUv/8QNoTvrF/mGpWCdQtvEPCw=; b=SKlx3SefxxKK3Lo/Vtgp87WgagT8skKii1q2ofFvg+yQCycB6lBBhy1NsOVjtPEeIc wTXCHfdSU6+FVN3HIQY8lLa5ShrKLZ9wY9OU8OFj5I6qFpfiuc4wBnIuJJHA3NvED4oQ 2T5reuvH5hz2EraKuPjtRNh6SjTExbx5B24YKurifx6PcuX7/EOP0evd8KzYub8FTbr3 RBrn0qPUQR0oF/Tr805hymtzKuOgDV6urRODbaKwXmSnphCSWuwzxCi/7ayFVIu54HyK YvsIGaHYcfZ/OenYQBkn4iVabPpjKwO8U2a1yIiARj+oow9x6lEopRT34lTRDsNHBnYA O6PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751164401; x=1751769201; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QtVZw/a0Pmqsz5CdBXUv/8QNoTvrF/mGpWCdQtvEPCw=; b=S7xvdK6A9S4tHykguJlEyVfr+WhDk3VQ6fVq9pM80n3rQDn1+OHl8fiXMyrSssu9Ki RWCkB/PsWtizB4EFTs0CZhUQQibS/KTxDWYN/oVgjMDds6AIJlv4nR5L87h+zuQ9uJsu Qmt2ouCG0nrExa3miUR5Ctvuflz60SPidNUvosS4pw2cVLX25kptnIQs5TFMpdZjoO1I mYpAOa0+xZ0LL/o95CLPKNmWzlxxaoYXRnB75xQpzPj3OctjStKvix9DnsixeKkM9lnx YR2J70q9BYdhfcocwQiMfpS+LIQqH4ZNCrp4VATPifruTcFVvRNEKDiSglAKssTLOX0T +z1g== X-Forwarded-Encrypted: i=1; AJvYcCWM20Tk98jxtON44HA4MQEExRZhBcKHaukHOq1XAJd7veCS2TKHLcO0nHRYhecG2qT3qwYFIB+hDlLlZi4=@vger.kernel.org X-Gm-Message-State: AOJu0YyVFxDUh+7ZPwuF8CBL8c1V4FBqAjhqkx1j/kcVU+McAw4H7MjF 2+vkULateuBiYWiwqtF6TcyeynP6gFqB3fQhIPdTw3NEQWHOsTz6mI+N X-Gm-Gg: ASbGnctZQdc+GYw7W/LP9w/EUUQjt4ZJ1X9vNaNG1q1FB5CTOIgW/qknV7MZu2dfLU6 CDfRjc8Xek1kPUxtprIUqNHygnFz1SBgHwfTPcbcqnc5yZfMmJ5W6jIYcJSsjMpJC1DaSj/CG8l I7uJZX6zd7R3bkvCisyF+rg8BypeC/pNAn1O/8/n5SdlUYCwZybt0kPpnvdF7qHTUj5EKOqoxxY PtkflIqHbAdGnzPkrJ0sTCa08yOSXYKaMLgGLAgUjR/ChAMMF4K53m214nKw68OZmTcYRmqSQMo Fbit2hRU4Icth/LRdgOb8BFodc3XRJqAp6hlsc5YtBXOu1wseOYPl5tJDYnJpQ== X-Google-Smtp-Source: AGHT+IG33knh5/EKRSMraS+XGepHzA9rayJus8oSr2nzUZ06QYx7b6jprFn7wmOcDX104MNf6fSuqQ== X-Received: by 2002:a05:622a:1456:b0:4a4:2c46:26a2 with SMTP id d75a77b69052e-4a7fc9ca497mr117404131cf.10.1751164401075; Sat, 28 Jun 2025 19:33:21 -0700 (PDT) Received: from [192.168.1.26] ([181.88.247.122]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7d44317e285sm374242985a.45.2025.06.28.19.33.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Jun 2025 19:33:20 -0700 (PDT) From: Kurt Borja Date: Sat, 28 Jun 2025 23:32:54 -0300 Subject: [PATCH v2 2/3] platform/x86: think-lmi: Fix kobject cleanup Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250628-lmi-fix-v2-2-c530e1c959d7@gmail.com> References: <20250628-lmi-fix-v2-0-c530e1c959d7@gmail.com> In-Reply-To: <20250628-lmi-fix-v2-0-c530e1c959d7@gmail.com> To: Mark Pearson , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Kurt Borja X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5694; i=kuurtb@gmail.com; h=from:subject:message-id; bh=4frRl+NjI8ze8KHkLHFuHYY6hNNUOhVMtf0yzK6KW4U=; b=owGbwMvMwCUmluBs8WX+lTTG02pJDBkJS1/fnC/06+DXx/JHp23isKvOt49/bdPN02Fe1Zr+9 GrEJGa1jlIWBjEuBlkxRZb2hEXfHkXlvfU7EHofZg4rE8gQBi5OAZiIjwcjw68FbHWz2d/2+R2p LLL3+Kb28qg6R1bgv0191/cEdKYGf2L475zBWvlCepl8TvSO/R/PcS95rajE+P6/vJwWq8avt9l n+AA= X-Developer-Key: i=kuurtb@gmail.com; a=openpgp; fpr=54D3BE170AEF777983C3C63B57E3B6585920A69A In tlmi_analyze(), allocated structs with an embedded kobject are freed in error paths after the they were already initialized. Fix this by first by avoiding the initialization of kobjects in tlmi_analyze() and then by correctly cleaning them up in tlmi_release_attr() using their kset's kobject list. Fixes: 30e78435d3bf ("platform/x86: think-lmi: Split kobject_init() and kob= ject_add() calls") Reviewed-by: Mark Pearson Signed-off-by: Kurt Borja Reviewed-by: Ilpo J=C3=A4rvinen --- drivers/platform/x86/lenovo/think-lmi.c | 35 ++++++++++++++++++-----------= ---- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/drivers/platform/x86/lenovo/think-lmi.c b/drivers/platform/x86= /lenovo/think-lmi.c index b3e7d76cccf7840a5bcf7f849f2a70e164cb7086..200e58f130f8874b929ceb0d98b= f4daea77740c8 100644 --- a/drivers/platform/x86/lenovo/think-lmi.c +++ b/drivers/platform/x86/lenovo/think-lmi.c @@ -1382,13 +1382,13 @@ static struct kobj_attribute debug_cmd =3D __ATTR_W= O(debug_cmd); /* ---- Initialisation ---------------------------------------------------= ------ */ static void tlmi_release_attr(void) { + struct kobject *pos, *n; int i; =20 /* Attribute structures */ for (i =3D 0; i < TLMI_SETTINGS_COUNT; i++) { if (tlmi_priv.setting[i]) { sysfs_remove_group(&tlmi_priv.setting[i]->kobj, &tlmi_attr_group); - kobject_put(&tlmi_priv.setting[i]->kobj); } } sysfs_remove_file(&tlmi_priv.attribute_kset->kobj, &pending_reboot.attr); @@ -1397,6 +1397,9 @@ static void tlmi_release_attr(void) if (tlmi_priv.can_debug_cmd && debug_support) sysfs_remove_file(&tlmi_priv.attribute_kset->kobj, &debug_cmd.attr); =20 + list_for_each_entry_safe(pos, n, &tlmi_priv.attribute_kset->list, entry) + kobject_put(pos); + kset_unregister(tlmi_priv.attribute_kset); =20 /* Free up any saved signatures */ @@ -1405,19 +1408,17 @@ static void tlmi_release_attr(void) =20 /* Authentication structures */ sysfs_remove_group(&tlmi_priv.pwd_admin->kobj, &auth_attr_group); - kobject_put(&tlmi_priv.pwd_admin->kobj); sysfs_remove_group(&tlmi_priv.pwd_power->kobj, &auth_attr_group); - kobject_put(&tlmi_priv.pwd_power->kobj); =20 if (tlmi_priv.opcode_support) { sysfs_remove_group(&tlmi_priv.pwd_system->kobj, &auth_attr_group); - kobject_put(&tlmi_priv.pwd_system->kobj); sysfs_remove_group(&tlmi_priv.pwd_hdd->kobj, &auth_attr_group); - kobject_put(&tlmi_priv.pwd_hdd->kobj); sysfs_remove_group(&tlmi_priv.pwd_nvme->kobj, &auth_attr_group); - kobject_put(&tlmi_priv.pwd_nvme->kobj); } =20 + list_for_each_entry_safe(pos, n, &tlmi_priv.authentication_kset->list, en= try) + kobject_put(pos); + kset_unregister(tlmi_priv.authentication_kset); } =20 @@ -1481,8 +1482,8 @@ static int tlmi_sysfs_init(void) =20 /* Build attribute */ tlmi_priv.setting[i]->kobj.kset =3D tlmi_priv.attribute_kset; - ret =3D kobject_add(&tlmi_priv.setting[i]->kobj, NULL, - "%s", tlmi_priv.setting[i]->display_name); + ret =3D kobject_init_and_add(&tlmi_priv.setting[i]->kobj, &tlmi_attr_set= ting_ktype, + NULL, "%s", tlmi_priv.setting[i]->display_name); if (ret) goto fail_create_attr; =20 @@ -1507,7 +1508,8 @@ static int tlmi_sysfs_init(void) =20 /* Create authentication entries */ tlmi_priv.pwd_admin->kobj.kset =3D tlmi_priv.authentication_kset; - ret =3D kobject_add(&tlmi_priv.pwd_admin->kobj, NULL, "%s", "Admin"); + ret =3D kobject_init_and_add(&tlmi_priv.pwd_admin->kobj, &tlmi_pwd_settin= g_ktype, + NULL, "%s", "Admin"); if (ret) goto fail_create_attr; =20 @@ -1516,7 +1518,8 @@ static int tlmi_sysfs_init(void) goto fail_create_attr; =20 tlmi_priv.pwd_power->kobj.kset =3D tlmi_priv.authentication_kset; - ret =3D kobject_add(&tlmi_priv.pwd_power->kobj, NULL, "%s", "Power-on"); + ret =3D kobject_init_and_add(&tlmi_priv.pwd_power->kobj, &tlmi_pwd_settin= g_ktype, + NULL, "%s", "Power-on"); if (ret) goto fail_create_attr; =20 @@ -1526,7 +1529,8 @@ static int tlmi_sysfs_init(void) =20 if (tlmi_priv.opcode_support) { tlmi_priv.pwd_system->kobj.kset =3D tlmi_priv.authentication_kset; - ret =3D kobject_add(&tlmi_priv.pwd_system->kobj, NULL, "%s", "System"); + ret =3D kobject_init_and_add(&tlmi_priv.pwd_system->kobj, &tlmi_pwd_sett= ing_ktype, + NULL, "%s", "System"); if (ret) goto fail_create_attr; =20 @@ -1535,7 +1539,8 @@ static int tlmi_sysfs_init(void) goto fail_create_attr; =20 tlmi_priv.pwd_hdd->kobj.kset =3D tlmi_priv.authentication_kset; - ret =3D kobject_add(&tlmi_priv.pwd_hdd->kobj, NULL, "%s", "HDD"); + ret =3D kobject_init_and_add(&tlmi_priv.pwd_hdd->kobj, &tlmi_pwd_setting= _ktype, + NULL, "%s", "HDD"); if (ret) goto fail_create_attr; =20 @@ -1544,7 +1549,8 @@ static int tlmi_sysfs_init(void) goto fail_create_attr; =20 tlmi_priv.pwd_nvme->kobj.kset =3D tlmi_priv.authentication_kset; - ret =3D kobject_add(&tlmi_priv.pwd_nvme->kobj, NULL, "%s", "NVMe"); + ret =3D kobject_init_and_add(&tlmi_priv.pwd_nvme->kobj, &tlmi_pwd_settin= g_ktype, + NULL, "%s", "NVMe"); if (ret) goto fail_create_attr; =20 @@ -1581,8 +1587,6 @@ static struct tlmi_pwd_setting *tlmi_create_auth(cons= t char *pwd_type, new_pwd->maxlen =3D tlmi_priv.pwdcfg.core.max_length; new_pwd->index =3D 0; =20 - kobject_init(&new_pwd->kobj, &tlmi_pwd_setting_ktype); - return new_pwd; } =20 @@ -1687,7 +1691,6 @@ static int tlmi_analyze(struct wmi_device *wdev) if (setting->possible_values) strreplace(setting->possible_values, ',', ';'); =20 - kobject_init(&setting->kobj, &tlmi_attr_setting_ktype); tlmi_priv.setting[i] =3D setting; kfree(item); } --=20 2.50.0 From nobody Wed Oct 8 10:56:38 2025 Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 482551A8419; Sun, 29 Jun 2025 02:33:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751164406; cv=none; b=RhcM+NnkxLWpxSrRGq93zYYcpnX5YrebxjOHKov8uSAvHuyssojdNywSDB6FUIyGe+Z3c5Srmg6qPRkIQnS8i2QAI4QZg8011cXUnKFpL0sAQlz+7cbeSqB3gFx+s4u97BuTtl88E2D7+xpQkEOfb+l00rpPiB3WhrV5DlbGb2Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751164406; c=relaxed/simple; bh=FaQPTkm6B0uaTh4SF38aYxONyNRJUBKGoYUMqX8jP8I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=M8Z9QgZd9Iizyp/70xM5gGwi892feo5jx6TU2BcKEZmBcDes5hqq4z458lf4X3dnnxYOy+Oz6513/Gb96xCwv2G5/2YE1ow2oymTMUOoJXncxbAYs9R+bOg9Nls3ze7OMQgXYSeWRSrJQWmAjfrAtc85VQXkx7rpmJ60vlmefDk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=eG0A66qf; arc=none smtp.client-ip=209.85.160.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eG0A66qf" Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-4a4312b4849so39534331cf.1; Sat, 28 Jun 2025 19:33:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751164403; x=1751769203; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=rlxZ5m41HrSs0oPioWCRWil7R6kunOaWMyh4q2HiDWQ=; b=eG0A66qfY4un/LW2hKE0lB/EN82EE9ei0OAOQzw0f5eCVYYapUdWtPnYy7sEONp2ed iRnNTW28F5r1ISm8igSXMJOCEfcihDvhj0B7IlgcZIJv5sIUFYoNL3R6afJqWoUJOBAw AeO0uaEkOmPNMV943UV7TIZT9QRKGGd1C5DNccjmnXbGnPrN4GuGaob63yW9ORQentXt VsMggw1jUS3ODF/eKE0GDuqZSXm1WArkZjbx0RwAjSmRH5b0lmilW+obsMyCmlKcTqPx 8PD8EaqlWFTEMIiOaQXlNgPQgpOCkPZshtX13NqfhP4LZjzUPUbpyjFFPj9Lh03F/kUQ HPOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751164403; x=1751769203; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rlxZ5m41HrSs0oPioWCRWil7R6kunOaWMyh4q2HiDWQ=; b=edRQ3M7hpkdriKX9RXpbNbB+ReWnOmXRKGkpOU0Z8E6vUn09PRQMlAuWP11Mjzw3As OHMAqPGtmxNyKsKWzWVAprnia7s2VLIRxE7MjQF1xcL6IDYAmyjvFbTLAfuIaurzkFx0 xEatjJzwNKg5Mw5Mrz7cixOCVXwMV6l2vGj+MQcZDxzpYV0fnNavtEZSA0mm4pOvdVKY UGuEbyq8Sh336GBP5jmWK5kVBzYg6V+LcLcP+a5Yy9mGCeYQUdgdISgliwCJz04qLwJX 4+o/3HNQXdPF4Xc+4veuN34z5Y7Lcr/ehmj1mTO5lnBAJCQzXHY6vt1FAZxZ0UbjMjZx 0y5w== X-Forwarded-Encrypted: i=1; AJvYcCVk+WhPVp0HWiA1o5yb4/Pjkm3C63iooGDhzu2PvhrYhvjfbyqENmsNEFMWdvrURmIABqMXC+DGzvcOWGs=@vger.kernel.org X-Gm-Message-State: AOJu0YwxgpaqgKSFinFd9ssBbv9Yoehw4tETHs9sh2y18FgIujBC+ToL OJfR8DKEdaT80Iw0qNP8NafZms/DqLN4RTr+1JWYLgg/H4p+sfq3ChCc6l5Nazh+ X-Gm-Gg: ASbGncuNS6lr9srLDiyTNvDB8tj7q++GWD0PWhFMj5Z4WFIjjxasTVTyfCZ6Okd2OQB /Vaoie5d6baGLper2YN56AkaBxkPFph0d4QbBD0QEg1p4QG+FfvbGNMTRcGfGMacF6vaJY9InH4 pFmaXBDVwLlrd1qnXQOxQrv60lMdA0CCIpGD4ITqaYNHqyL9bRIdWCrmMt1qr+3yF5W1ukN7mWd exrTjfEGybYMWoP2p+esSXemyUD5HkkNNWWSZsAOlCu2k7Tz/JhrBsNEsMJcVhtcC3U/Ra1ky7Q zPsAaOyFZU2OOjKAs/7nLxh9/HJpL7Og4nr6ApEs/YhDUOZCO9AEGeqxCgdI1s+syTlDPbyo X-Google-Smtp-Source: AGHT+IEAF5zZJc8SLBXvF6M/br0xjc9eqTI7I/rxemotIKCCVSxoKIddHDjM6IueW1kcBDvS+Q8Tkg== X-Received: by 2002:a05:622a:19a9:b0:4a7:1402:3b1 with SMTP id d75a77b69052e-4a7fc9d42e0mr148114811cf.11.1751164403045; Sat, 28 Jun 2025 19:33:23 -0700 (PDT) Received: from [192.168.1.26] ([181.88.247.122]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7d44317e285sm374242985a.45.2025.06.28.19.33.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Jun 2025 19:33:22 -0700 (PDT) From: Kurt Borja Date: Sat, 28 Jun 2025 23:32:55 -0300 Subject: [PATCH v2 3/3] platform/x86: think-lmi: Fix sysfs group cleanup Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250628-lmi-fix-v2-3-c530e1c959d7@gmail.com> References: <20250628-lmi-fix-v2-0-c530e1c959d7@gmail.com> In-Reply-To: <20250628-lmi-fix-v2-0-c530e1c959d7@gmail.com> To: Mark Pearson , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Kurt Borja X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5203; i=kuurtb@gmail.com; h=from:subject:message-id; bh=FaQPTkm6B0uaTh4SF38aYxONyNRJUBKGoYUMqX8jP8I=; b=owGbwMvMwCUmluBs8WX+lTTG02pJDBkJS1/LTZvH8DVWXljtf8r5ku9/3xhXBv24/e/cVOlVL 0sqDst2dZSyMIhxMciKKbK0Jyz69igq763fgdD7MHNYmUCGMHBxCsBE9NoYGSYnLZhVMq9xlZOp 2aaFSRNvF0t5hezt1H+/QGmyofX58GZGhmVXu+QeX93L9267X0TrK5nvu98a8kyzu6rtmOXV0/3 qOBsA X-Developer-Key: i=kuurtb@gmail.com; a=openpgp; fpr=54D3BE170AEF777983C3C63B57E3B6585920A69A Many error paths in tlmi_sysfs_init() lead to sysfs groups being removed when they were not even created. Fix this by letting the kobject core manage these groups through their kobj_type's defult_groups. Fixes: a40cd7ef22fb ("platform/x86: think-lmi: Add WMI interface support on= Lenovo platforms") Reviewed-by: Mark Pearson Signed-off-by: Kurt Borja Reviewed-by: Ilpo J=C3=A4rvinen --- drivers/platform/x86/lenovo/think-lmi.c | 43 +++--------------------------= ---- 1 file changed, 4 insertions(+), 39 deletions(-) diff --git a/drivers/platform/x86/lenovo/think-lmi.c b/drivers/platform/x86= /lenovo/think-lmi.c index 200e58f130f8874b929ceb0d98bf4daea77740c8..d57fc456c12315361ca451d1d91= 4826205960ab4 100644 --- a/drivers/platform/x86/lenovo/think-lmi.c +++ b/drivers/platform/x86/lenovo/think-lmi.c @@ -975,6 +975,7 @@ static const struct attribute_group auth_attr_group =3D= { .is_visible =3D auth_attr_is_visible, .attrs =3D auth_attrs, }; +__ATTRIBUTE_GROUPS(auth_attr); =20 /* ---- Attributes sysfs -------------------------------------------------= -------- */ static ssize_t display_name_show(struct kobject *kobj, struct kobj_attribu= te *attr, @@ -1190,6 +1191,7 @@ static const struct attribute_group tlmi_attr_group = =3D { .is_visible =3D attr_is_visible, .attrs =3D tlmi_attrs, }; +__ATTRIBUTE_GROUPS(tlmi_attr); =20 static void tlmi_attr_setting_release(struct kobject *kobj) { @@ -1209,11 +1211,13 @@ static void tlmi_pwd_setting_release(struct kobject= *kobj) static const struct kobj_type tlmi_attr_setting_ktype =3D { .release =3D &tlmi_attr_setting_release, .sysfs_ops =3D &kobj_sysfs_ops, + .default_groups =3D tlmi_attr_groups, }; =20 static const struct kobj_type tlmi_pwd_setting_ktype =3D { .release =3D &tlmi_pwd_setting_release, .sysfs_ops =3D &kobj_sysfs_ops, + .default_groups =3D auth_attr_groups, }; =20 static ssize_t pending_reboot_show(struct kobject *kobj, struct kobj_attri= bute *attr, @@ -1383,14 +1387,8 @@ static struct kobj_attribute debug_cmd =3D __ATTR_WO= (debug_cmd); static void tlmi_release_attr(void) { struct kobject *pos, *n; - int i; =20 /* Attribute structures */ - for (i =3D 0; i < TLMI_SETTINGS_COUNT; i++) { - if (tlmi_priv.setting[i]) { - sysfs_remove_group(&tlmi_priv.setting[i]->kobj, &tlmi_attr_group); - } - } sysfs_remove_file(&tlmi_priv.attribute_kset->kobj, &pending_reboot.attr); sysfs_remove_file(&tlmi_priv.attribute_kset->kobj, &save_settings.attr); =20 @@ -1407,15 +1405,6 @@ static void tlmi_release_attr(void) kfree(tlmi_priv.pwd_admin->save_signature); =20 /* Authentication structures */ - sysfs_remove_group(&tlmi_priv.pwd_admin->kobj, &auth_attr_group); - sysfs_remove_group(&tlmi_priv.pwd_power->kobj, &auth_attr_group); - - if (tlmi_priv.opcode_support) { - sysfs_remove_group(&tlmi_priv.pwd_system->kobj, &auth_attr_group); - sysfs_remove_group(&tlmi_priv.pwd_hdd->kobj, &auth_attr_group); - sysfs_remove_group(&tlmi_priv.pwd_nvme->kobj, &auth_attr_group); - } - list_for_each_entry_safe(pos, n, &tlmi_priv.authentication_kset->list, en= try) kobject_put(pos); =20 @@ -1486,10 +1475,6 @@ static int tlmi_sysfs_init(void) NULL, "%s", tlmi_priv.setting[i]->display_name); if (ret) goto fail_create_attr; - - ret =3D sysfs_create_group(&tlmi_priv.setting[i]->kobj, &tlmi_attr_group= ); - if (ret) - goto fail_create_attr; } =20 ret =3D sysfs_create_file(&tlmi_priv.attribute_kset->kobj, &pending_reboo= t.attr); @@ -1513,20 +1498,12 @@ static int tlmi_sysfs_init(void) if (ret) goto fail_create_attr; =20 - ret =3D sysfs_create_group(&tlmi_priv.pwd_admin->kobj, &auth_attr_group); - if (ret) - goto fail_create_attr; - tlmi_priv.pwd_power->kobj.kset =3D tlmi_priv.authentication_kset; ret =3D kobject_init_and_add(&tlmi_priv.pwd_power->kobj, &tlmi_pwd_settin= g_ktype, NULL, "%s", "Power-on"); if (ret) goto fail_create_attr; =20 - ret =3D sysfs_create_group(&tlmi_priv.pwd_power->kobj, &auth_attr_group); - if (ret) - goto fail_create_attr; - if (tlmi_priv.opcode_support) { tlmi_priv.pwd_system->kobj.kset =3D tlmi_priv.authentication_kset; ret =3D kobject_init_and_add(&tlmi_priv.pwd_system->kobj, &tlmi_pwd_sett= ing_ktype, @@ -1534,29 +1511,17 @@ static int tlmi_sysfs_init(void) if (ret) goto fail_create_attr; =20 - ret =3D sysfs_create_group(&tlmi_priv.pwd_system->kobj, &auth_attr_group= ); - if (ret) - goto fail_create_attr; - tlmi_priv.pwd_hdd->kobj.kset =3D tlmi_priv.authentication_kset; ret =3D kobject_init_and_add(&tlmi_priv.pwd_hdd->kobj, &tlmi_pwd_setting= _ktype, NULL, "%s", "HDD"); if (ret) goto fail_create_attr; =20 - ret =3D sysfs_create_group(&tlmi_priv.pwd_hdd->kobj, &auth_attr_group); - if (ret) - goto fail_create_attr; - tlmi_priv.pwd_nvme->kobj.kset =3D tlmi_priv.authentication_kset; ret =3D kobject_init_and_add(&tlmi_priv.pwd_nvme->kobj, &tlmi_pwd_settin= g_ktype, NULL, "%s", "NVMe"); if (ret) goto fail_create_attr; - - ret =3D sysfs_create_group(&tlmi_priv.pwd_nvme->kobj, &auth_attr_group); - if (ret) - goto fail_create_attr; } =20 return ret; --=20 2.50.0