sscanf: Fix integer overflow with sscanf field width
Subsystems (2)
RFC PATCH 1/1 sscanf: Fix integer overflow with sscanf field width
Hi,
This fixes 53809751ac23 ("sscanf: don't ignore field widths for numeric conversions"). sscanf overflows integers with simple strings such as dates. As an example, consider
r = sscanf("20190523123456", "%4d%2d%2d%2d%2d%2d",
&year, &month, &day,
&hour, &minute, &second);
pr_info("%d %04d-%02d-%2d %02d:%02d:%02d\n",
r,
year, month, day,
hour, minute, second);On a 32-bit machine this prints
6 0000-05-23 12:34:56
where the year is zero, and not 2019 as expected. The reason is that sscanf attempts to read 20190523123456 as a whole integer and then divide it with 10^10 to obtain 2019, which obviously fails. Of course, 64-bit machines fail similarly on longer numerical strings.
I'm offering a simple patch to correct this below. The idea is to have a variant of _parse_integer() called _parse_integer_end(), with the ability to stop consuming digits. The functions
simple_{strtol,strtoll,strtoul,strtoull}()
now have the corresponding
sscanf_{strtol,strtoll,strtoul,strtoull}()
taking a field width into account. There are some code duplication issues etc. so one might consider making more extensive changes than these.
What are your thoughts?
Fredrik
lib/kstrtox.c +8 -2
@@ -45,14 +45,15 @@ const char *_parse_integer_fixup_radix(const char *s, unsigned int *base)* * Don't you dare use this function. */ -unsigned int _parse_integer (const char *s,unsigned int base,unsigned long long *p) +unsigned int _parse_integer_end (const char *s,const char *e, +unsigned int base,unsigned long long *p) {unsigned long long res;unsigned int rv; res =0 ; rv =0 ; -while (1 ) { +while (!e || s < e) {unsigned int c = *s;unsigned int lc = c |0x20 ;/* don't tolower() this line */ unsigned int val;
@@ -82,6 +83,11 @@ unsigned int _parse_integer(const char *s, unsigned int base, unsigned long longreturn rv; } +unsigned int _parse_integer (const char *s,unsigned int base,unsigned long long *p) +{ +return _parse_integer_end (s,NULL , base, p); +} +static int _kstrtoull (const char *s,unsigned int base,unsigned long long *res) {unsigned long long _res;
lib/kstrtox.h +2 -0
@@ -4,6 +4,8 @@#define KSTRTOX_OVERFLOW (1U << 31)const char *_parse_integer_fixup_radix (const char *s,unsigned int *base); +unsigned int _parse_integer_end (const char *s,const char *e, +unsigned int base,unsigned long long *p);unsigned int _parse_integer (const char *s,unsigned int base,unsigned long long *res);#endif
lib/vsprintf.c +46 -16
76 lines not on this page · raw message
Quoted 14 lines
Quoted 1 line
Quoted 1 line · On 23.05.19 at 19:27, <[email protected]> wrote:
This fixes
53809751ac23("sscanf: don't ignore field widths for numeric conversions"). sscanf overflows integers with simple strings such as dates. As an example, considerr = sscanf("20190523123456", "%4d%2d%2d%2d%2d%2d", &year, &month, &day, &hour, &minute, &second); pr_info("%d %04d-%02d-%2d %02d:%02d:%02d\n", r, year, month, day, hour, minute, second);
Quoted 8 lines
On a 32-bit machine this prints
6 0000-05-23 12:34:56where the year is zero, and not 2019 as expected. The reason is that sscanf attempts to read 20190523123456 as a whole integer and then divide it with 10^10 to obtain 2019, which obviously fails. Of course, 64-bit machines fail similarly on longer numerical strings.
Right, and that's also what that commit's description says remains as non-conforming behavior.
Quoted 4 lines
I'm offering a simple patch to correct this below. The idea is to have a variant of
_parse_integer()called_parse_integer_end(), with the ability to stop consuming digits. The functions
Quoted 8 lines
simple_{strtol,strtoll,strtoul,strtoull}()
now have the corresponding
sscanf_{strtol,strtoll,strtoul,strtoull}()
taking a field width into account. There are some code duplication issues etc. so one might consider making more extensive changes than these.
I'm not the maintainer here, but to me it looks mostly okay.
lib/vsprintf.c long long simple_strtoll(const char *cp, char **endp, unsigned int base) · line 154
Quoted 5 lines
lib/vsprintf.c +5
-0+static long sscanf_strtol (const char *cp,int field_width, +char **endp,unsigned int base) +{ +if (*cp =='-' ) +return -sscanf_strtoul (cp +1 , field_width -1 , endp, base);
I'm afraid you may neither convert a field width of zero to -1 here, nor convert a field width of 1 to zero (unlimited).
I'd also like to note that the 'u' and 'x' format characters also accept a sign as per the standard, but that's an orthogonal issue which you may or may not want to address at the same time.
Jan