All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] platform/x86: think-lmi: Fix certificate thumbprint sysfs output
@ 2026-08-10 12:05 Thorsten Blum
  2026-08-11 19:28 ` Mark Pearson
  0 siblings, 1 reply; 2+ messages in thread
From: Thorsten Blum @ 2026-08-10 12:05 UTC (permalink / raw)
  To: Mark Pearson, Derek J. Clark, Hans de Goede, Ilpo Järvinen
  Cc: Thorsten Blum, stable, Mark Pearson, platform-driver-x86,
	linux-kernel

cert_thumbprint() already returns the accumulated output length, but
certificate_thumbprint_show() adds that value to count again, making the
next line use the wrong offset. Errors returned by cert_thumbprint() are
also ignored and their negative values added to count.

Assign the total length to count instead and propagate errors correctly.

Fixes: b49f72e7f96d ("platform/x86: think-lmi: Certificate authentication support")
Cc: stable@vger.kernel.org
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
 drivers/platform/x86/lenovo/think-lmi.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/platform/x86/lenovo/think-lmi.c b/drivers/platform/x86/lenovo/think-lmi.c
index e215e86e3db7..441fca37b523 100644
--- a/drivers/platform/x86/lenovo/think-lmi.c
+++ b/drivers/platform/x86/lenovo/think-lmi.c
@@ -745,6 +745,8 @@ static ssize_t certificate_thumbprint_show(struct kobject *kobj, struct kobj_att
 		return -EOPNOTSUPP;
 
 	for (i = 0; i < ARRAY_SIZE(thumbtypes); i++) {
+		ssize_t ret;
+
 		if (tlmi_priv.pwdcfg.core.password_mode >= TLMI_PWDCFG_MODE_MULTICERT) {
 			/* Format: 'SVC | SMC, Thumbtype' */
 			wmistr = kasprintf(GFP_KERNEL, "%s,%s",
@@ -756,8 +758,12 @@ static ssize_t certificate_thumbprint_show(struct kobject *kobj, struct kobj_att
 		}
 		if (!wmistr)
 			return -ENOMEM;
-		count += cert_thumbprint(buf, wmistr, count);
+
+		ret = cert_thumbprint(buf, wmistr, count);
 		kfree(wmistr);
+		if (ret < 0)
+			return ret;
+		count = ret;
 	}
 
 	return count;

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] platform/x86: think-lmi: Fix certificate thumbprint sysfs output
  2026-08-10 12:05 [PATCH] platform/x86: think-lmi: Fix certificate thumbprint sysfs output Thorsten Blum
@ 2026-08-11 19:28 ` Mark Pearson
  0 siblings, 0 replies; 2+ messages in thread
From: Mark Pearson @ 2026-08-11 19:28 UTC (permalink / raw)
  To: Thorsten Blum, Derek J . Clark, Hans de Goede, Ilpo Järvinen
  Cc: stable, Mark Pearson, platform-driver-x86@vger.kernel.org,
	linux-kernel

Thanks Thorsten,

On Mon, Aug 10, 2026, at 8:05 AM, Thorsten Blum wrote:
> cert_thumbprint() already returns the accumulated output length, but
> certificate_thumbprint_show() adds that value to count again, making the
> next line use the wrong offset. Errors returned by cert_thumbprint() are
> also ignored and their negative values added to count.
>
> Assign the total length to count instead and propagate errors correctly.
>
> Fixes: b49f72e7f96d ("platform/x86: think-lmi: Certificate 
> authentication support")
> Cc: stable@vger.kernel.org
> Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
> ---
>  drivers/platform/x86/lenovo/think-lmi.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/platform/x86/lenovo/think-lmi.c 
> b/drivers/platform/x86/lenovo/think-lmi.c
> index e215e86e3db7..441fca37b523 100644
> --- a/drivers/platform/x86/lenovo/think-lmi.c
> +++ b/drivers/platform/x86/lenovo/think-lmi.c
> @@ -745,6 +745,8 @@ static ssize_t certificate_thumbprint_show(struct 
> kobject *kobj, struct kobj_att
>  		return -EOPNOTSUPP;
> 
>  	for (i = 0; i < ARRAY_SIZE(thumbtypes); i++) {
> +		ssize_t ret;
> +
>  		if (tlmi_priv.pwdcfg.core.password_mode >= 
> TLMI_PWDCFG_MODE_MULTICERT) {
>  			/* Format: 'SVC | SMC, Thumbtype' */
>  			wmistr = kasprintf(GFP_KERNEL, "%s,%s",
> @@ -756,8 +758,12 @@ static ssize_t certificate_thumbprint_show(struct 
> kobject *kobj, struct kobj_att
>  		}
>  		if (!wmistr)
>  			return -ENOMEM;
> -		count += cert_thumbprint(buf, wmistr, count);
> +
> +		ret = cert_thumbprint(buf, wmistr, count);
>  		kfree(wmistr);
> +		if (ret < 0)
> +			return ret;
> +		count = ret;
>  	}
> 
>  	return count;
Looks good to me. Thanks for the fix.
Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca>

Mark

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-08-11 19:29 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-08-10 12:05 [PATCH] platform/x86: think-lmi: Fix certificate thumbprint sysfs output Thorsten Blum
2026-08-11 19:28 ` Mark Pearson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.