Skip to content

fix error handling in mmap_region() and refactor (hotfixes)

Lorenzo Stoakes linux-mm lkml stable 1 version Applied

Status from this message: This is a note to let you know that I've just added the patch titled

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest4 patches 5 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/4mm: avoid unsafe VMA hook invocation when error arises on mmap hookmm/internal.h mm/mmap.c mm/nommu.c +1 more+34 -41 reply
2/4mm: unconditionally close VMAs on errormm/internal.h mm/mmap.c mm/nommu.c +1 more+26 -81 reply
3/4mm: refactor arch_calc_vm_flag_bits() and arm64 MTE handlingarch/arm64/include/asm/mman.h include/linux/mman.h mm/mmap.c +2 more+13 -111 reply
4/4mm: resolve faulty mmap_region() error path behaviourmm/mmap.c+45 -241 reply

Reviews trailers per patch

All 4 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchLiam R. HowlettVlastimil BabkaJann HornMark BrownCatalin Marinas
SeriesR-b
1/4R-b R-b R-b R-b R-b R-b
2/4R-b R-b R-b R-b R-b R-b
3/4R-b R-b R-b R-b
4/4R-b R-b R-b R-b T-b T-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 5 reviewers.

Read the v1 thread

Cover letter [PATCH 5.10.y 0/4] fix error handling in mmap_region() and refactor (hotfixes)

Critical fixes for mmap_region(), backported to 5.10.y.

Some notes on differences from upstream:

* We do NOT take commit 0fb4a7ad270b ("mm: refactor map_deny_write_exec()"), as this refactors code only introduced in 6.2.

* We make reference in "mm: refactor arch_calc_vm_flag_bits() and arm64 MTE handling" to parisc, but the referenced functionality does not exist in this kernel.

* In this kernel is_shared_maywrite() does not exist and the code uses VM_SHARED to determine whether mapping_map_writable() / mapping_unmap_writable() should be invoked. This backport therefore follows suit.

* The vma_dummy_vm_ops static global doesn't exist in this kernel, so we use a local static variable in mmap_file() and vma_close().

* Each version of these series is confronted by a slightly different mmap_region(), so we must adapt the change for each stable version. The approach remains the same throughout, however, and we correctly avoid closing the VMA part way through any __mmap_region() operation.

* In 5.10 we must handle VM_DENYWRITE. Since this is done at the top of the file-backed VMA handling logic, and importantly before mmap_file() invocation, this does not imply any additional difficult error handling on partial completion of mapping so has no significant impact.

Lorenzo Stoakes (4):
mm: avoid unsafe VMA hook invocation when error arises on mmap hook
mm: unconditionally close VMAs on error
mm: refactor arch_calc_vm_flag_bits() and arm64 MTE handling
mm: resolve faulty mmap_region() error path behaviour

 arch/arm64/include/asm/mman.h | 10 +++--
 include/linux/mman.h          |  7 +--
 mm/internal.h                 | 19 ++++++++
 mm/mmap.c                     | 82 +++++++++++++++++++++--------------
 mm/nommu.c                    |  9 ++--
 mm/shmem.c                    |  3 --
 mm/util.c                     | 33 ++++++++++++++
 7 files changed, 117 insertions(+), 46 deletions(-)

--
2.47.0