linux-kernel - [PATCH 2/2] lib: call native hex_to_bin() inside

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <5e634c6aaeea13b4a1a541fad0b776180ccfd80b.1310977380.git.andriy.shevchenko@linux.intel.com>
Date:	Mon, 18 Jul 2011 11:23:24 +0300
From:	Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
To:	linux-kernel@...r.kernel.org
Cc:	Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Alexey Dobriyan <adobriyan@...il.com>
Subject: [PATCH 2/2] lib: call native hex_to_bin() inside _kstrtoull()

Signed-off-by: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: Alexey Dobriyan <adobriyan@...il.com>
---
 lib/kstrtox.c |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/lib/kstrtox.c b/lib/kstrtox.c
index 5099755..a26d287 100644
--- a/lib/kstrtox.c
+++ b/lib/kstrtox.c
@@ -39,25 +39,18 @@ static int _kstrtoull(const char *s, unsigned int base, unsigned long long *res)
 	acc = 0;
 	ok = 0;
 	while (*s) {
-		unsigned int val;
+		int val;
 
-		if ('0' <= *s && *s <= '9')
-			val = *s - '0';
-		else if ('a' <= TOLOWER(*s) && TOLOWER(*s) <= 'f')
-			val = TOLOWER(*s) - 'a' + 10;
-		else if (*s == '\n' && *(s + 1) == '\0')
+		if (unlikely(*s == '\n' && *(s + 1) == '\0'))
 			break;
-		else
-			return -EINVAL;
 
-		if (val >= base)
+		val = hex_to_bin(*s++);
+		if (val >= base || val < 0)
 			return -EINVAL;
 		if (acc > div_u64(ULLONG_MAX - val, base))
 			return -ERANGE;
 		acc = acc * base + val;
 		ok = 1;
-
-		s++;
 	}
 	if (!ok)
 		return -EINVAL;
-- 
1.7.5.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/