1 files changed, 6 insertions, 4 deletions

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index d94f7dee3997..d66010e0049d 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -422,7 +422,7 @@ static ssize_t scan_sleep_millisecs_store(struct kobject *kobj,
         unsigned long msecs;
         int err;
 
-        err = strict_strtoul(buf, 10, &msecs);
+        err = kstrtoul(buf, 10, &msecs);
         if (err || msecs > UINT_MAX)
                 return -EINVAL;
 
@@ -449,7 +449,7 @@ static ssize_t alloc_sleep_millisecs_store(struct kobject *kobj,
         unsigned long msecs;
         int err;
 
-        err = strict_strtoul(buf, 10, &msecs);
+        err = kstrtoul(buf, 10, &msecs);
         if (err || msecs > UINT_MAX)
                 return -EINVAL;
 
@@ -475,7 +475,7 @@ static ssize_t pages_to_scan_store(struct kobject *kobj,
         int err;
         unsigned long pages;
 
-        err = strict_strtoul(buf, 10, &pages);
+        err = kstrtoul(buf, 10, &pages);
         if (err || !pages || pages > UINT_MAX)
                 return -EINVAL;
 
@@ -543,7 +543,7 @@ static ssize_t khugepaged_max_ptes_none_store(struct kobject *kobj,
         int err;
         unsigned long max_ptes_none;
 
-        err = strict_strtoul(buf, 10, &max_ptes_none);
+        err = kstrtoul(buf, 10, &max_ptes_none);
         if (err || max_ptes_none > HPAGE_PMD_NR-1)
                 return -EINVAL;
 
@@ -2301,6 +2301,8 @@ static void collapse_huge_page(struct mm_struct *mm,
                 goto out;
 
         vma = find_vma(mm, address);
+        if (!vma)
+                goto out;
         hstart = (vma->vm_start + ~HPAGE_PMD_MASK) & HPAGE_PMD_MASK;
         hend = vma->vm_end & HPAGE_PMD_MASK;
         if (address < hstart || address + HPAGE_PMD_SIZE > hend)