lib: strto: fix incorrect handling of specified base
PATCH 1/1 lib: strto: fix incorrect handling of specified base
The strto functions should honor the specified base (if non-zero) rather than permitting a hex or octal string when the user wanted (for example) base 10.
This has been fixed somewhere along the way in the upstream linux kernel src tree, at some point after these was copied in to u-boot. And also in a way that duplicates less code. So port _parse_integer_fixup_radix() to u-boot.
--- lib/strto.c | 45 +++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 26 deletions(-)
lib/strto.c +19 -26
@@ -13,25 +13,30 @@#include <errno.h> #include <linux/ctype.h> +/* from lib/kstrtox.c */ +static const char *_parse_integer_fixup_radix (const char *s,unsigned int *base) +{ +if (*base ==0 ) { +if (s[0 ] =='0' ) { +if (tolower (s[1 ]) =='x' &&isxdigit (s[2 ])) + *base =16 ; +else + *base =8 ; + }else + *base =10 ; + } +if (*base ==16 && s[0 ] =='0' &&tolower (s[1 ]) =='x' ) + s +=2 ; +return s; +} +unsigned long simple_strtoul (const char *cp,char **endp,unsigned int base) {unsigned long result =0 ;unsigned long value; -if (*cp =='0' ) { - cp++; -if ((*cp =='x' ) &&isxdigit (cp[1 ])) { - base =16 ; - cp++; - } - -if (!base) - base =8 ; - } - -if (!base) - base =10 ; + cp =_parse_integer_fixup_radix (cp, &base);while (isxdigit (*cp) && (value =isdigit (*cp) ? *cp-'0' : (islower (*cp) ?toupper (*cp) : *cp)-'A' +10 ) < base) {
@@ -128,19 +133,7 @@ unsigned long long simple_strtoull(const char *cp, char **endp, {unsigned long long result =0 , value; -if (*cp =='0' ) { - cp++; -if ((*cp =='x' ) &&isxdigit (cp[1 ])) { - base =16 ; - cp++; - } - -if (!base) - base =8 ; - } - -if (!base) - base =10 ; + cp =_parse_integer_fixup_radix (cp, &base);while (isxdigit (*cp) && (value =isdigit (*cp) ? *cp -'0' : (islower (*cp) ?toupper (*cp) : *cp) -'A' +10 ) < base) {
Signature · 1 line
2.13.5
PATCH 1/1 lib: strto: fix incorrect handling of specified base
Quoted 10 lines · Rob Clark
The strto functions should honor the specified base (if non-zero) rather than permitting a hex or octal string when the user wanted (for example) base 10.
This has been fixed somewhere along the way in the upstream linux kernel src tree, at some point after these was copied in to u-boot. And also in a way that duplicates less code. So port
_parse_integer_fixup_radix()to u-boot.
Quoted 5 lines
Signed-off-by Rob Clark <[email protected]>--- lib/strto.c | 45 +++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 26 deletions(-)
Quoted 11 lines · Rob Clark
The strto functions should honor the specified base (if non-zero) rather than permitting a hex or octal string when the user wanted (for example) base 10.
This has been fixed somewhere along the way in the upstream linux kernel src tree, at some point after these was copied in to u-boot. And also in a way that duplicates less code. So port
_parse_integer_fixup_radix()to u-boot.Signed-off-by Rob Clark <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170915/0f54ef15/attachment.sig>