platform/x86: think-lmi: Replace kstrdup() + strreplace() with kstrdup_and_replace()

Replace open coded functionalify of kstrdup_and_replace() with a call.

Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230918135116.1248560-1-andriy.shevchenko@linux.intel.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c
index d329626720dfb89e8ebe83b2df1fb9ef9edda817..a5e87aa3395c83f89204bde250538a7ce86766ef 100644 (file)
--- a/drivers/platform/x86/think-lmi.c
+++ b/drivers/platform/x86/think-lmi.c
@@ -15,7 +15,7 @@
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/mutex.h>
-#include <linux/string.h>
+#include <linux/string_helpers.h>
 #include <linux/types.h>
 #include <linux/dmi.h>
 #include <linux/wmi.h>
@@ -432,13 +432,11 @@ static ssize_t new_password_store(struct kobject *kobj,
        if (!tlmi_priv.can_set_bios_password)
                return -EOPNOTSUPP;
 
-       new_pwd = kstrdup(buf, GFP_KERNEL);
+       /* Strip out CR if one is present, setting password won't work if it is present */
+       new_pwd = kstrdup_and_replace(buf, '\n', '\0', GFP_KERNEL);
        if (!new_pwd)
                return -ENOMEM;
 
-       /* Strip out CR if one is present, setting password won't work if it is present */
-       strip_cr(new_pwd);
-
        /* Use lock in case multiple WMI operations needed */
        mutex_lock(&tlmi_mutex);
 
@@ -709,13 +707,11 @@ static ssize_t cert_to_password_store(struct kobject *kobj,
        if (!setting->signature || !setting->signature[0])
                return -EACCES;
 
-       passwd = kstrdup(buf, GFP_KERNEL);
+       /* Strip out CR if one is present */
+       passwd = kstrdup_and_replace(buf, '\n', '\0', GFP_KERNEL);
        if (!passwd)
                return -ENOMEM;
 
-       /* Strip out CR if one is present */
-       strip_cr(passwd);
-
        /* Format: 'Password,Signature' */
        auth_str = kasprintf(GFP_KERNEL, "%s,%s", passwd, setting->signature);
        if (!auth_str) {
@@ -765,11 +761,10 @@ static ssize_t certificate_store(struct kobject *kobj,
                return ret ?: count;
        }
 
-       new_cert = kstrdup(buf, GFP_KERNEL);
+       /* Strip out CR if one is present */
+       new_cert = kstrdup_and_replace(buf, '\n', '\0', GFP_KERNEL);
        if (!new_cert)
                return -ENOMEM;
-       /* Strip out CR if one is present */
-       strip_cr(new_cert);
 
        if (setting->cert_installed) {
                /* Certificate is installed so this is an update */
@@ -817,13 +812,11 @@ static ssize_t signature_store(struct kobject *kobj,
        if (!tlmi_priv.certificate_support)
                return -EOPNOTSUPP;
 
-       new_signature = kstrdup(buf, GFP_KERNEL);
+       /* Strip out CR if one is present */
+       new_signature = kstrdup_and_replace(buf, '\n', '\0', GFP_KERNEL);
        if (!new_signature)
                return -ENOMEM;
 
-       /* Strip out CR if one is present */
-       strip_cr(new_signature);
-
        /* Free any previous signature */
        kfree(setting->signature);
        setting->signature = new_signature;
@@ -846,13 +839,11 @@ static ssize_t save_signature_store(struct kobject *kobj,
        if (!tlmi_priv.certificate_support)
                return -EOPNOTSUPP;
 
-       new_signature = kstrdup(buf, GFP_KERNEL);
+       /* Strip out CR if one is present */
+       new_signature = kstrdup_and_replace(buf, '\n', '\0', GFP_KERNEL);
        if (!new_signature)
                return -ENOMEM;
 
-       /* Strip out CR if one is present */
-       strip_cr(new_signature);
-
        /* Free any previous signature */
        kfree(setting->save_signature);
        setting->save_signature = new_signature;
@@ -992,13 +983,11 @@ static ssize_t current_value_store(struct kobject *kobj,
        if (tlmi_priv.save_mode == TLMI_SAVE_BULK && tlmi_priv.reboot_required)
                return -EPERM;
 
-       new_setting = kstrdup(buf, GFP_KERNEL);
+       /* Strip out CR if one is present */
+       new_setting = kstrdup_and_replace(buf, '\n', '\0', GFP_KERNEL);
        if (!new_setting)
                return -ENOMEM;
 
-       /* Strip out CR if one is present */
-       strip_cr(new_setting);
-
        /* Use lock in case multiple WMI operations needed */
        mutex_lock(&tlmi_mutex);
 
@@ -1279,13 +1268,11 @@ static ssize_t debug_cmd_store(struct kobject *kobj, struct kobj_attribute *attr
        if (!tlmi_priv.can_debug_cmd)
                return -EOPNOTSUPP;
 
-       new_setting = kstrdup(buf, GFP_KERNEL);
+       /* Strip out CR if one is present */
+       new_setting = kstrdup_and_replace(buf, '\n', '\0', GFP_KERNEL);
        if (!new_setting)
                return -ENOMEM;
 
-       /* Strip out CR if one is present */
-       strip_cr(new_setting);
-
        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,