From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: linux-kselftest@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
kunit-dev@googlegroups.com,
Shuah Khan <skhan@linuxfoundation.org>,
Vitor Massaru Iha <vitor@massaru.org>
Cc: Mark Brown <broonie@kernel.org>,
Brendan Higgins <brendanhiggins@google.com>,
David Gow <davidgow@google.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v4 4/6] lib/cmdline: Fix get_option() for strings starting with hyphen
Date: Thu, 12 Nov 2020 20:07:30 +0200 [thread overview]
Message-ID: <20201112180732.75589-4-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20201112180732.75589-1-andriy.shevchenko@linux.intel.com>
When string doesn't have an integer and starts from hyphen get_option()
may return interesting results. Fix it to return 0.
The simple_strtoull() is used due to absence of simple_strtoul()
in a boot code on some architectures.
Note, the Fixes tag below is rather for anthropological curiosity.
Fixes: f68565831e72 ("Import 2.4.0-test2pre3")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v4: new patch
lib/cmdline.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/cmdline.c b/lib/cmdline.c
index fbb9981a04a4..ca89846ee0bb 100644
--- a/lib/cmdline.c
+++ b/lib/cmdline.c
@@ -45,6 +45,9 @@ static int get_range(char **str, int *pint, int n)
* 1 - int found, no subsequent comma
* 2 - int found including a subsequent comma
* 3 - hyphen found to denote a range
+ *
+ * Leading hyphen without integer is no integer case, but we consume it
+ * for the sake of simplification.
*/
int get_option(char **str, int *pint)
@@ -53,7 +56,10 @@ int get_option(char **str, int *pint)
if (!cur || !(*cur))
return 0;
- *pint = simple_strtol(cur, str, 0);
+ if (*cur == '-')
+ *pint = -simple_strtoull(++cur, str, 0);
+ else
+ *pint = simple_strtoull(cur, str, 0);
if (cur == *str)
return 0;
if (**str == ',') {
--
2.28.0
next prev parent reply other threads:[~2020-11-12 18:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-12 18:07 [PATCH v4 1/6] lib/list_kunit: Follow new file name convention for KUnit tests Andy Shevchenko
2020-11-12 18:07 ` [PATCH v4 2/6] lib/linear_ranges_kunit: " Andy Shevchenko
2020-11-13 6:22 ` Vaittinen, Matti
2020-11-16 10:42 ` andriy.shevchenko
2020-11-12 18:07 ` [PATCH v4 3/6] lib/bits_kunit: " Andy Shevchenko
2020-11-12 18:07 ` Andy Shevchenko [this message]
2020-11-12 18:07 ` [PATCH v4 5/6] lib/cmdline: Allow NULL to be an output for get_option() Andy Shevchenko
2020-11-12 18:07 ` [PATCH v4 6/6] lib/cmdline_kunit: Add a new test suite for cmdline API Andy Shevchenko
2020-11-13 3:10 ` Andrew Morton
2020-11-16 9:53 ` Andy Shevchenko
2020-11-16 10:41 ` Andy Shevchenko
2020-11-16 23:43 ` David Gow
2020-11-17 15:52 ` Andy Shevchenko
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=20201112180732.75589-4-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=brendanhiggins@google.com \
--cc=broonie@kernel.org \
--cc=davidgow@google.com \
--cc=kunit-dev@googlegroups.com \
--cc=linux-kselftest@vger.kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=vitor@massaru.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.