All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Linus Walleij <linus.walleij@linaro.org>,
	Bartosz Golaszewski <bgolaszewski@baylibre.com>,
	linux-gpio@vger.kernel.org,
	Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v2 3/5] lib/cmdline: Allow get_options() to take 0 to validate the input
Date: Wed, 20 Jan 2021 23:45:45 +0200	[thread overview]
Message-ID: <20210120214547.89770-3-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20210120214547.89770-1-andriy.shevchenko@linux.intel.com>

Allow get_options() to take 0 as a number of integers parameter to validate
the input.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 lib/cmdline.c       | 14 +++++++++++---
 lib/cmdline_kunit.c | 10 +++++++++-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/lib/cmdline.c b/lib/cmdline.c
index 2a9ae2143e42..1106a8bcd63e 100644
--- a/lib/cmdline.c
+++ b/lib/cmdline.c
@@ -91,6 +91,9 @@ EXPORT_SYMBOL(get_option);
  *	full, or when no more numbers can be retrieved from the
  *	string.
  *
+ *	When @nints is 0, the function just validates the given @str and
+ *	returns amount of parseable integers as described below.
+ *
  *	Returns:
  *
  *	The first element is filled by the amount of the collected numbers
@@ -103,15 +106,20 @@ EXPORT_SYMBOL(get_option);
 
 char *get_options(const char *str, int nints, int *ints)
 {
+	bool validate = nints == 0;
 	int res, i = 1;
 
-	while (i < nints) {
-		res = get_option((char **)&str, ints + i);
+	while (i < nints || validate) {
+		int *pint = validate ? ints : ints + i;
+
+		res = get_option((char **)&str, pint);
 		if (res == 0)
 			break;
 		if (res == 3) {
+			int n = validate ? 0 : nints - i;
 			int range_nums;
-			range_nums = get_range((char **)&str, ints + i, nints - i);
+
+			range_nums = get_range((char **)&str, pint, n);
 			if (range_nums < 0)
 				break;
 			/*
diff --git a/lib/cmdline_kunit.c b/lib/cmdline_kunit.c
index 74da9ed61779..a6119c164b48 100644
--- a/lib/cmdline_kunit.c
+++ b/lib/cmdline_kunit.c
@@ -109,15 +109,23 @@ static void cmdline_do_one_range_test(struct kunit *test, const char *in,
 {
 	unsigned int i;
 	int r[16];
+	int *p;
 
 #define FMT	"in test %u"
 #define FMT2	"expected %d numbers, got %d"
 #define FMT3	"at %d"
 	memset(r, 0, sizeof(r));
 	get_options(in, ARRAY_SIZE(r), r);
-	KUNIT_EXPECT_EQ_MSG(test, r[0], e[0], FMT " " FMT2, n, e[0], r[0]);
+	KUNIT_EXPECT_EQ_MSG(test, r[0], e[0], FMT " (parsed) " FMT2, n, e[0], r[0]);
 	for (i = 1; i < ARRAY_SIZE(r); i++)
 		KUNIT_EXPECT_EQ_MSG(test, r[i], e[i], FMT " " FMT3, n, i);
+
+	memset(r, 0, sizeof(r));
+	get_options(in, 0, r);
+	KUNIT_EXPECT_EQ_MSG(test, r[0], e[0], FMT " (validated) " FMT2, n, e[0], r[0]);
+
+	p = memchr_inv(&r[1], 0, sizeof(r) - sizeof(r[0]));
+	KUNIT_EXPECT_PTR_EQ_MSG(test, p, (int *)0, FMT " out of bound " FMT3, n, p - r);
 #undef FMT3
 #undef FMT2
 #undef FMT
-- 
2.29.2


  parent reply	other threads:[~2021-01-20 23:42 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-20 21:45 [PATCH v2 1/5] lib/cmdline_kunit: add a new test case for get_options() Andy Shevchenko
2021-01-20 21:45 ` [PATCH v2 2/5] lib/cmdline: Update documentation to reflect behaviour Andy Shevchenko
2021-01-22 11:12   ` Bartosz Golaszewski
2021-01-20 21:45 ` Andy Shevchenko [this message]
2021-01-22 11:15   ` [PATCH v2 3/5] lib/cmdline: Allow get_options() to take 0 to validate the input Bartosz Golaszewski
2021-01-22 12:13     ` Andy Shevchenko
2021-01-20 21:45 ` [PATCH v2 4/5] gpio: aggregator: Replace isrange() by using get_options() Andy Shevchenko
2021-01-21 13:17   ` Linus Walleij
2021-01-22 10:47   ` Bartosz Golaszewski
2021-01-20 21:45 ` [PATCH v2 5/5] gpio: aggregator: Remove trailing comma in terminator entries Andy Shevchenko
2021-01-21 13:17   ` Linus Walleij
2021-01-21 17:09     ` Andy Shevchenko
2021-01-22 10:46       ` Bartosz Golaszewski
2021-01-22 10:46   ` Bartosz Golaszewski
2021-01-22 10:50   ` Geert Uytterhoeven
2021-01-22 11:11 ` [PATCH v2 1/5] lib/cmdline_kunit: add a new test case for get_options() Bartosz Golaszewski

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=20210120214547.89770-3-andriy.shevchenko@linux.intel.com \
    --to=andriy.shevchenko@linux.intel.com \
    --cc=bgolaszewski@baylibre.com \
    --cc=geert+renesas@glider.be \
    --cc=linus.walleij@linaro.org \
    --cc=linux-gpio@vger.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 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.