mm: add & use zone_end_pfn() and zone_spans_pfn()

[mirror_ubuntu-jammy-kernel.git] / mm / kmemleak.c

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index a217cc54406065f6cef571bb35f7b19a22e295c8..83dd5fbf5e600e6107258418ce2fb6c0021903b5 100644 (file)
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -1300,9 +1300,8 @@ static void kmemleak_scan(void)
         */
        lock_memory_hotplug();
        for_each_online_node(i) {
-               pg_data_t *pgdat = NODE_DATA(i);
-               unsigned long start_pfn = pgdat->node_start_pfn;
-               unsigned long end_pfn = start_pfn + pgdat->node_spanned_pages;
+               unsigned long start_pfn = node_start_pfn(i);
+               unsigned long end_pfn = node_end_pfn(i);
                unsigned long pfn;
 
                for (pfn = start_pfn; pfn < end_pfn; pfn++) {
@@ -1556,7 +1555,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);