From 2baef3be4d2dbe2878ed9a1495c7db64f8d24bff Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Thu, 9 Feb 2012 15:48:20 +0000
Subject: [PATCH] --- yaml --- r: 287378 b: refs/heads/master c:
 690d137f448d4c4da9001871e6569d5636f116c7 h: refs/heads/master v: v3

---
 [refs]              |  2 +-
 trunk/lib/kstrtox.c | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index c8911e518a6f..91a7bb3a0804 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d65b4e98d7ea3038b767b70fe8be959b2913f16d
+refs/heads/master: 690d137f448d4c4da9001871e6569d5636f116c7
diff --git a/trunk/lib/kstrtox.c b/trunk/lib/kstrtox.c
index 7a94c8f14e29..b1dd3e7d88cb 100644
--- a/trunk/lib/kstrtox.c
+++ b/trunk/lib/kstrtox.c
@@ -44,12 +44,13 @@ 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 *res)
+unsigned int _parse_integer(const char *s, unsigned int base, unsigned long long *p)
 {
+	unsigned long long res;
 	unsigned int rv;
 	int overflow;
 
-	*res = 0;
+	res = 0;
 	rv = 0;
 	overflow = 0;
 	while (*s) {
@@ -64,12 +65,19 @@ unsigned int _parse_integer(const char *s, unsigned int base, unsigned long long
 
 		if (val >= base)
 			break;
-		if (*res > div_u64(ULLONG_MAX - val, base))
-			overflow = 1;
-		*res = *res * base + val;
+		/*
+		 * Check for overflow only if we are within range of
+		 * it in the max base we support (16)
+		 */
+		if (unlikely(res & (~0ull << 60))) {
+			if (res > div_u64(ULLONG_MAX - val, base))
+				overflow = 1;
+		}
+		res = res * base + val;
 		rv++;
 		s++;
 	}
+	*p = res;
 	if (overflow)
 		rv |= KSTRTOX_OVERFLOW;
 	return rv;