Skip to contentSkip to conversation

lib: add range check to avoid overflow simple_strtoul/ull

PATCH New Harvey Harrison 1 participant 1 message May 13, 2008

Subsystems (2)
Library code Vsprintf
lore
Share & tools
lore

Harvey Harrison

author
#0 lore raw

PATCH 3/3 lib: add range check to avoid overflow simple_strtoul/ull

Add a simple range check to avoid overflowing an UL, ULL respectively. The strict versions will catch this case now as the strlen call will be longer than the number of characters read. Previously, the simple function would read as long as there were valied hexadecimal characters remaining.

The simple_strtol/ll still can overflow producing sign errors, but maybe those users should be using the strict versions then?

Signed-off-by Harvey Harrison <[email protected]>

---
As Alexey noted, the strict versions are a bit of a joke if they can overflow in the simple cases, here's one way of closing the gap for the strict functions and simple_strtoul/simple_strtoull

simple_strtol/simple_strtoll still has a (narrower) chance at overflow and is not totally safe...use the strict versions then.

 lib/vsprintf.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
lib/vsprintf.c +8 -0
index 3547fb5..89f2620 100644
@@ -57,6 +57,7 @@ static u8 chartou8(char ch)
 unsigned long simple_strtoul(const char *cp, char **endp, unsigned int base)
 {
 	unsigned long result = 0;
+	unsigned long maxval;
 	u8 value;
 
 	if (!base)

@@ -65,9 +66,12 @@ unsigned long simple_strtoul(const char *cp, char **endp, unsigned int base)
 	if (base == 16 && cp[0] == '0' && TOLOWER(cp[1]) == 'x')
 			cp += 2;
 
+	maxval = ULONG_MAX / base;
 	while (isxdigit(*cp) && (value = chartou8(*cp) < base)) {
 		result = result * base + value;
 		cp++;
+		if (result > maxval)
+			break;
 	}
 
 	if (endp)

@@ -99,6 +103,7 @@ EXPORT_SYMBOL(simple_strtol);
 unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int base)
 {
 	unsigned long long result = 0;
+	unsigned long long maxval;
 	u8 value;
 
 	if (!base)

@@ -107,9 +112,12 @@ unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int bas
 	if (base == 16 && cp[0] == '0' && TOLOWER(cp[1]) == 'x')
 		cp += 2;
 
+	maxval = ULLONG_MAX / base;
 	while (isxdigit(*cp) && (value = chartou8(*cp) < base)) {
 		result = result * base + value;
 		cp++;
+		if (result > maxval)
+			break;
 	}
 
 	if (endp)
Signature · 1 line
1.5.5.1.482.g0f174