1 files changed, 13 insertions, 4 deletions

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index f969da5dd8a2..4a57f135b76e 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -924,15 +924,21 @@ static int migrate_to_node(struct mm_struct *mm, int source, int dest,
         nodemask_t nmask;
         LIST_HEAD(pagelist);
         int err = 0;
+        struct vm_area_struct *vma;
 
         nodes_clear(nmask);
         node_set(source, nmask);
 
-        check_range(mm, mm->mmap->vm_start, mm->task_size, &nmask,
+        vma = check_range(mm, mm->mmap->vm_start, mm->task_size, &nmask,
                         flags | MPOL_MF_DISCONTIG_OK, &pagelist);
+        if (IS_ERR(vma))
+                return PTR_ERR(vma);
 
-        if (!list_empty(&pagelist))
+        if (!list_empty(&pagelist)) {
                 err = migrate_pages(&pagelist, new_node_page, dest, 0);
+                if (err)
+                        putback_lru_pages(&pagelist);
+        }
 
         return err;
 }
@@ -1147,9 +1153,12 @@ static long do_mbind(unsigned long start, unsigned long len,
 
                 err = mbind_range(mm, start, end, new);
 
-                if (!list_empty(&pagelist))
+                if (!list_empty(&pagelist)) {
                         nr_failed = migrate_pages(&pagelist, new_vma_page,
                                                 (unsigned long)vma, 0);
+                        if (nr_failed)
+                                putback_lru_pages(&pagelist);
+                }
 
                 if (!err && nr_failed && (flags & MPOL_MF_STRICT))
                         err = -EIO;
@@ -1588,7 +1597,7 @@ unsigned slab_node(struct mempolicy *policy)
                 (void)first_zones_zonelist(zonelist, highest_zoneidx,
                                                         &policy->v.nodes,
                                                         &zone);
-                return zone->node;
+                return zone ? zone->node : numa_node_id();
         }
 
         default: