mm-vma-remove-__vma_check_mmap_hook.patch removed from -mm tree
The quilt patch titled
Subject: mm/vma: remove __vma_check_mmap_hook()
has been removed from the -mm tree. Its filename was
mm-vma-remove-__vma_check_mmap_hook.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Lorenzo Stoakes <[email protected]>
Subject: mm/vma: remove __vma_check_mmap_hook()
Date: Mon, 13 Apr 2026 11:57:13 +0100
Commit c50ca15dd496 ("mm: add vm_ops->mapped hook") introduced __vma_check_mmap_hook() in order to assert that a driver doesn't incorrectly implement both an f_op->mmap() and a vm_ops->mapped hook, the latter of which would not ultimately get invoked.
However, this did not correctly account for stacked drivers (or drivers that otherwise use the compatibility layer) which might recursively call an mmap_prepare hook via the compatibility layer.
Thus the nested mmap_prepare() invocation might result in a VMA which has vm_ops->mapped set with an overlaying mmap() hook, causing the __vma_check_mmap_hook() to fail in vfs_mmap(), wrongly failing the operation.
This patch resolves this by simply removing the check, as we can't be certain that an mmap() hook doesn't at some point invoke the compatibility layer, and it's not worth trying to track it.
---
include/linux/fs.h | 9 +-------- mm/util.c | 10 ---------- 2 files changed, 1 insertion(+), 18 deletions(-)
include/linux/fs.h renamed from include/linux/fs.h~mm-vma-remove-__vma_check_mmap_hook +1 -8
@@ -2062,20 +2062,13 @@ void compat_set_desc_from_vma(struct vm_ const struct vm_area_struct *vma);int __compat_vma_mmap (struct vm_area_desc *desc,struct vm_area_struct *vma);int compat_vma_mmap (struct file *file,struct vm_area_struct *vma); -int __vma_check_mmap_hook (struct vm_area_struct *vma);static inline int vfs_mmap (struct file *file,struct vm_area_struct *vma) { -int err; -if (file->f_op->mmap_prepare)return compat_vma_mmap (file, vma); - err = file->f_op->mmap (file, vma); -if (err) -return err; - -return __vma_check_mmap_hook (vma); +return file->f_op->mmap (file, vma); }static inline int vfs_mmap_prepare (struct file *file,struct vm_area_desc *desc)
mm/util.c renamed from mm/util.c~mm-vma-remove-__vma_check_mmap_hook +0 -10
@@ -1281,16 +1281,6 @@ int compat_vma_mmap(struct file *file, s }EXPORT_SYMBOL (compat_vma_mmap); -int __vma_check_mmap_hook (struct vm_area_struct *vma) -{ -/* vm_ops->mapped is not valid if mmap() is specified. */ -if (vma->vm_ops &&WARN_ON_ONCE (vma->vm_ops->mapped)) -return -EINVAL ; - -return 0 ; -} -EXPORT_SYMBOL (__vma_check_mmap_hook); -static void set_ps_flags (struct page_snapshot *ps,const struct folio *folio,const struct page *page) {
_
Patches currently in -mm which might be from [email protected] are