x86-mm-care-about-shadow-stack-guard-gap-during-placement.patch removed from -mm tree
The quilt patch titled
Subject: x86/mm: care about shadow stack guard gap during placement
has been removed from the -mm tree. Its filename was
x86-mm-care-about-shadow-stack-guard-gap-during-placement.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: Rick Edgecombe <[email protected]>
Subject: x86/mm: care about shadow stack guard gap during placement
Date: Mon, 25 Mar 2024 19:16:55 -0700
When memory is being placed, mmap() will take care to respect the guard gaps of certain types of memory (VM_SHADOWSTACK, VM_GROWSUP and VM_GROWSDOWN). In order to ensure guard gaps between mappings, mmap() needs to consider two things:
1. That the new mapping isn't placed in an any existing mappings guard gaps.
2. That the new mapping isn't placed such that any existing mappings are not in *its* guard gaps.
The longstanding behavior of mmap() is to ensure 1, but not take any care around 2. So for example, if there is a PAGE_SIZE free area, and a mmap() with a PAGE_SIZE size, and a type that has a guard gap is being placed, mmap() may place the shadow stack in the PAGE_SIZE free area. Then the mapping that is supposed to have a guard gap will not have a gap to the adjacent VMA.
Now that the vm_flags is passed into the arch get_unmapped_area()'s, and vm_unmapped_area() is ready to consider it, have VM_SHADOW_STACK's get guard gap consideration for scenario 2.
---
arch/x86/kernel/sys_x86_64.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/x86/kernel/sys_x86_64.c renamed from arch/x86/kernel/sys_x86_64.c~x86-mm-care-about-shadow-stack-guard-gap-during-placement +10 -0
@@ -112,6 +112,14 @@ static void find_start_end(unsigned long *end =task_size_64bit (addr >DEFAULT_MAP_WINDOW ); } +static inline unsigned long stack_guard_placement (vm_flags_t vm_flags) +{ +if (vm_flags &VM_SHADOW_STACK ) +return PAGE_SIZE ; + +return 0 ; +} +unsigned long arch_get_unmapped_area_vmflags (struct file *filp,unsigned long addr,unsigned long len,unsigned long pgoff,unsigned long flags,vm_flags_t vm_flags)
@@ -141,6 +149,7 @@ arch_get_unmapped_area_vmflags(struct fi info.low_limit = begin; info.high_limit = end; info.align_offset = pgoff <<PAGE_SHIFT ; + info.start_gap =stack_guard_placement (vm_flags);if (filp) { info.align_mask =get_align_mask (); info.align_offset +=get_align_bits ();
@@ -190,6 +199,7 @@ get_unmapped_area: info.low_limit =PAGE_SIZE ; info.high_limit =get_mmap_base (0 ); + info.start_gap =stack_guard_placement (vm_flags);/* * If hint address is above DEFAULT_MAP_WINDOW, look for unmapped area
_
Patches currently in -mm which might be from [email protected] are