From: Richard Fitzgerald <rf@opensource.cirrus.com>
To: <pmladek@suse.com>, <rostedt@goodmis.org>,
<sergey.senozhatsky@gmail.com>,
<andriy.shevchenko@linux.intel.com>, <linux@rasmusvillemoes.dk>,
<shuah@kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <linux-kselftest@vger.kernel.org>,
<patches@opensource.cirrus.com>,
Richard Fitzgerald <rf@opensource.cirrus.com>
Subject: [PATCH v5 1/4] lib: vsprintf: scanf: Negative number must have field width > 1
Date: Mon, 8 Feb 2021 14:01:51 +0000 [thread overview]
Message-ID: <20210208140154.10964-1-rf@opensource.cirrus.com> (raw)
If a signed number field starts with a '-' the field width must be > 1,
or unlimited, to allow at least one digit after the '-'.
This patch adds a check for this. If a signed field starts with '-'
and field_width == 1 the scanf will quit.
It is ok for a signed number field to have a field width of 1 if it
starts with a digit. In that case the single digit can be converted.
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
lib/vsprintf.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 3b53c73580c5..28bb26cd1f67 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -3434,8 +3434,12 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
str = skip_spaces(str);
digit = *str;
- if (is_sign && digit == '-')
+ if (is_sign && digit == '-') {
+ if (field_width == 1)
+ break;
+
digit = *(str + 1);
+ }
if (!digit
|| (base == 16 && !isxdigit(digit))
--
2.20.1
next reply other threads:[~2021-02-08 14:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-08 14:01 Richard Fitzgerald [this message]
2021-02-08 14:01 ` [PATCH v5 2/4] lib: vsprintf: Fix handling of number field widths in vsscanf Richard Fitzgerald
2021-02-08 15:18 ` Andy Shevchenko
2021-02-08 17:38 ` Richard Fitzgerald
2021-02-11 12:55 ` Petr Mladek
2021-02-11 13:32 ` Petr Mladek
2021-02-08 14:01 ` [PATCH v5 3/4] lib: test_scanf: Add tests for sscanf number conversion Richard Fitzgerald
2021-02-08 14:01 ` [PATCH v5 4/4] selftests: lib: Add wrapper script for test_scanf Richard Fitzgerald
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=20210208140154.10964-1-rf@opensource.cirrus.com \
--to=rf@opensource.cirrus.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=patches@opensource.cirrus.com \
--cc=pmladek@suse.com \
--cc=rostedt@goodmis.org \
--cc=sergey.senozhatsky@gmail.com \
--cc=shuah@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