3 files changed, 34 insertions, 6 deletions

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index bbf953eeb58b..ab171274ef21 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -785,7 +785,7 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src,
                         continue;
 
                 spin_lock(&dst->page_table_lock);
-                spin_lock(&src->page_table_lock);
+                spin_lock_nested(&src->page_table_lock, SINGLE_DEPTH_NESTING);
                 if (!huge_pte_none(huge_ptep_get(src_pte))) {
                         if (cow)
                                 huge_ptep_set_wrprotect(src, addr, src_pte);
diff --git a/mm/mmap.c b/mm/mmap.c
index 669499e7c2f5..3354fdd83d4b 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -245,10 +245,16 @@ asmlinkage unsigned long sys_brk(unsigned long brk)
         unsigned long rlim, retval;
         unsigned long newbrk, oldbrk;
         struct mm_struct *mm = current->mm;
+        unsigned long min_brk;
 
         down_write(&mm->mmap_sem);
 
-        if (brk < mm->start_brk)
+#ifdef CONFIG_COMPAT_BRK
+        min_brk = mm->end_code;
+#else
+        min_brk = mm->start_brk;
+#endif
+        if (brk < min_brk)
                 goto out;
 
         /*
diff --git a/mm/nommu.c b/mm/nommu.c
index dca93fcb8b7a..3abd0845bda4 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -104,21 +104,43 @@ EXPORT_SYMBOL(vmtruncate);
 unsigned int kobjsize(const void *objp)
 {
         struct page *page;
+        int order = 0;
 
         /*
          * If the object we have should not have ksize performed on it,
          * return size of 0
          */
-        if (!objp || (unsigned long)objp >= memory_end || !((page = virt_to_page(objp))))
+        if (!objp)
                 return 0;
 
+        if ((unsigned long)objp >= memory_end)
+                return 0;
+
+        page = virt_to_head_page(objp);
+        if (!page)
+                return 0;
+
+        /*
+         * If the allocator sets PageSlab, we know the pointer came from
+         * kmalloc().
+         */
         if (PageSlab(page))
                 return ksize(objp);
 
-        BUG_ON(page->index < 0);
-        BUG_ON(page->index >= MAX_ORDER);
+        /*
+         * The ksize() function is only guaranteed to work for pointers
+         * returned by kmalloc(). So handle arbitrary pointers, that we expect
+         * always to be compound pages, here.
+         */
+        if (PageCompound(page))
+                order = compound_order(page);
 
-        return (PAGE_SIZE << page->index);
+        /*
+         * Finally, handle arbitrary pointers that don't set PageSlab.
+         * Default to 0-order in the case when we're unable to ksize()
+         * the object.
+         */
+        return PAGE_SIZE << order;
 }
 
 /*