* [PATCH v1 2/2] platform/x86: think-lmi: Use strreplace() to replace a character by nul
2023-09-13 9:27 [PATCH v1 1/2] platform/x86: think-lmi: Replace kstrdup() + strreplace() with kstrdup_and_replace() Andy Shevchenko
@ 2023-09-13 9:27 ` Andy Shevchenko
2023-09-13 13:17 ` Mark Pearson
` (2 more replies)
2023-09-13 13:15 ` [PATCH v1 1/2] platform/x86: think-lmi: Replace kstrdup() + strreplace() with kstrdup_and_replace() Mark Pearson
` (2 subsequent siblings)
3 siblings, 3 replies; 10+ messages in thread
From: Andy Shevchenko @ 2023-09-13 9:27 UTC (permalink / raw)
To: Hans de Goede, Mark Pearson, platform-driver-x86, linux-kernel
Cc: Mark Pearson, Mark Gross, Andy Shevchenko
We can replace
p = strchrnul(str, '$OLD');
*p = '\0';
with
strreplace(str, '$OLD', '\0');
that does the compatible modification without a need of the temporary variable.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/platform/x86/think-lmi.c | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c
index 94a3c7a74bc4..2f20fafe7f55 100644
--- a/drivers/platform/x86/think-lmi.c
+++ b/drivers/platform/x86/think-lmi.c
@@ -198,14 +198,6 @@ static struct think_lmi tlmi_priv;
static struct class *fw_attr_class;
static DEFINE_MUTEX(tlmi_mutex);
-/* ------ Utility functions ------------*/
-/* Strip out CR if one is present */
-static void strip_cr(char *str)
-{
- char *p = strchrnul(str, '\n');
- *p = '\0';
-}
-
/* Convert BIOS WMI error string to suitable error code */
static int tlmi_errstr_to_err(const char *errstr)
{
@@ -411,7 +403,7 @@ static ssize_t current_password_store(struct kobject *kobj,
strscpy(setting->password, buf, setting->maxlen);
/* Strip out CR if one is present, setting password won't work if it is present */
- strip_cr(setting->password);
+ strreplace(setting->password, '\n', '\0');
return count;
}
@@ -921,7 +913,7 @@ static ssize_t display_name_show(struct kobject *kobj, struct kobj_attribute *at
static ssize_t current_value_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
{
struct tlmi_attr_setting *setting = to_tlmi_attr_setting(kobj);
- char *item, *value, *p;
+ char *item, *value;
int ret;
ret = tlmi_setting(setting->index, &item, LENOVO_BIOS_SETTING_GUID);
@@ -934,8 +926,7 @@ static ssize_t current_value_show(struct kobject *kobj, struct kobj_attribute *a
ret = -EINVAL;
else {
/* On Workstations remove the Options part after the value */
- p = strchrnul(value, ';');
- *p = '\0';
+ strreplace(value, ';', '\0');
ret = sysfs_emit(buf, "%s\n", value + 1);
}
kfree(item);
@@ -1418,7 +1409,6 @@ static int tlmi_analyze(void)
for (i = 0; i < TLMI_SETTINGS_COUNT; ++i) {
struct tlmi_attr_setting *setting;
char *item = NULL;
- char *p;
tlmi_priv.setting[i] = NULL;
ret = tlmi_setting(i, &item, LENOVO_BIOS_SETTING_GUID);
@@ -1435,8 +1425,7 @@ static int tlmi_analyze(void)
strreplace(item, '/', '\\');
/* Remove the value part */
- p = strchrnul(item, ',');
- *p = '\0';
+ strreplace(item, ',', '\0');
/* Create a setting entry */
setting = kzalloc(sizeof(*setting), GFP_KERNEL);
--
2.40.0.1.gaa8946217a0b
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v1 2/2] platform/x86: think-lmi: Use strreplace() to replace a character by nul
2023-09-13 9:27 ` [PATCH v1 2/2] platform/x86: think-lmi: Use strreplace() to replace a character by nul Andy Shevchenko
@ 2023-09-13 13:17 ` Mark Pearson
2023-09-15 14:57 ` Ilpo Järvinen
2023-09-18 14:48 ` Rasmus Villemoes
2 siblings, 0 replies; 10+ messages in thread
From: Mark Pearson @ 2023-09-13 13:17 UTC (permalink / raw)
To: Andy Shevchenko, Hans de Goede,
platform-driver-x86@vger.kernel.org, linux-kernel
Cc: Mark Pearson, markgross@kernel.org
On Wed, Sep 13, 2023, at 5:27 AM, Andy Shevchenko wrote:
> We can replace
> p = strchrnul(str, '$OLD');
> *p = '\0';
> with
> strreplace(str, '$OLD', '\0');
> that does the compatible modification without a need of the temporary variable.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> drivers/platform/x86/think-lmi.c | 19 ++++---------------
> 1 file changed, 4 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c
> index 94a3c7a74bc4..2f20fafe7f55 100644
> --- a/drivers/platform/x86/think-lmi.c
> +++ b/drivers/platform/x86/think-lmi.c
> @@ -198,14 +198,6 @@ static struct think_lmi tlmi_priv;
> static struct class *fw_attr_class;
> static DEFINE_MUTEX(tlmi_mutex);
>
> -/* ------ Utility functions ------------*/
> -/* Strip out CR if one is present */
> -static void strip_cr(char *str)
> -{
> - char *p = strchrnul(str, '\n');
> - *p = '\0';
> -}
> -
> /* Convert BIOS WMI error string to suitable error code */
> static int tlmi_errstr_to_err(const char *errstr)
> {
> @@ -411,7 +403,7 @@ static ssize_t current_password_store(struct kobject *kobj,
>
> strscpy(setting->password, buf, setting->maxlen);
> /* Strip out CR if one is present, setting password won't work if it
> is present */
> - strip_cr(setting->password);
> + strreplace(setting->password, '\n', '\0');
> return count;
> }
>
> @@ -921,7 +913,7 @@ static ssize_t display_name_show(struct kobject
> *kobj, struct kobj_attribute *at
> static ssize_t current_value_show(struct kobject *kobj, struct
> kobj_attribute *attr, char *buf)
> {
> struct tlmi_attr_setting *setting = to_tlmi_attr_setting(kobj);
> - char *item, *value, *p;
> + char *item, *value;
> int ret;
>
> ret = tlmi_setting(setting->index, &item, LENOVO_BIOS_SETTING_GUID);
> @@ -934,8 +926,7 @@ static ssize_t current_value_show(struct kobject
> *kobj, struct kobj_attribute *a
> ret = -EINVAL;
> else {
> /* On Workstations remove the Options part after the value */
> - p = strchrnul(value, ';');
> - *p = '\0';
> + strreplace(value, ';', '\0');
> ret = sysfs_emit(buf, "%s\n", value + 1);
> }
> kfree(item);
> @@ -1418,7 +1409,6 @@ static int tlmi_analyze(void)
> for (i = 0; i < TLMI_SETTINGS_COUNT; ++i) {
> struct tlmi_attr_setting *setting;
> char *item = NULL;
> - char *p;
>
> tlmi_priv.setting[i] = NULL;
> ret = tlmi_setting(i, &item, LENOVO_BIOS_SETTING_GUID);
> @@ -1435,8 +1425,7 @@ static int tlmi_analyze(void)
> strreplace(item, '/', '\\');
>
> /* Remove the value part */
> - p = strchrnul(item, ',');
> - *p = '\0';
> + strreplace(item, ',', '\0');
>
> /* Create a setting entry */
> setting = kzalloc(sizeof(*setting), GFP_KERNEL);
> --
> 2.40.0.1.gaa8946217a0b
Looks good to me. Will aim to test and confirm on some systems.
Thanks for the cleanup!
Mark
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v1 2/2] platform/x86: think-lmi: Use strreplace() to replace a character by nul
2023-09-13 9:27 ` [PATCH v1 2/2] platform/x86: think-lmi: Use strreplace() to replace a character by nul Andy Shevchenko
2023-09-13 13:17 ` Mark Pearson
@ 2023-09-15 14:57 ` Ilpo Järvinen
2023-09-18 14:48 ` Rasmus Villemoes
2 siblings, 0 replies; 10+ messages in thread
From: Ilpo Järvinen @ 2023-09-15 14:57 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Hans de Goede, Mark Pearson, platform-driver-x86, linux-kernel,
Mark Pearson, Mark Gross
[-- Attachment #1: Type: text/plain, Size: 2828 bytes --]
On Wed, 13 Sep 2023, Andy Shevchenko wrote:
> We can replace
> p = strchrnul(str, '$OLD');
> *p = '\0';
> with
> strreplace(str, '$OLD', '\0');
> that does the compatible modification without a need of the temporary variable.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> drivers/platform/x86/think-lmi.c | 19 ++++---------------
> 1 file changed, 4 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c
> index 94a3c7a74bc4..2f20fafe7f55 100644
> --- a/drivers/platform/x86/think-lmi.c
> +++ b/drivers/platform/x86/think-lmi.c
> @@ -198,14 +198,6 @@ static struct think_lmi tlmi_priv;
> static struct class *fw_attr_class;
> static DEFINE_MUTEX(tlmi_mutex);
>
> -/* ------ Utility functions ------------*/
> -/* Strip out CR if one is present */
> -static void strip_cr(char *str)
> -{
> - char *p = strchrnul(str, '\n');
> - *p = '\0';
> -}
> -
> /* Convert BIOS WMI error string to suitable error code */
> static int tlmi_errstr_to_err(const char *errstr)
> {
> @@ -411,7 +403,7 @@ static ssize_t current_password_store(struct kobject *kobj,
>
> strscpy(setting->password, buf, setting->maxlen);
> /* Strip out CR if one is present, setting password won't work if it is present */
> - strip_cr(setting->password);
> + strreplace(setting->password, '\n', '\0');
> return count;
> }
>
> @@ -921,7 +913,7 @@ static ssize_t display_name_show(struct kobject *kobj, struct kobj_attribute *at
> static ssize_t current_value_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
> {
> struct tlmi_attr_setting *setting = to_tlmi_attr_setting(kobj);
> - char *item, *value, *p;
> + char *item, *value;
> int ret;
>
> ret = tlmi_setting(setting->index, &item, LENOVO_BIOS_SETTING_GUID);
> @@ -934,8 +926,7 @@ static ssize_t current_value_show(struct kobject *kobj, struct kobj_attribute *a
> ret = -EINVAL;
> else {
> /* On Workstations remove the Options part after the value */
> - p = strchrnul(value, ';');
> - *p = '\0';
> + strreplace(value, ';', '\0');
> ret = sysfs_emit(buf, "%s\n", value + 1);
> }
> kfree(item);
> @@ -1418,7 +1409,6 @@ static int tlmi_analyze(void)
> for (i = 0; i < TLMI_SETTINGS_COUNT; ++i) {
> struct tlmi_attr_setting *setting;
> char *item = NULL;
> - char *p;
>
> tlmi_priv.setting[i] = NULL;
> ret = tlmi_setting(i, &item, LENOVO_BIOS_SETTING_GUID);
> @@ -1435,8 +1425,7 @@ static int tlmi_analyze(void)
> strreplace(item, '/', '\\');
>
> /* Remove the value part */
> - p = strchrnul(item, ',');
> - *p = '\0';
> + strreplace(item, ',', '\0');
>
> /* Create a setting entry */
> setting = kzalloc(sizeof(*setting), GFP_KERNEL);
>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
--
i.
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v1 2/2] platform/x86: think-lmi: Use strreplace() to replace a character by nul
2023-09-13 9:27 ` [PATCH v1 2/2] platform/x86: think-lmi: Use strreplace() to replace a character by nul Andy Shevchenko
2023-09-13 13:17 ` Mark Pearson
2023-09-15 14:57 ` Ilpo Järvinen
@ 2023-09-18 14:48 ` Rasmus Villemoes
2023-09-18 15:38 ` Andy Shevchenko
2 siblings, 1 reply; 10+ messages in thread
From: Rasmus Villemoes @ 2023-09-18 14:48 UTC (permalink / raw)
To: Andy Shevchenko, Hans de Goede, Mark Pearson, platform-driver-x86,
linux-kernel
Cc: Mark Pearson, Mark Gross
On 13/09/2023 11.27, Andy Shevchenko wrote:
> @@ -921,7 +913,7 @@ static ssize_t display_name_show(struct kobject *kobj, struct kobj_attribute *at
> static ssize_t current_value_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
> {
> struct tlmi_attr_setting *setting = to_tlmi_attr_setting(kobj);
> - char *item, *value, *p;
> + char *item, *value;
> int ret;
>
> ret = tlmi_setting(setting->index, &item, LENOVO_BIOS_SETTING_GUID);
> @@ -934,8 +926,7 @@ static ssize_t current_value_show(struct kobject *kobj, struct kobj_attribute *a
> ret = -EINVAL;
> else {
> /* On Workstations remove the Options part after the value */
> - p = strchrnul(value, ';');
> - *p = '\0';
> + strreplace(value, ';', '\0');
So how do you know that the string contains at most one ';'? Same for
all the other replacements. If that's not guaranteed, this is not at all
equivalent.
Or maybe the result is just used a normal string afterwards, and it
doesn't matter at all how the content after the first ';' has been mangled?
It's certainly not obvious to me that this is correct, but of course I
know nothing about this code.
Rasmus
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v1 2/2] platform/x86: think-lmi: Use strreplace() to replace a character by nul
2023-09-18 14:48 ` Rasmus Villemoes
@ 2023-09-18 15:38 ` Andy Shevchenko
0 siblings, 0 replies; 10+ messages in thread
From: Andy Shevchenko @ 2023-09-18 15:38 UTC (permalink / raw)
To: Rasmus Villemoes
Cc: Hans de Goede, Mark Pearson, platform-driver-x86, linux-kernel,
Mark Pearson, Mark Gross
On Mon, Sep 18, 2023 at 04:48:40PM +0200, Rasmus Villemoes wrote:
> On 13/09/2023 11.27, Andy Shevchenko wrote:
> > - p = strchrnul(value, ';');
> > - *p = '\0';
> > + strreplace(value, ';', '\0');
>
> So how do you know that the string contains at most one ';'? Same for
> all the other replacements. If that's not guaranteed, this is not at all
> equivalent.
>
> Or maybe the result is just used a normal string afterwards, and it
> doesn't matter at all how the content after the first ';' has been mangled?
>
> It's certainly not obvious to me that this is correct, but of course I
> know nothing about this code.
If you read the comment and code slightly above you may get that this is not
a problem at all. There are no side effects as the part after first occurrence
of ; is not used and original string is NUL-terminated.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v1 1/2] platform/x86: think-lmi: Replace kstrdup() + strreplace() with kstrdup_and_replace()
2023-09-13 9:27 [PATCH v1 1/2] platform/x86: think-lmi: Replace kstrdup() + strreplace() with kstrdup_and_replace() Andy Shevchenko
2023-09-13 9:27 ` [PATCH v1 2/2] platform/x86: think-lmi: Use strreplace() to replace a character by nul Andy Shevchenko
@ 2023-09-13 13:15 ` Mark Pearson
2023-09-15 14:57 ` Ilpo Järvinen
2023-09-18 12:30 ` Hans de Goede
3 siblings, 0 replies; 10+ messages in thread
From: Mark Pearson @ 2023-09-13 13:15 UTC (permalink / raw)
To: Andy Shevchenko, Hans de Goede,
platform-driver-x86@vger.kernel.org, linux-kernel
Cc: Mark Pearson, markgross@kernel.org
On Wed, Sep 13, 2023, at 5:27 AM, Andy Shevchenko wrote:
> Replace open coded functionalify of kstrdup_and_replace() with a call.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> drivers/platform/x86/think-lmi.c | 43 +++++++++++---------------------
> 1 file changed, 15 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c
> index 79346881cadb..94a3c7a74bc4 100644
> --- 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;
> @@ -985,13 +976,11 @@ static ssize_t current_value_store(struct kobject *kobj,
> if (!tlmi_priv.can_set_bios_settings)
> 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);
> -
> /* Use lock in case multiple WMI operations needed */
> mutex_lock(&tlmi_mutex);
>
> @@ -1163,13 +1152,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,
> --
> 2.40.0.1.gaa8946217a0b
Thanks Andy - didn't know about that function and it looks like a great clean-up.
I'll aim to test this out on some systems, but it looks good to me
Mark
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v1 1/2] platform/x86: think-lmi: Replace kstrdup() + strreplace() with kstrdup_and_replace()
2023-09-13 9:27 [PATCH v1 1/2] platform/x86: think-lmi: Replace kstrdup() + strreplace() with kstrdup_and_replace() Andy Shevchenko
2023-09-13 9:27 ` [PATCH v1 2/2] platform/x86: think-lmi: Use strreplace() to replace a character by nul Andy Shevchenko
2023-09-13 13:15 ` [PATCH v1 1/2] platform/x86: think-lmi: Replace kstrdup() + strreplace() with kstrdup_and_replace() Mark Pearson
@ 2023-09-15 14:57 ` Ilpo Järvinen
2023-09-18 12:30 ` Hans de Goede
3 siblings, 0 replies; 10+ messages in thread
From: Ilpo Järvinen @ 2023-09-15 14:57 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Hans de Goede, Mark Pearson, platform-driver-x86, linux-kernel,
Mark Pearson, Mark Gross
[-- Attachment #1: Type: text/plain, Size: 4661 bytes --]
On Wed, 13 Sep 2023, Andy Shevchenko wrote:
> Replace open coded functionalify of kstrdup_and_replace() with a call.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> drivers/platform/x86/think-lmi.c | 43 +++++++++++---------------------
> 1 file changed, 15 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c
> index 79346881cadb..94a3c7a74bc4 100644
> --- 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;
> @@ -985,13 +976,11 @@ static ssize_t current_value_store(struct kobject *kobj,
> if (!tlmi_priv.can_set_bios_settings)
> 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);
> -
> /* Use lock in case multiple WMI operations needed */
> mutex_lock(&tlmi_mutex);
>
> @@ -1163,13 +1152,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,
>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
--
i.
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v1 1/2] platform/x86: think-lmi: Replace kstrdup() + strreplace() with kstrdup_and_replace()
2023-09-13 9:27 [PATCH v1 1/2] platform/x86: think-lmi: Replace kstrdup() + strreplace() with kstrdup_and_replace() Andy Shevchenko
` (2 preceding siblings ...)
2023-09-15 14:57 ` Ilpo Järvinen
@ 2023-09-18 12:30 ` Hans de Goede
2023-09-18 13:50 ` Andy Shevchenko
3 siblings, 1 reply; 10+ messages in thread
From: Hans de Goede @ 2023-09-18 12:30 UTC (permalink / raw)
To: Andy Shevchenko, Mark Pearson, platform-driver-x86, linux-kernel
Cc: Mark Pearson, Mark Gross
Hi Andy,
On 9/13/23 11:27, Andy Shevchenko wrote:
> Replace open coded functionalify of kstrdup_and_replace() with a call.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Thank you for the patches, but this one does not apply
cleanly.
Can you please rebase the series on top of my latest review-hans branch ?
Regards,
Hans
> ---
> drivers/platform/x86/think-lmi.c | 43 +++++++++++---------------------
> 1 file changed, 15 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c
> index 79346881cadb..94a3c7a74bc4 100644
> --- 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;
> @@ -985,13 +976,11 @@ static ssize_t current_value_store(struct kobject *kobj,
> if (!tlmi_priv.can_set_bios_settings)
> 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);
> -
> /* Use lock in case multiple WMI operations needed */
> mutex_lock(&tlmi_mutex);
>
> @@ -1163,13 +1152,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,
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v1 1/2] platform/x86: think-lmi: Replace kstrdup() + strreplace() with kstrdup_and_replace()
2023-09-18 12:30 ` Hans de Goede
@ 2023-09-18 13:50 ` Andy Shevchenko
0 siblings, 0 replies; 10+ messages in thread
From: Andy Shevchenko @ 2023-09-18 13:50 UTC (permalink / raw)
To: Hans de Goede
Cc: Mark Pearson, platform-driver-x86, linux-kernel, Mark Pearson,
Mark Gross
On Mon, Sep 18, 2023 at 02:30:28PM +0200, Hans de Goede wrote:
> On 9/13/23 11:27, Andy Shevchenko wrote:
> > Replace open coded functionalify of kstrdup_and_replace() with a call.
> >
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>
> Thank you for the patches, but this one does not apply
> cleanly.
`git am -C1 ...` works for me.
> Can you please rebase the series on top of my latest review-hans branch ?
But fine, no problem, I'm about to send a v2,
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 10+ messages in thread