Fix issues reported by kernel test robot.
 - Require DMI for think-lmi.
 - Check return from getting serial string

Reported-by: kernel test robot <l...@intel.com>
Closes: 
https://lore.kernel.org/oe-kbuild-all/202506062319.f0ipdxf6-...@intel.com/
Signed-off-by: Mark Pearson <mpearson-len...@squebb.ca>
---
Changes in v4:
 - Return -ENODEV instead of -EINVAL
 - Make patch first in series
 - Clean up commit message (empty line)
Changes in v3:
 - New patch added to series.

 drivers/platform/x86/Kconfig     | 1 +
 drivers/platform/x86/think-lmi.c | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index e5cbd58a99f3..9f39547d98f6 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -659,6 +659,7 @@ config THINKPAD_ACPI_HOTKEY_POLL
 config THINKPAD_LMI
        tristate "Lenovo WMI-based systems management driver"
        depends on ACPI_WMI
+       depends on DMI
        select FW_ATTR_CLASS
        help
          This driver allows changing BIOS settings on Lenovo machines whose
diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c
index 00b1e7c79a3d..02ede1ec99e9 100644
--- a/drivers/platform/x86/think-lmi.c
+++ b/drivers/platform/x86/think-lmi.c
@@ -772,6 +772,7 @@ static ssize_t certificate_store(struct kobject *kobj,
        struct tlmi_pwd_setting *setting = to_tlmi_pwd_setting(kobj);
        enum cert_install_mode install_mode = TLMI_CERT_INSTALL;
        char *auth_str, *new_cert;
+       const char *serial;
        char *signature;
        char *guid;
        int ret;
@@ -789,9 +790,10 @@ static ssize_t certificate_store(struct kobject *kobj,
                        return -EACCES;
 
                /* Format: 'serial#, signature' */
-               auth_str = cert_command(setting,
-                                       dmi_get_system_info(DMI_PRODUCT_SERIAL),
-                                       setting->signature);
+               serial = dmi_get_system_info(DMI_PRODUCT_SERIAL);
+               if (!serial)
+                       return -ENODEV;
+               auth_str = cert_command(setting, serial, setting->signature);
                if (!auth_str)
                        return -ENOMEM;
 
-- 
2.43.0



_______________________________________________
ibm-acpi-devel mailing list
ibm-acpi-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ibm-acpi-devel

Reply via email to