From nobody Thu Apr 2 21:49:47 2026 Received: from mail-dy1-f174.google.com (mail-dy1-f174.google.com [74.125.82.174]) (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 AB91835A952 for ; Thu, 2 Apr 2026 03:24:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775100271; cv=none; b=kzM4SAdGObWcVdhtyXUwpw3kEUYAKzt/hUMOVtgJmqw3Aopyg4slnMsjPgzjv9IjeMeRVZCqJ6q7H63dCxEgPpZde38fbkkufCeUWrSqVm1SyiHc7UedKT90IwWm3aWXVVyQ78LdtpFXplF+UGZ8QFSH4rPfwjuQLXpPQh/Ldek= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775100271; c=relaxed/simple; bh=WAyuXvHg+IDaHK96s8SFan2J1QbE5G5c5VzthemtNBg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jhuGp11BeO3KKKKtYLnIks2c4JcUV7kAkLI+7L5tcZW2dVsCZHGsGq5RICJLQkyttdK5ZIVMVDzpEEtQWCa+MHFhr9RbUVEVK12KlM2qFhPvAfZgJAA8/Vq8jrzSFc4ZdKHbqtOzr+sSvrFZ7KFJlOnW5jc4vwUwbuLXcOQdymI= 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=AzMg0njM; arc=none smtp.client-ip=74.125.82.174 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="AzMg0njM" Received: by mail-dy1-f174.google.com with SMTP id 5a478bee46e88-2bd9a485bd6so1038816eec.1 for ; Wed, 01 Apr 2026 20:24:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775100269; x=1775705069; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dtWSJAsPoNeIGexvUzam2g4A6bay7wxoWEXeu9FJabM=; b=AzMg0njMn0/kNGALFGS5YQVXzYWCXMHMJbqqGV3kmREZzrMnJtv+Y/DqvEJqa5gxDu xLSGjTeU8aobc1Ek0GFem8ObsrAmgzn5UR8Nyx9fxpsWb7F7aJch2/mIgAaoffQFcHYz 5Qj/tw8J7TXNjk44THIT2dU56A/Q/yChWOE+FOtyMceEKeedPHnqZidA3E3/zn7Antk/ k2o/MWlVIWEhZpslhEtU1WyvFo10k13wXPFIIDF6LWGWBu95iZQTWsng8F+Bh7cJwwzZ gmYvMw0tEIpgTycei4XpDO2QgscAtq6hMM8Qh+Eh9KGwoHWRL6HZQJwfXJNGwXE5rGJJ pLDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775100269; x=1775705069; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=dtWSJAsPoNeIGexvUzam2g4A6bay7wxoWEXeu9FJabM=; b=r5lIiSv5BWf0y8F/PABAVF5UHT2UNBZYTyXnA5zf4GXJi+fsZDehzxoOa34g5W0JVp V71+T8vu709ypK6bUigpD7L506xfECBIziPlYNgIl/wduZ3Kzgf6vPuCB/plKC4Q6Jdd R89wJrX1xk8SnuG7E+u4P3GrN5h1bBA15qQfhF4gCnn5BliFpDWnq//fgktFSONsZomg za6xdKT+jkfnIzPYWCuhlhfsBPCrFe8bGZWWC+3ZrX4P2WF8KuTalLd+KOoHssSYu9xx qJMePIsyTYBMOOixjF4qSQzbuIMrsXVA+7k3+C+iHZCaUzzJWw9jERt3YDzQknurb4GX 9AIA== X-Forwarded-Encrypted: i=1; AJvYcCUfRTo16j3gGpVv46Z+rry66X0R0OH7ptbU5kb9usM+EOdcb/ix55iXdMDEM/4OHm5eROyHdydjg+mKvdg=@vger.kernel.org X-Gm-Message-State: AOJu0YxXi/lGA0fQyrnoZOf8LJHXkDlEqvlbaHW64AeRtScI9DQPAPZA muxA7NU9PAYrsXOCkrpugLj2qtgVzl3TOht8zpyX9vF64mdSfU0lTKFs X-Gm-Gg: ATEYQzwn/XieP3V/Ha/jbzAVXYmMvByVcnORf1+FBb6KRAw94jZMZir0uVcctTRlDpU 5CaLRDa+/x9Yjp+ZjEeTSLQiGsCm3i66ymz+FnE4C6VhhIZqQkGwccVd8RxleCMzb8SsA6txZZ8 RHa/zWwvPmvtIu1hjVWadEVGY4t5+5vszcG+cAjjPBv8DXsZrjXcFFTKHG6cBu5fzu7uIsuGDzC hQWjmDHNU97aEAWr7sMWKTsY7N4KuIinXdluuUhkQocoNm8h0LKY/sccGoDX/WgeIrJUZ70k/9t uehTIP1kiU3QntXN1cp8MmbsgLfZdNfT17SgaogPbDehNkrKTpHTQlx0KvNR8HSELMGGWROWK/4 MaV4to2Oiq2hcNauWV80hOq8hFW4UHoTsGARolVRTl8pCfTVs786vpM5kPcxPIbMwCN1vyUrQGA Tg1F+u3DMfoBV6MLwcRBwWvCyzDiortTcqjaDM+StxVF03UPvY9Izb8G3SGm4oUbWWX3bIjtlkR eGM X-Received: by 2002:a05:7300:a483:b0:2c4:ec89:bd3 with SMTP id 5a478bee46e88-2c932bb1d1amr3029865eec.24.1775100268688; Wed, 01 Apr 2026 20:24:28 -0700 (PDT) Received: from lappy (108-228-232-20.lightspeed.sndgca.sbcglobal.net. [108.228.232.20]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2ca7cae9e9esm1265981eec.23.2026.04.01.20.24.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2026 20:24:28 -0700 (PDT) From: "Derek J. Clark" To: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Hans de Goede Cc: Mark Pearson , Armin Wolf , Jonathan Corbet , Rong Zhang , Kurt Borja , "Derek J . Clark" , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v7 02/16] platform/x86: lenovo-wmi-other: Balance IDA id allocation and free Date: Thu, 2 Apr 2026 03:24:10 +0000 Message-ID: <20260402032424.678528-3-derekjohn.clark@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260402032424.678528-1-derekjohn.clark@gmail.com> References: <20260402032424.678528-1-derekjohn.clark@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Rong Zhang Currently, the IDA id is only freed on wmi-other device removal or failure to create firmware-attributes device, kset, or attributes. It leaks IDA ids if the wmi-other device is bound multiple times, as the unbind callback never frees the previously allocated IDA id. Additionally, if the wmi-other device has failed to create a firmware-attributes device before it gets removed, the wmi-device removal callback double frees the same IDA id. These bugs were found by sashiko.dev [1]. Fix them by moving ida_free() into lwmi_om_fw_attr_remove() so it is balanced with ida_alloc() in lwmi_om_fw_attr_add(). With them fixed, properly set and utilize the validity of priv->ida_id to balance firmware-attributes registration and removal, without relying on propagating the registration error to the component framework, which is more reliable and aligns with the hwmon device registration and removal sequences. No functional change intended. Fixes: edc4b183b794 ("platform/x86: Add Lenovo Other Mode WMI Driver") Cc: stable@vger.kernel.org Link: https://sashiko.dev/#/patchset/20260331181208.421552-1-derekjohn.clar= k%40gmail.com [1] Signed-off-by: Rong Zhang --- drivers/platform/x86/lenovo/wmi-other.c | 34 +++++++++++++++---------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86= /lenovo/wmi-other.c index 6040f45aa2b0..b47418df099f 100644 --- a/drivers/platform/x86/lenovo/wmi-other.c +++ b/drivers/platform/x86/lenovo/wmi-other.c @@ -957,17 +957,17 @@ static struct capdata01_attr_group cd01_attr_groups[]= =3D { /** * lwmi_om_fw_attr_add() - Register all firmware_attributes_class members * @priv: The Other Mode driver data. - * - * Return: Either 0, or an error code. */ -static int lwmi_om_fw_attr_add(struct lwmi_om_priv *priv) +static void lwmi_om_fw_attr_add(struct lwmi_om_priv *priv) { unsigned int i; int err; =20 priv->ida_id =3D ida_alloc(&lwmi_om_ida, GFP_KERNEL); - if (priv->ida_id < 0) - return priv->ida_id; + if (priv->ida_id < 0) { + err =3D priv->ida_id; + goto err; + } =20 priv->fw_attr_dev =3D device_create(&firmware_attributes_class, NULL, MKDEV(0, 0), NULL, "%s-%u", @@ -993,7 +993,7 @@ static int lwmi_om_fw_attr_add(struct lwmi_om_priv *pri= v) =20 cd01_attr_groups[i].tunable_attr->dev =3D &priv->wdev->dev; } - return 0; + return; =20 err_remove_groups: while (i--) @@ -1007,7 +1007,12 @@ static int lwmi_om_fw_attr_add(struct lwmi_om_priv *= priv) =20 err_free_ida: ida_free(&lwmi_om_ida, priv->ida_id); - return err; + +err: + priv->ida_id =3D -EIDRM; + + dev_warn(&priv->wdev->dev, + "failed to register firmware-attributes device: %d\n", err); } =20 /** @@ -1016,12 +1021,17 @@ static int lwmi_om_fw_attr_add(struct lwmi_om_priv = *priv) */ static void lwmi_om_fw_attr_remove(struct lwmi_om_priv *priv) { + if (priv->ida_id < 0) + return; + for (unsigned int i =3D 0; i < ARRAY_SIZE(cd01_attr_groups) - 1; i++) sysfs_remove_group(&priv->fw_attr_kset->kobj, cd01_attr_groups[i].attr_group); =20 kset_unregister(priv->fw_attr_kset); device_unregister(priv->fw_attr_dev); + ida_free(&lwmi_om_ida, priv->ida_id); + priv->ida_id =3D -EIDRM; } =20 /* =3D=3D=3D=3D=3D=3D=3D=3D Self (master: lenovo-wmi-other) =3D=3D=3D=3D= =3D=3D=3D=3D */ @@ -1063,7 +1073,9 @@ static int lwmi_om_master_bind(struct device *dev) =20 lwmi_om_fan_info_collect_cd00(priv); =20 - return lwmi_om_fw_attr_add(priv); + lwmi_om_fw_attr_add(priv); + + return 0; } =20 /** @@ -1115,13 +1127,7 @@ static int lwmi_other_probe(struct wmi_device *wdev,= const void *context) =20 static void lwmi_other_remove(struct wmi_device *wdev) { - struct lwmi_om_priv *priv =3D dev_get_drvdata(&wdev->dev); - component_master_del(&wdev->dev, &lwmi_om_master_ops); - - /* No IDA to free if the driver is never bound to its components. */ - if (priv->ida_id >=3D 0) - ida_free(&lwmi_om_ida, priv->ida_id); } =20 static const struct wmi_device_id lwmi_other_id_table[] =3D { --=20 2.53.0