summaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86/think-lmi.c
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2021-06-09 17:17:51 +0200
committerHans de Goede <hdegoede@redhat.com>2021-06-16 17:47:55 +0200
commit86bb2e3daf5d84c02ef40da8bf26f7b851aaa8a7 (patch)
tree3a75adcf645134c09a5709f6e01c69cd800b9bac /drivers/platform/x86/think-lmi.c
parentcb58c277ff1a35432cd84a6cc9768c60ce4c2cad (diff)
downloadlinux-stable-86bb2e3daf5d84c02ef40da8bf26f7b851aaa8a7.tar.gz
linux-stable-86bb2e3daf5d84c02ef40da8bf26f7b851aaa8a7.tar.bz2
linux-stable-86bb2e3daf5d84c02ef40da8bf26f7b851aaa8a7.zip
platform/x86: think-lmi: Fix check for admin password being set
tlmi_priv.pwd_admin->password is an array (not a pointer), so the correct way to check for the password being set is to check for tlmi_priv.pwd_admin->password[0] != 0. For the second check, replace the check with checking that auth_str is set instead. Cc: Mark Pearson <markpearson@lenovo.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Reported-by: coverity-bot <keescook+coverity-bot@chromium.org> Addresses-Coverity-ID: 1505158 ("NO_EFFECT") Fixes: a7314b3b1d8a ("platform/x86: think-lmi: Add WMI interface support on Lenovo platforms") Signed-off-by: Hans de Goede <hdegoede@redhat.com> Link: https://lore.kernel.org/r/20210609151752.156902-1-hdegoede@redhat.com
Diffstat (limited to 'drivers/platform/x86/think-lmi.c')
-rw-r--r--drivers/platform/x86/think-lmi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c
index c6413b906e4a..4881de4e669d 100644
--- a/drivers/platform/x86/think-lmi.c
+++ b/drivers/platform/x86/think-lmi.c
@@ -537,7 +537,7 @@ static ssize_t current_value_store(struct kobject *kobj,
p = strchrnul(new_setting, '\n');
*p = '\0';
- if (tlmi_priv.pwd_admin->valid && tlmi_priv.pwd_admin->password) {
+ if (tlmi_priv.pwd_admin->valid && tlmi_priv.pwd_admin->password[0]) {
auth_str = kasprintf(GFP_KERNEL, "%s,%s,%s;",
tlmi_priv.pwd_admin->password,
encoding_options[tlmi_priv.pwd_admin->encoding],
@@ -563,7 +563,7 @@ static ssize_t current_value_store(struct kobject *kobj,
if (ret)
goto out;
- if (tlmi_priv.pwd_admin->valid && tlmi_priv.pwd_admin->password)
+ if (auth_str)
ret = tlmi_save_bios_settings(auth_str);
else
ret = tlmi_save_bios_settings("");