Merge branch 'linus' into tracing/ftrace

4 files changed, 31 insertions, 7 deletions

diff --git a/mm/bootmem.c b/mm/bootmem.c
index e8fb927392b9..8d9f60e06f62 100644
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -442,15 +442,17 @@ unsigned long __init init_bootmem_node(pg_data_t *pgdat, unsigned long freepfn,
         return init_bootmem_core(pgdat, freepfn, startpfn, endpfn);
 }
 
-void __init reserve_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,
+int __init reserve_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,
                                  unsigned long size, int flags)
 {
         int ret;
 
         ret = can_reserve_bootmem_core(pgdat->bdata, physaddr, size, flags);
         if (ret < 0)
-                return;
+                return -ENOMEM;
         reserve_bootmem_core(pgdat->bdata, physaddr, size, flags);
+
+        return 0;
 }
 
 void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,
diff --git a/mm/memory.c b/mm/memory.c
index 19e0ae9beecb..9aefaae46858 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -999,17 +999,15 @@ struct page *follow_page(struct vm_area_struct *vma, unsigned long address,
                 goto no_page_table;
 
         ptep = pte_offset_map_lock(mm, pmd, address, &ptl);
-        if (!ptep)
-                goto out;
 
         pte = *ptep;
         if (!pte_present(pte))
-                goto unlock;
+                goto no_page;
         if ((flags & FOLL_WRITE) && !pte_write(pte))
                 goto unlock;
         page = vm_normal_page(vma, address, pte);
         if (unlikely(!page))
-                goto unlock;
+                goto bad_page;
 
         if (flags & FOLL_GET)
                 get_page(page);
@@ -1024,6 +1022,15 @@ unlock:
 out:
         return page;
 
+bad_page:
+        pte_unmap_unlock(ptep, ptl);
+        return ERR_PTR(-EFAULT);
+
+no_page:
+        pte_unmap_unlock(ptep, ptl);
+        if (!pte_none(pte))
+                return page;
+        /* Fall through to ZERO_PAGE handling */
 no_page_table:
         /*
          * When core dumping an enormous anonymous area that nobody
@@ -1159,6 +1166,8 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
 
                                 cond_resched();
                         }
+                        if (IS_ERR(page))
+                                return i ? i : PTR_ERR(page);
                         if (pages) {
                                 pages[i] = page;
 
diff --git a/mm/migrate.c b/mm/migrate.c
index 449d77d409f5..112bcaeaa104 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -865,6 +865,11 @@ static int do_move_pages(struct mm_struct *mm, struct page_to_node *pm,
                         goto set_status;
 
                 page = follow_page(vma, pp->addr, FOLL_GET);
+
+                err = PTR_ERR(page);
+                if (IS_ERR(page))
+                        goto set_status;
+
                 err = -ENOENT;
                 if (!page)
                         goto set_status;
@@ -928,6 +933,11 @@ static int do_pages_stat(struct mm_struct *mm, struct page_to_node *pm)
                         goto set_status;
 
                 page = follow_page(vma, pm->addr, 0);
+
+                err = PTR_ERR(page);
+                if (IS_ERR(page))
+                        goto set_status;
+
                 err = -ENOENT;
                 /* Use PageReserved to check for zero page */
                 if (!page || PageReserved(page))
diff --git a/mm/slab.c b/mm/slab.c
index 06236e4ddc1b..046607f05f3e 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3263,9 +3263,12 @@ retry:
 
                 if (cpuset_zone_allowed_hardwall(zone, flags) &&
                         cache->nodelists[nid] &&
-                        cache->nodelists[nid]->free_objects)
+                        cache->nodelists[nid]->free_objects) {
                                 obj = ____cache_alloc_node(cache,
                                         flags | GFP_THISNODE, nid);
+                                if (obj)
+                                        break;
+                }
         }
 
         if (!obj) {