Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5;
Received-SPF: SoftFail (protection.outlook.com: domain of transitioning
 lenovo.com discourages use of 104.232.225.6 as permitted sender)
Message-ID: <8e1592dd-7e95-20a6-15e7-f21798af3d37@lenovo.com>
Date:   Mon, 25 Sep 2023 10:00:02 -0400
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.13.0
Subject: Re: [External] [PATCH] platform/x86: think-lmi: Fix reference leak
Content-Language: en-US
To:     Armin Wolf <W_Armin@gmx.de>
CC:     <hdegoede@redhat.com>, <markgross@kernel.org>,
        <ilpo.jarvinen@linux.intel.com>,
        <platform-driver-x86@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>
References: <20230923204154.86815-1-W_Armin@gmx.de>
From:   Mark Pearson <markpearson@lenovo.com>
In-Reply-To: <20230923204154.86815-1-W_Armin@gmx.de>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2023 14:00:05.9121
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 78c528b2-eab0-4f4a-bb73-08dbbdcfb917
X-MS-Exchange-CrossTenant-Id: 5c7d0b28-bdf8-410c-aa93-4df372b16203
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5c7d0b28-bdf8-410c-aa93-4df372b16203;Ip=[104.232.225.6];Helo=[mail.lenovo.com]
X-MS-Exchange-CrossTenant-AuthSource: SG1PEPF000082E7.apcprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR03MB6976
X-Spam-Status: No, score=-2.3 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Mon, 25 Sep 2023 07:00:21 -0700 (PDT)

Thanks Armin,

On 9/23/23 16:41, Armin Wolf wrote:
> If a duplicate attribute is found using kset_find_obj(), a reference
> to that attribute is returned which needs to be disposed accordingly
> using kobject_put(). Move the setting name validation into a separate
> function to allow for this change without having to duplicate the
> cleanup code for this setting.
> As a side note, a very similar bug was fixed in
> commit 7295a996fdab ("platform/x86: dell-sysman: Fix reference leak"),
> so it seems that the bug was copied from that driver.
>
> Compile-tested only.
>
> Fixes: 1bcad8e510b2 ("platform/x86: think-lmi: Fix issues with duplicate attributes")
> Signed-off-by: Armin Wolf <W_Armin@gmx.de>
> ---
>   drivers/platform/x86/think-lmi.c | 24 ++++++++++++++++++++----
>   1 file changed, 20 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c
> index 4be6f28d4600..3a396b763c49 100644
> --- a/drivers/platform/x86/think-lmi.c
> +++ b/drivers/platform/x86/think-lmi.c
> @@ -1344,6 +1344,24 @@ static void tlmi_release_attr(void)
>   	kset_unregister(tlmi_priv.authentication_kset);
>   }
>
> +static int tlmi_validate_setting_name(struct kset *attribute_kset, char *name)
> +{
> +	struct kobject *duplicate;
> +
> +	if (!strcmp(name, "Reserved"))
> +		return -EINVAL;
> +
> +	duplicate = kset_find_obj(attribute_kset, name);
> +	if (duplicate) {
> +		pr_debug("Duplicate attribute name found - %s\n", name);
> +		/* kset_find_obj() returns a reference */
> +		kobject_put(duplicate);
> +		return -EBUSY;
> +	}
> +
> +	return 0;
> +}
> +
>   static int tlmi_sysfs_init(void)
>   {
>   	int i, ret;
> @@ -1372,10 +1390,8 @@ static int tlmi_sysfs_init(void)
>   			continue;
>
>   		/* check for duplicate or reserved values */
> -		if (kset_find_obj(tlmi_priv.attribute_kset, tlmi_priv.setting[i]->display_name) ||
> -		    !strcmp(tlmi_priv.setting[i]->display_name, "Reserved")) {
> -			pr_debug("duplicate or reserved attribute name found - %s\n",
> -				tlmi_priv.setting[i]->display_name);
> +		if (tlmi_validate_setting_name(tlmi_priv.attribute_kset,
> +					       tlmi_priv.setting[i]->display_name) < 0) {
>   			kfree(tlmi_priv.setting[i]->possible_values);
>   			kfree(tlmi_priv.setting[i]);
>   			tlmi_priv.setting[i] = NULL;
> --
> 2.39.2
>

Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca>

Do you have any reports of our platforms where these are seen? If so I'd like to get it fixed in FW too (and I can get it tested on HW if that helps)

Mark