Skip to contentSkip to conversation

platform/x86: think-lmi: Fix certificate thumbprint sysfs output

PATCH In review Thorsten Blum 3 participants 3 messages Aug 10 – Aug 18

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 platform/x86: think-lmi: Fix certificate thumbprint sysfs output

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")
---
 drivers/platform/x86/lenovo/think-lmi.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/platform/x86/lenovo/think-lmi.c +7 -1
index e215e86e3db7..441fca37b523 100644
@@ -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;
maintainer Reviewed-by on v1 1/1
#1 lore raw

Thanks Thorsten,

Quoted 36 lines · Thorsten Blum

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")

---
 drivers/platform/x86/lenovo/think-lmi.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/platform/x86/lenovo/think-lmi.c +0 -0
index e215e86e3db7..441fca37b523 100644
@@ -745,6 +745,8 @@ static ssize_t certificate_thumbprint_show(struct 

kobject *kobj, struct kobj_att

drivers/platform/x86/lenovo/think-lmi.c +2 -0
 		return -EOPNOTSUPP;
 
 	for (i = 0; i < ARRAY_SIZE(thumbtypes); i++) {
+		ssize_t ret;
+
 		if (tlmi_priv.pwdcfg.core.password_mode >= 

TLMI_PWDCFG_MODE_MULTICERT) {

drivers/platform/x86/lenovo/think-lmi.c +0 -0
 			/* 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

drivers/platform/x86/lenovo/think-lmi.c +0 -0
 		}
 		if (!wmistr)
 			return -ENOMEM;

drivers/platform/x86/lenovo/think-lmi.c static ssize_t certificate_thumbprint_show(struct kobject *kobj, struct kobj_att · line 769

Quoted 10 lines
drivers/platform/x86/lenovo/think-lmi.c +5 -1
-		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.

Mark

maintainer
#2 lore raw
In reply to Thorsten Blum
Quoted 8 lines · Thorsten Blum

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.

[...]

Thank you for your contribution, it has been applied to my local review-ilpo-next branch. Note it will show up in the public platform-drivers-x86/review-ilpo-next branch only once I've pushed my local branch there, which might take a while.

FYI [if applicable to your patch], as per Linus' policy change, also fixes are mostly routed through for-next unless the fix is for a commit introduced in the most recent cycle or is clearly a regression fix.

The list of commits applied:
[1/1] platform/x86: think-lmi: Fix certificate thumbprint sysfs output

      commit: 38443e5748496086940a2033fd2102b702109287

--
i.