mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Oleg Keri <okerixx@gmail.com>
To: Lorenzo Stoakes <ljs@kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>
Cc: "Liam R . Howlett" <liam@infradead.org>,
	Vlastimil Babka <vbabka@kernel.org>, Jann Horn <jannh@google.com>,
	Pedro Falcato <pfalcato@suse.de>,
	linux-mm@kvack.org, linux-kernel@vger.kernel.org,
	Oleg Keri <okerixx@gmail.com>
Subject: [PATCH v2] mm/vma: keep the unlinked VMA off the file across unmap on mmap hook failure
Date: Wed,  7 Oct 2026 21:47:08 +0200	[thread overview]
Message-ID: <20261007194708.2009-1-okerixx@gmail.com> (raw)
In-Reply-To: <20261007101800.58d50b1b20a10738e630bfd5@linux-foundation.org>

Since commit 2ceb21171dd9 ("mm: consistently validate VMA state after
mmap[_prepare] hooks"), the mmap error path clears vma->vm_file only
after unmap_region(), so free_pgtables() unlinks the never-linked VMA
and drops i_mmap_writable. Once it goes negative, every later shared
writable mmap of that file fails with -EPERM until reboot.

Clear vm_file across unmap_region() only, so that free_pgtables() does
not unlink a VMA that was never linked to the file, and restore it for
vma_close(): when the hook succeeded and the validation failed, the
driver's close() still runs and may use vma->vm_file.

Fixes: 2ceb21171dd9 ("mm: consistently validate VMA state after mmap[_prepare] hooks")
Signed-off-by: Oleg Keri <okerixx@gmail.com>
---
v2: keep vm_file for vma_close(): with the hook succeeded and the
validation failed the driver's close() still runs. Reported by Sashiko
via Andrew.

Seen on next-20261006: one refused PCM mmap probe from alsa-lib left the
device unmappable, so PipeWire could not play anything.

 mm/vma.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mm/vma.c b/mm/vma.c
index dfa45c64222c..531e4f53fdd7 100644
--- a/mm/vma.c
+++ b/mm/vma.c
@@ -2616,12 +2616,15 @@ static int __mmap_new_file_vma(struct mmap_state *map,
 	map->vm_file = vma->vm_file;
 
 	if (error) {
+		struct file *file = vma->vm_file;
 		UNMAP_STATE(unmap, vmi, vma, vma->vm_start, vma->vm_end,
 			    map->prev, map->next);
 
+		vma->vm_file = NULL;
 		vma_iter_set(vmi, vma->vm_end);
 		/* Undo any partial mapping done by a device driver. */
 		unmap_region(&unmap);
+		vma->vm_file = file;
 		/* Only safe once unmapped. */
 		vma_close(vma);
 
-- 
2.55.0


  reply	other threads:[~2026-10-07 19:47 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-03 16:32 [PATCH v4 00/38] mm: make VMA flag semantics explicit, eliminate VM_SPECIAL Lorenzo Stoakes (ARM)
2026-10-03 16:32 ` [PATCH v4 01/38] mm/vma: fix mmap_prepare file handling, remove file_doesnt_need_get Lorenzo Stoakes (ARM)
2026-10-04 17:10   ` Suren Baghdasaryan
2026-10-03 16:32 ` [PATCH v4 02/38] mm/vma: introduce and use vma_[flags_]can_merge() Lorenzo Stoakes (ARM)
2026-10-03 16:32 ` [PATCH v4 03/38] mm: consistently validate VMA state after mmap[_prepare] hooks Lorenzo Stoakes (ARM)
2026-10-07  7:09   ` [PATCH] mm/vma: clear vm_file before unmap on mmap hook failure Oleg Keri
2026-10-07 17:18     ` Andrew Morton
2026-10-07 19:47       ` Oleg Keri [this message]
2026-10-07 21:53         ` [PATCH v2] mm/vma: keep the unlinked VMA off the file across " Andrew Morton
2026-10-08  0:55           ` Bert Karwatzki
2026-10-03 16:32 ` [PATCH v4 04/38] mm/vma: ensure mmap_prepare doesn't set actions on a mergeable vma Lorenzo Stoakes (ARM)
2026-10-03 16:32 ` [PATCH v4 05/38] mm: make map_kernel_pages_[prepare,complete] internal and unexported Lorenzo Stoakes (ARM)
2026-10-03 16:32 ` [PATCH v4 06/38] mm/vma: tidy up map kernel pages enum values Lorenzo Stoakes (ARM)
2026-10-03 16:32 ` [PATCH v4 07/38] mm: add mmap action for discontiguous kernel page mapping Lorenzo Stoakes (ARM)
2026-10-04 17:11   ` Suren Baghdasaryan
2026-10-03 16:32 ` [PATCH v4 08/38] docs: filesystems: update mmap_prepare docs for discontig kernel pgs Lorenzo Stoakes (ARM)
2026-10-04 17:13   ` Suren Baghdasaryan
2026-10-03 16:32 ` [PATCH v4 09/38] drivers/usb/mon: update to use mmap_prepare + map kernel pages Lorenzo Stoakes (ARM)
2026-10-04 17:18   ` Suren Baghdasaryan
2026-10-03 16:32 ` [PATCH v4 10/38] infiniband: update hfi1 to use remap_vmalloc_range() Lorenzo Stoakes (ARM)
2026-10-03 16:32 ` [PATCH v4 11/38] selinux: reject writable opens of policy file, drop mmap shared/write check Lorenzo Stoakes (ARM)
2026-10-04 17:19   ` Suren Baghdasaryan
2026-10-03 16:32 ` [PATCH v4 12/38] ALSA: pcm: use vm_insert_page() to map PCM status page Lorenzo Stoakes (ARM)
2026-10-04 17:22   ` Suren Baghdasaryan
2026-10-03 16:32 ` [PATCH v4 13/38] bpf: arena: mark arena_map_mmap() mappings VM_MIXEDMAP Lorenzo Stoakes (ARM)
2026-10-04 17:24   ` Suren Baghdasaryan
2026-10-03 16:32 ` [PATCH v4 14/38] mm/vma: add vma[_flags]_is_mm_managed() predicates Lorenzo Stoakes (ARM)
2026-10-04 17:43   ` Suren Baghdasaryan
2026-10-03 16:32 ` [PATCH v4 15/38] mm/vma: only allow mmap to clear VMA_MAYWRITE_BIT if not mm-managed Lorenzo Stoakes (ARM)
2026-10-03 16:32 ` [PATCH v4 16/38] mm/vma: add and use vma_[flags]_is_fixed_mapping Lorenzo Stoakes (ARM)
2026-10-04 17:52   ` Suren Baghdasaryan
2026-10-03 16:32 ` [PATCH v4 17/38] scsi: sg: convert mmap hook to mmap_prepare and rework Lorenzo Stoakes (ARM)
2026-10-04 17:54   ` Suren Baghdasaryan
2026-10-03 16:32 ` [PATCH v4 18/38] fbdev: defio: assert FBINFO_VIRTFB, drop VM_IO, add VM_MIXEDMAP Lorenzo Stoakes (ARM)
2026-10-04 18:02   ` Suren Baghdasaryan
2026-10-03 16:32 ` [PATCH v4 19/38] HSI: cmt_speech: convert mmap hook to mmap_prepare, refactor Lorenzo Stoakes (ARM)
2026-10-04 18:09   ` Suren Baghdasaryan
2026-10-03 16:32 ` [PATCH v4 20/38] mm/gup: error out early on !VMA_MAYREAD_BIT VMAs Lorenzo Stoakes (ARM)
2026-10-04 18:24   ` Suren Baghdasaryan
2026-10-03 16:32 ` [PATCH v4 21/38] uprobes: remove VM_IO, set VM_MIXEDMAP for mapped kernel pages Lorenzo Stoakes (ARM)
2026-10-04 18:39   ` Suren Baghdasaryan
2026-10-03 16:32 ` [PATCH v4 22/38] mm/mlock: clear VMA_LOCKED_MASK over mmap callback Lorenzo Stoakes (ARM)
2026-10-03 16:32 ` [PATCH v4 23/38] mm/mlock: eliminate weird VMA_IO_BIT abuse and simplify Lorenzo Stoakes (ARM)
2026-10-03 16:32 ` [PATCH v4 24/38] mm/vma: enforce that mm-managed mappings may not set VMA_IO_BIT Lorenzo Stoakes (ARM)
2026-10-03 16:32 ` [PATCH v4 25/38] mm: remove VMA_IO_BIT check in vma[_flags]_is_mm_managed() Lorenzo Stoakes (ARM)
2026-10-03 16:32 ` [PATCH v4 26/38] mm: remove hugetlb_inline.h Lorenzo Stoakes (ARM)
2026-10-03 16:32 ` [PATCH v4 27/38] mm: rename is_vm_hugetlb_page() to vma_is_hugetlb() Lorenzo Stoakes (ARM)
2026-10-03 16:32 ` [PATCH v4 28/38] mm: drop some redundant checks around hugetlb VMAs Lorenzo Stoakes (ARM)
2026-10-03 16:33 ` [PATCH v4 29/38] mm/madvise: update is_valid_guard_vma() to use vma_can_merge() Lorenzo Stoakes (ARM)
2026-10-03 16:33 ` [PATCH v4 30/38] mm/vma: introduce vma[_flags]_is_mm_backed() Lorenzo Stoakes (ARM)
2026-10-03 16:33 ` [PATCH v4 31/38] mm/uffd: use predicates for userfaultfd checks Lorenzo Stoakes (ARM)
2026-10-03 16:33 ` [PATCH v4 32/38] mm/madvise: use predicates for madvise(..., MADV_DOFORK) Lorenzo Stoakes (ARM)
2026-10-03 16:33 ` [PATCH v4 33/38] mm: eliminate VMA_SPECIAL_FLAGS usage when hugetlb explicitly tested Lorenzo Stoakes (ARM)
2026-10-03 16:33 ` [PATCH v4 34/38] mm: eliminate VMA_SPECIAL_FLAGS check in lru_gen_look_around() Lorenzo Stoakes (ARM)
2026-10-03 16:33 ` [PATCH v4 35/38] mm: avoid use of VMA_SPECIAL_FLAGS in migrate_vma_setup() Lorenzo Stoakes (ARM)
2026-10-03 16:33 ` [PATCH v4 36/38] mm: eliminate VM_SPECIAL, VMA_SPECIAL_FLAGS Lorenzo Stoakes (ARM)
2026-10-03 16:33 ` [PATCH v4 37/38] fuse: dax: do not set VM_MIXEDMAP Lorenzo Stoakes (ARM)
2026-10-03 16:33 ` [PATCH v4 38/38] mm/huge_memory: remove vma_is_special_huge() Lorenzo Stoakes (ARM)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261007194708.2009-1-okerixx@gmail.com \
    --to=okerixx@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=jannh@google.com \
    --cc=liam@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=ljs@kernel.org \
    --cc=pfalcato@suse.de \
    --cc=vbabka@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®