The patch titled
Subject: parse_integer: convert scanf()
has been added to the -mm tree. Its filename is
parse_integer-convert-scanf.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/parse_integer-convert-scanf.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/parse_integer-convert-scanf.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Subject: parse_integer: convert scanf()
Remove base second guessing -- done by parse_integer() just fine.
Uniformly fix too liberal acceptance in %lu/%ld cases in the next patch.
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
lib/vsprintf.c | 36 ++++++++++--------------------------
1 file changed, 10 insertions(+), 26 deletions(-)
diff -puN lib/vsprintf.c~parse_integer-convert-scanf lib/vsprintf.c
--- a/lib/vsprintf.c~parse_integer-convert-scanf
+++ a/lib/vsprintf.c
@@ -2488,8 +2488,6 @@ EXPORT_SYMBOL_GPL(bprintf);
int vsscanf(const char *buf, const char *fmt, va_list args)
{
const char *str = buf;
- char *next;
- char digit;
int num = 0;
u8 qualifier;
unsigned int base;
@@ -2501,6 +2499,8 @@ int vsscanf(const char *buf, const char
bool is_sign;
while (*fmt) {
+ int len;
+
/* skip any white space in format */
/* white space in format matchs any amount of
* white space, including none, in the input.
@@ -2629,35 +2629,22 @@ int vsscanf(const char *buf, const char
*/
str = skip_spaces(str);
- digit = *str;
- if (is_sign && digit == '-')
- digit = *(str + 1);
-
- if (!digit
- || (base == 16 && !isxdigit(digit))
- || (base == 10 && !isdigit(digit))
- || (base == 8 && (!isdigit(digit) || digit > '7'))
- || (base == 0 && !isdigit(digit)))
- break;
-
if (is_sign)
- val.s = qualifier != 'L' ?
- simple_strtol(str, &next, base) :
- simple_strtoll(str, &next, base);
+ len = parse_integer(str, base, &val.s);
else
- val.u = qualifier != 'L' ?
- simple_strtoul(str, &next, base) :
- simple_strtoull(str, &next, base);
+ len = parse_integer(str, base, &val.u);
+ if (len < 0)
+ break;
- if (field_width > 0 && next - str > field_width) {
+ if (field_width > 0) {
if (base == 0)
_parse_integer_fixup_radix(str, &base);
- while (next - str > field_width) {
+ while (len > field_width) {
if (is_sign)
val.s = div_s64(val.s, base);
else
val.u = div_u64(val.u, base);
- --next;
+ len--;
}
}
@@ -2698,10 +2685,7 @@ int vsscanf(const char *buf, const char
break;
}
num++;
-
- if (!next)
- break;
- str = next;
+ str += len;
}
return num;
_
Patches currently in -mm which might be from adobriyan@xxxxxxxxx are
kstrto-accept-0-for-signed-conversion.patch
add-parse_integer-replacement-for-simple_strto.patch
parse_integer-add-runtime-testsuite.patch
parse-integer-rewrite-kstrto.patch
parse_integer-convert-scanf.patch
scanf-fix-type-range-overflow.patch
parse_integer-convert-lib.patch
parse_integer-convert-mm.patch
parse_integer-convert-fs.patch
parse_integer-convert-fs-cachefiles.patch
parse_integer-convert-ext2-ext3-ext4.patch
parse_integer-convert-fs-ocfs2.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
