From 4bf0252c80923bb34195b59b818bf339c30af828 Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@inktank.com>
Date: Thu, 4 Oct 2012 17:13:16 -0700
Subject: [PATCH] --- yaml --- r: 330087 b: refs/heads/master c:
 77dd3b0bd17a0849b2f98b915ce3fc9247db1013 h: refs/heads/master i:   330085:
 05bb021f20c2650f618382296c16d57cc077c8b7   330083:
 27b153e5dc0269643d08d388801bf7f45b2b3756   330079:
 3eb0cda1b697f68396197c4858c74879cd389816 v: v3

---
 [refs]             |  2 +-
 trunk/lib/parser.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f9ca86d20eb2..aa711236955c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 125c4c706b680c7831f0966ff873c1ad0354ec25
+refs/heads/master: 77dd3b0bd17a0849b2f98b915ce3fc9247db1013
diff --git a/trunk/lib/parser.c b/trunk/lib/parser.c
index c43410084838..52cfa69f73df 100644
--- a/trunk/lib/parser.c
+++ b/trunk/lib/parser.c
@@ -122,13 +122,14 @@ int match_token(char *s, const match_table_t table, substring_t args[])
  *
  * Description: Given a &substring_t and a base, attempts to parse the substring
  * as a number in that base. On success, sets @result to the integer represented
- * by the string and returns 0. Returns either -ENOMEM or -EINVAL on failure.
+ * by the string and returns 0. Returns -ENOMEM, -EINVAL, or -ERANGE on failure.
  */
 static int match_number(substring_t *s, int *result, int base)
 {
 	char *endp;
 	char *buf;
 	int ret;
+	long val;
 	size_t len = s->to - s->from;
 
 	buf = kmalloc(len + 1, GFP_KERNEL);
@@ -136,10 +137,15 @@ static int match_number(substring_t *s, int *result, int base)
 		return -ENOMEM;
 	memcpy(buf, s->from, len);
 	buf[len] = '\0';
-	*result = simple_strtol(buf, &endp, base);
+
 	ret = 0;
+	val = simple_strtol(buf, &endp, base);
 	if (endp == buf)
 		ret = -EINVAL;
+	else if (val < (long)INT_MIN || val > (long)INT_MAX)
+		ret = -ERANGE;
+	else
+		*result = (int) val;
 	kfree(buf);
 	return ret;
 }