2023-07-21 09:43:09

by Breno Leitao

Subject: [PATCH net-next 2/2] netconsole: Use kstrtobool() instead of kstrtoint()

Replace kstrtoint() by kstrtobool() in the sysfs _store() functions.
This improves the user usability and simplify the code.

With this fix, it is now possible to use [YyNn] to set and unset a
feature. Old behaviour is still unchanged.

kstrtobool() is also safer and doesn't need the extra validation that
is required when converting a string to bool (end field in the struct),
which makes the code simpler.

Suggested-by: Petr Mladek <[email protected]>
Signed-off-by: Breno Leitao <[email protected]>
---
drivers/net/netconsole.c | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index a3c53b8c9efc..87f18aedd3bd 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -333,17 +333,15 @@ static ssize_t enabled_store(struct config_item *item,
{
struct netconsole_target *nt = to_target(item);
unsigned long flags;
- int enabled;
+ bool enabled;
int err;

mutex_lock(&dynamic_netconsole_mutex);
- err = kstrtoint(buf, 10, &enabled);
- if (err < 0)
+ err = kstrtobool(buf, &enabled);
+ if (err)
goto out_unlock;

err = -EINVAL;
- if (enabled < 0 || enabled > 1)
- goto out_unlock;
if ((bool)enabled == nt->enabled) {
pr_info("network logging has already %s\n",
nt->enabled ? "started" : "stopped");
@@ -394,7 +392,7 @@ static ssize_t release_store(struct config_item *item, const char *buf,
size_t count)
{
struct netconsole_target *nt = to_target(item);
- int release;
+ bool release;
int err;

mutex_lock(&dynamic_netconsole_mutex);
@@ -405,13 +403,9 @@ static ssize_t release_store(struct config_item *item, const char *buf,
goto out_unlock;
}

- err = kstrtoint(buf, 10, &release);
- if (err < 0)
- goto out_unlock;
- if (release < 0 || release > 1) {
- err = -EINVAL;
+ err = kstrtobool(buf, &release);
+ if (err)
goto out_unlock;
- }

nt->release = release;

@@ -426,7 +420,7 @@ static ssize_t extended_store(struct config_item *item, const char *buf,
size_t count)
{
struct netconsole_target *nt = to_target(item);
- int extended;
+ bool extended;
int err;

mutex_lock(&dynamic_netconsole_mutex);
@@ -437,13 +431,9 @@ static ssize_t extended_store(struct config_item *item, const char *buf,
goto out_unlock;
}

- err = kstrtoint(buf, 10, &extended);
- if (err < 0)
- goto out_unlock;
- if (extended < 0 || extended > 1) {
- err = -EINVAL;
+ err = kstrtobool(buf, &extended);
+ if (err)
goto out_unlock;
- }

nt->extended = extended;

--
2.34.1

2023-07-24 14:45:20

by Simon Horman

Subject: Re: [PATCH net-next 2/2] netconsole: Use kstrtobool() instead of kstrtoint()

On Fri, Jul 21, 2023 at 02:21:45AM -0700, Breno Leitao wrote:
> Replace kstrtoint() by kstrtobool() in the sysfs _store() functions.
> This improves the user usability and simplify the code.
>
> With this fix, it is now possible to use [YyNn] to set and unset a
> feature. Old behaviour is still unchanged.
>
> kstrtobool() is also safer and doesn't need the extra validation that
> is required when converting a string to bool (end field in the struct),
> which makes the code simpler.
>
> Suggested-by: Petr Mladek <[email protected]>
> Signed-off-by: Breno Leitao <[email protected]>

Reviewed-by: Simon Horman <[email protected]>