mm/vma: do not try to unmap a VMA if mmap_prepare() invoked from mmap()

[ Upstream commit 619eab23e1ce7c97e54bfc5a417306d94b3f6f13 ]

The mmap_prepare hook functionality includes the ability to invoke
mmap_prepare() from the mmap() hook of existing 'stacked' drivers, that is
ones which are capable of calling the mmap hooks of other drivers/file
systems (e.g.  overlayfs, shm).

As part of the mmap_prepare action functionality, we deal with errors by
unmapping the VMA should one arise.  This works in the usual mmap_prepare
case, as we invoke this action at the last moment, when the VMA is
established in the maple tree.

However, the mmap() hook passes a not-fully-established VMA pointer to the
caller (which is the motivation behind the mmap_prepare() work), which is
detached.

So attempting to unmap a VMA in this state will be problematic, with the
most obvious symptom being a warning in vma_mark_detached(), because the
VMA is already detached.

It's also unncessary - the mmap() handler will clean up the VMA on error.

So to fix this issue, this patch propagates whether or not an mmap action
is being completed via the compatibility layer or directly.

If the former, then we do not attempt VMA cleanup, if the latter, then we
do.

This patch also updates the userland VMA tests to reflect the change.

Link: https://lore.kernel.org/20260421102150.189982-1-ljs@kernel.org
Fixes: ac0a3fc9c07d ("mm: add ability to take further action in vm_area_desc")
Signed-off-by: Lorenzo Stoakes <ljs@kernel.org>
Reported-by: syzbot+db390288d141a1dccf96@syzkaller.appspotmail.com
Closes: https://lore.kernel.org/all/69e69734.050a0220.24bfd3.0027.GAE@google.com/
Cc: David Hildenbrand <david@kernel.org>
Cc: Jann Horn <jannh@google.com>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Pedro Falcato <pfalcato@suse.de>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Lorenzo Stoakes <ljs@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 0ceba2c86d9c1030567ca38d804f46698a84a462..2d6d268a279872c2b10cb8aa52ce16f3faca6304 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -4080,7 +4080,7 @@ static inline void mmap_action_ioremap_full(struct vm_area_desc *desc,
 
 int mmap_action_prepare(struct vm_area_desc *desc);
 int mmap_action_complete(struct vm_area_struct *vma,
-                        struct mmap_action *action);
+                        struct mmap_action *action, bool is_compat);
 
 /* Look up the first VMA which exactly match the interval vm_start ... vm_end */
 static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,

diff --git a/mm/util.c b/mm/util.c
index e2a51e3cfb2494d18d6cf7479ba42583bcf53b61..a14de66c945827db6ae3662fd684662866cbbb1d 100644 (file)
--- a/mm/util.c
+++ b/mm/util.c
@@ -1186,7 +1186,8 @@ int compat_vma_mmap(struct file *file, struct vm_area_struct *vma)
                return err;
 
        set_vma_from_desc(vma, &desc);
-       err = mmap_action_complete(vma, &desc.action);
+       err = mmap_action_complete(vma, &desc.action,
+                                  /*is_compat=*/true);
        if (err) {
                const size_t len = vma_pages(vma) << PAGE_SHIFT;
 
@@ -1277,28 +1278,31 @@ again:
 }
 
 static int mmap_action_finish(struct vm_area_struct *vma,
-                             struct mmap_action *action, int err)
+                             struct mmap_action *action, int err,
+                             bool is_compat)
 {
+       if (!err && action->success_hook)
+               err = action->success_hook(vma);
+
+       /*
+        * If this is invoked from the compatibility layer, post-mmap() hook
+        * logic will handle cleanup for us.
+        */
+       if (!err || is_compat)
+               return err;
+
        /*
         * If an error occurs, unmap the VMA altogether and return an error. We
         * only clear the newly allocated VMA, since this function is only
         * invoked if we do NOT merge, so we only clean up the VMA we created.
         */
-       if (err) {
-               if (action->error_hook) {
-                       /* We may want to filter the error. */
-                       err = action->error_hook(err);
-
-                       /* The caller should not clear the error. */
-                       VM_WARN_ON_ONCE(!err);
-               }
-               return err;
+       if (action->error_hook) {
+               /* We may want to filter the error. */
+               err = action->error_hook(err);
+               /* The caller should not clear the error. */
+               VM_WARN_ON_ONCE(!err);
        }
-
-       if (action->success_hook)
-               return action->success_hook(vma);
-
-       return 0;
+       return err;
 }
 
 #ifdef CONFIG_MMU
@@ -1329,14 +1333,16 @@ EXPORT_SYMBOL(mmap_action_prepare);
  * mmap_action_complete - Execute VMA descriptor action.
  * @vma: The VMA to perform the action upon.
  * @action: The action to perform.
+ * @is_compat: Is this being invoked from the compatibility layer?
  *
  * Similar to mmap_action_prepare().
  *
- * Return: 0 on success, or error, at which point the VMA will be unmapped.
+ * Return: 0 on success, or error, at which point the VMA will be unmapped if
+ * !@is_compat.
  */
 int mmap_action_complete(struct vm_area_struct *vma,
-                        struct mmap_action *action)
-
+                        struct mmap_action *action,
+                        bool is_compat)
 {
        int err = 0;
 
@@ -1353,7 +1359,7 @@ int mmap_action_complete(struct vm_area_struct *vma,
                break;
        }
 
-       return mmap_action_finish(vma, action, err);
+       return mmap_action_finish(vma, action, err, is_compat);
 }
 EXPORT_SYMBOL(mmap_action_complete);
 #else
@@ -1373,7 +1379,8 @@ int mmap_action_prepare(struct vm_area_desc *desc)
 EXPORT_SYMBOL(mmap_action_prepare);
 
 int mmap_action_complete(struct vm_area_struct *vma,
-                        struct mmap_action *action)
+                        struct mmap_action *action,
+                        bool is_compat)
 {
        int err = 0;
 
@@ -1388,7 +1395,7 @@ int mmap_action_complete(struct vm_area_struct *vma,
                break;
        }
 
-       return mmap_action_finish(vma, action, err);
+       return mmap_action_finish(vma, action, err, is_compat);
 }
 EXPORT_SYMBOL(mmap_action_complete);
 #endif

diff --git a/mm/vma.c b/mm/vma.c
index 30e8a2d254b87b8c75ebc9ddc63af142ad29eb1a..5cd80cdcf82fa26574101226f3af738863265e13 100644 (file)
--- a/mm/vma.c
+++ b/mm/vma.c
@@ -2708,7 +2708,7 @@ static int call_action_complete(struct mmap_state *map,
 {
        int err;
 
-       err = mmap_action_complete(vma, action);
+       err = mmap_action_complete(vma, action, /*is_compat=*/false);
 
        /* If we held the file rmap we need to release it. */
        if (map->hold_file_rmap_lock) {
@@ -2778,7 +2778,6 @@ static unsigned long __mmap_region(struct file *file, unsigned long addr,
 
        if (have_mmap_prepare && allocated_new) {
                error = call_action_complete(&map, &desc.action, vma);
-
                if (error)
                        return error;
        }

diff --git a/tools/testing/vma/include/dup.h b/tools/testing/vma/include/dup.h
index 6299c76c3b7dbad06d5cf9be4d8680300d5a5ef1..79d34f4482171352b53649fa43637c89e9ef60fe 100644 (file)
--- a/tools/testing/vma/include/dup.h
+++ b/tools/testing/vma/include/dup.h
@@ -1071,8 +1071,17 @@ static inline void vma_set_anonymous(struct vm_area_struct *vma)
 static inline void set_vma_from_desc(struct vm_area_struct *vma,
                struct vm_area_desc *desc);
 
-static inline int __compat_vma_mmap(const struct file_operations *f_op,
-               struct file *file, struct vm_area_struct *vma)
+static inline unsigned long vma_pages(struct vm_area_struct *vma)
+{
+       return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
+}
+
+static inline int vfs_mmap_prepare(struct file *file, struct vm_area_desc *desc)
+{
+       return file->f_op->mmap_prepare(desc);
+}
+
+static inline int compat_vma_mmap(struct file *file, struct vm_area_struct *vma)
 {
        struct vm_area_desc desc = {
                .mm = vma->vm_mm,
@@ -1082,14 +1091,14 @@ static inline int __compat_vma_mmap(const struct file_operations *f_op,
 
                .pgoff = vma->vm_pgoff,
                .vm_file = vma->vm_file,
-               .vm_flags = vma->vm_flags,
+               .vma_flags = vma->flags,
                .page_prot = vma->vm_page_prot,
 
                .action.type = MMAP_NOTHING, /* Default */
        };
        int err;
 
-       err = f_op->mmap_prepare(&desc);
+       err = vfs_mmap_prepare(file, &desc);
        if (err)
                return err;
 
@@ -1098,27 +1107,22 @@ static inline int __compat_vma_mmap(const struct file_operations *f_op,
                return err;
 
        set_vma_from_desc(vma, &desc);
-       return mmap_action_complete(vma, &desc.action);
-}
+       err = mmap_action_complete(vma, &desc.action,
+                                  /*is_compat=*/true);
+       if (err) {
+               const size_t len = vma_pages(vma) << PAGE_SHIFT;
 
-static inline int compat_vma_mmap(struct file *file,
-               struct vm_area_struct *vma)
-{
-       return __compat_vma_mmap(file->f_op, file, vma);
+               do_munmap(current->mm, vma->vm_start, len, NULL);
+       }
+       return err;
 }
 
-
 static inline void vma_iter_init(struct vma_iterator *vmi,
                struct mm_struct *mm, unsigned long addr)
 {
        mas_init(&vmi->mas, &mm->mm_mt, addr);
 }
 
-static inline unsigned long vma_pages(struct vm_area_struct *vma)
-{
-       return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
-}
-
 static inline void mmap_assert_locked(struct mm_struct *);
 static inline struct vm_area_struct *find_vma_intersection(struct mm_struct *mm,
                                                unsigned long start_addr,
@@ -1309,11 +1313,6 @@ static inline int vfs_mmap(struct file *file, struct vm_area_struct *vma)
        return file->f_op->mmap(file, vma);
 }
 
-static inline int vfs_mmap_prepare(struct file *file, struct vm_area_desc *desc)
-{
-       return file->f_op->mmap_prepare(desc);
-}
-
 static inline void vma_set_file(struct vm_area_struct *vma, struct file *file)
 {
        /* Changing an anonymous vma with this is illegal */

diff --git a/tools/testing/vma/include/stubs.h b/tools/testing/vma/include/stubs.h
index 11192a6c697829c9ba7ae8510c1b2be670c69894..c56d96979d4d2133bd32452c07e7568a741be48d 100644 (file)
--- a/tools/testing/vma/include/stubs.h
+++ b/tools/testing/vma/include/stubs.h
@@ -87,7 +87,8 @@ static inline int mmap_action_prepare(struct vm_area_desc *desc)
 }
 
 static inline int mmap_action_complete(struct vm_area_struct *vma,
-                                      struct mmap_action *action)
+                                      struct mmap_action *action,
+                                      bool is_compat)
 {
        return 0;
 }