3 files changed, 8 insertions, 4 deletions

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 28a64e769527..2b72d26e2e4b 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1123,7 +1123,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
         if (always_dump_vma(vma))
                 goto whole;
 
-        if (vma->vm_flags & VM_NODUMP)
+        if (vma->vm_flags & VM_DONTDUMP)
                 return 0;
 
         /* Hugetlb memory check */
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 25ef49c1f2bd..dc08d558e058 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -102,7 +102,7 @@ extern unsigned int kobjsize(const void *objp);
 #define VM_HUGETLB      0x00400000      /* Huge TLB Page VM */
 #define VM_NONLINEAR    0x00800000      /* Is non-linear (remap_file_pages) */
 #define VM_ARCH_1       0x01000000      /* Architecture-specific flag */
-#define VM_NODUMP       0x04000000      /* Do not include in the core dump */
+#define VM_DONTDUMP     0x04000000      /* Do not include in the core dump */
 
 #define VM_MIXEDMAP     0x10000000      /* Can contain "struct page" and pure PFN pages */
 #define VM_HUGEPAGE     0x20000000      /* MADV_HUGEPAGE marked this vma */
diff --git a/mm/madvise.c b/mm/madvise.c
index 14d260fa0d17..03dfa5c7adb3 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -69,10 +69,14 @@ static long madvise_behavior(struct vm_area_struct * vma,
                 new_flags &= ~VM_DONTCOPY;
                 break;
         case MADV_DONTDUMP:
-                new_flags |= VM_NODUMP;
+                new_flags |= VM_DONTDUMP;
                 break;
         case MADV_DODUMP:
-                new_flags &= ~VM_NODUMP;
+                if (new_flags & VM_SPECIAL) {
+                        error = -EINVAL;
+                        goto out;
+                }
+                new_flags &= ~VM_DONTDUMP;
                 break;
         case MADV_MERGEABLE:
         case MADV_UNMERGEABLE: