3 files changed, 20 insertions, 0 deletions

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index aa3cb626671e..df9ea4186d75 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1108,6 +1108,14 @@ static bool always_dump_vma(struct vm_area_struct *vma)
         /* Any vsyscall mappings? */
         if (vma == get_gate_vma(vma->vm_mm))
                 return true;
+
+        /*
+         * Assume that all vmas with a .name op should always be dumped.
+         * If this changes, a new vm_ops field can easily be added.
+         */
+        if (vma->vm_ops && vma->vm_ops->name && vma->vm_ops->name(vma))
+                return true;
+
         /*
          * arch_vma_name() returns non-NULL for special architecture mappings,
          * such as vDSO sections.
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 442177b1119a..9b2f5d62ce63 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -300,6 +300,12 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
                 goto done;
         }
 
+        if (vma->vm_ops && vma->vm_ops->name) {
+                name = vma->vm_ops->name(vma);
+                if (name)
+                        goto done;
+        }
+
         name = arch_vma_name(vma);
         if (!name) {
                 pid_t tid;
diff --git a/include/linux/mm.h b/include/linux/mm.h
index bf9811e1321a..63f8d4efe303 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -239,6 +239,12 @@ struct vm_operations_struct {
          */
         int (*access)(struct vm_area_struct *vma, unsigned long addr,
                       void *buf, int len, int write);
+
+        /* Called by the /proc/PID/maps code to ask the vma whether it
+         * has a special name.  Returning non-NULL will also cause this
+         * vma to be dumped unconditionally. */
+        const char *(*name)(struct vm_area_struct *vma);
+
 #ifdef CONFIG_NUMA
         /*
          * set_policy() op must add a reference to any non-NULL @new mempolicy