From 52545e9fb6b21dbbe441b8e1c331c36cd689e556 Mon Sep 17 00:00:00 2001
From: Abhijit Pawar <abhi.c.pawar@gmail.com>
Date: Tue, 18 Dec 2012 14:23:27 -0800
Subject: [PATCH] --- yaml --- r: 347037 b: refs/heads/master c:
 dc053733ea44babedb20266300b984d6add8b9e5 h: refs/heads/master i:   347035:
 5d3f54bde57b434df4db3fdcdb6d9c47d7e62f3f v: v3

---
 [refs]              | 2 +-
 trunk/mm/kmemleak.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 50114b28b60c..5040ed7fda36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79a4dcefd3256896416f5a94d2d1442a7f5aa9b8
+refs/heads/master: dc053733ea44babedb20266300b984d6add8b9e5
diff --git a/trunk/mm/kmemleak.c b/trunk/mm/kmemleak.c
index a217cc544060..752a705c77c2 100644
--- a/trunk/mm/kmemleak.c
+++ b/trunk/mm/kmemleak.c
@@ -1556,7 +1556,8 @@ static int dump_str_object_info(const char *str)
 	struct kmemleak_object *object;
 	unsigned long addr;
 
-	addr= simple_strtoul(str, NULL, 0);
+	if (kstrtoul(str, 0, &addr))
+		return -EINVAL;
 	object = find_and_get_object(addr, 0);
 	if (!object) {
 		pr_info("Unknown object at 0x%08lx\n", addr);