Merge branch 'fscache' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells...

[karo-tx-linux.git] / mm / kmemleak.c

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index a217cc54406065f6cef571bb35f7b19a22e295c8..752a705c77c2ec6c5f08cfb5ac4bf531895b2c3e 100644 (file)
--- a/mm/kmemleak.c
+++ b/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);