1 files changed, 10 insertions, 2 deletions

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index c76afa26edf7..e2159063198a 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1156,16 +1156,24 @@ static int dump_seek(struct file *file, loff_t off)
 static unsigned long vma_dump_size(struct vm_area_struct *vma,
                                    unsigned long mm_flags)
 {
+#define FILTER(type)    (mm_flags & (1UL << MMF_DUMP_##type))
+
         /* The vma can be set up to tell us the answer directly.  */
         if (vma->vm_flags & VM_ALWAYSDUMP)
                 goto whole;
 
+        /* Hugetlb memory check */
+        if (vma->vm_flags & VM_HUGETLB) {
+                if ((vma->vm_flags & VM_SHARED) && FILTER(HUGETLB_SHARED))
+                        goto whole;
+                if (!(vma->vm_flags & VM_SHARED) && FILTER(HUGETLB_PRIVATE))
+                        goto whole;
+        }
+
         /* Do not dump I/O mapped devices or special mappings */
         if (vma->vm_flags & (VM_IO | VM_RESERVED))
                 return 0;
 
-#define FILTER(type)    (mm_flags & (1UL << MMF_DUMP_##type))
-
         /* By default, dump shared memory if mapped from an anonymous file. */
         if (vma->vm_flags & VM_SHARED) {
                 if (vma->vm_file->f_path.dentry->d_inode->i_nlink == 0 ?