From: Peter Zijlstra <peterz@infradead.org>
To: Borislav Petkov <bp@alien8.de>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
rjw@rjwysocki.net, viresh.kumar@linaro.org, lenb@kernel.org,
dsmythies@telus.net, tglx@linutronix.de, mingo@redhat.com,
hpa@zytor.com, linux-pm@vger.kernel.org,
linux-kernel@vger.kernel.org, x86@kernel.org, jic23@cam.ac.uk,
keescook@chromium.org, akpm@linux-foundation.org
Subject: [PATCH] lib: Extend kstrtobool() to accept "true"/"false"
Date: Fri, 26 Jun 2020 12:44:42 +0200 [thread overview]
Message-ID: <20200626104442.GF117543@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <20200626102255.GZ4817@hirez.programming.kicks-ass.net>
On Fri, Jun 26, 2020 at 12:22:55PM +0200, Peter Zijlstra wrote:
> > This is too lax - it will be enabled for any !0 value. Please accept
> > only 0 and 1.
>
> kstrtobool() ftw
And looking at that, I find it really strange it does not in fact accept
"true" / "false", so how about this?
---
Subject: lib: Extend kstrtobool() to accept "true"/"false"
Extend the strings recognised by kstrtobool() to cover:
- 1/0
- y/n
- yes/no (new)
- t/f (new)
- true/false (new)
- on/off
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
lib/kstrtox.c | 60 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 file changed, 45 insertions(+), 15 deletions(-)
diff --git a/lib/kstrtox.c b/lib/kstrtox.c
index 1006bf70bf74..b8b950325097 100644
--- a/lib/kstrtox.c
+++ b/lib/kstrtox.c
@@ -325,9 +325,17 @@ EXPORT_SYMBOL(kstrtos8);
* @s: input string
* @res: result
*
- * This routine returns 0 iff the first character is one of 'Yy1Nn0', or
- * [oO][NnFf] for "on" and "off". Otherwise it will return -EINVAL. Value
- * pointed to by res is updated upon finding a match.
+ * This return return 0 on success, otherwise it will return -EINVAL.
+ * It will accept (case invariant):
+ *
+ * - 1/0
+ * - y/n
+ * - yes/no
+ * - t/f
+ * - true/false
+ * - on/off
+ *
+ * and set @*res to either true/false respectively.
*/
int kstrtobool(const char *s, bool *res)
{
@@ -335,30 +343,52 @@ int kstrtobool(const char *s, bool *res)
return -EINVAL;
switch (s[0]) {
+ case 't':
+ case 'T':
+ if (!s[1] || !strcasecmp(s, "true"))
+ goto have_true;
+
+ break;
+
case 'y':
case 'Y':
+ if (!s[1] || !strcasecmp(s, "yes"))
+ goto have_true;
+
+ break;
+
case '1':
+have_true:
*res = true;
return 0;
+
+ case 'f':
+ case 'F':
+ if (!s[1] || !strcasecmp(s, "false"))
+ goto have_false;
+
+ break;
case 'n':
case 'N':
+ if (!s[1] || !strcasecmp(s, "no"))
+ goto have_false;
+
+ break;
case '0':
+have_false:
*res = false;
return 0;
+
case 'o':
case 'O':
- switch (s[1]) {
- case 'n':
- case 'N':
- *res = true;
- return 0;
- case 'f':
- case 'F':
- *res = false;
- return 0;
- default:
- break;
- }
+ if (!strcasecmp(s, "on"))
+ goto have_true;
+
+ if (!strcasecmp(s, "off"))
+ goto have_false;
+
+ break;
+
default:
break;
}
next prev parent reply other threads:[~2020-06-26 10:45 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-25 22:49 [UPDATE][PATCH v3 1/2] cpufreq: intel_pstate: Allow enable/disable energy efficiency Srinivas Pandruvada
2020-06-26 8:49 ` Borislav Petkov
2020-06-26 9:12 ` Srinivas Pandruvada
2020-06-26 10:22 ` Peter Zijlstra
2020-06-26 10:44 ` Peter Zijlstra [this message]
2020-06-26 11:10 ` [PATCH] lib: Extend kstrtobool() to accept "true"/"false" Srinivas Pandruvada
2020-06-26 15:49 ` Rafael J. Wysocki
2020-06-26 15:51 ` Kees Cook
2020-06-29 12:09 ` Pavel Machek
2020-07-01 2:38 ` Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200626104442.GF117543@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=bp@alien8.de \
--cc=dsmythies@telus.net \
--cc=hpa@zytor.com \
--cc=jic23@cam.ac.uk \
--cc=keescook@chromium.org \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rjw@rjwysocki.net \
--cc=srinivas.pandruvada@linux.intel.com \
--cc=tglx@linutronix.de \
--cc=viresh.kumar@linaro.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).