[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: ea7e2d5e49c05e5db1922387b09ca74aa40f46e2
WARNING: Author mismatch between patch and upstream commit: Backport author: bin.lan.cn@eng.windriver.com Commit author: Shu Han ebpqwerty472123@gmail.com
Status in newer kernel trees: 6.12.y | Present (exact SHA1) 6.6.y | Present (different SHA1: 49d3a4ad57c5) 6.1.y | Not found
Note: The patch differs from the upstream commit: --- 1: ea7e2d5e49c05 ! 1: 6fdcac73c2ec9 mm: call the security_mmap_file() LSM hook in remap_file_pages() @@ Metadata ## Commit message ## mm: call the security_mmap_file() LSM hook in remap_file_pages()
+ [ Upstream commit ea7e2d5e49c05e5db1922387b09ca74aa40f46e2 ] + The remap_file_pages syscall handler calls do_mmap() directly, which doesn't contain the LSM security check. And if the process has called personality(READ_IMPLIES_EXEC) before and remap_file_pages() is called for @@ Commit message Acked-by: Stephen Smalley stephen.smalley.work@gmail.com [PM: subject line tweaks] Signed-off-by: Paul Moore paul@paul-moore.com + [ Resolve merge conflict in mm/mmap.c. ] + Signed-off-by: Bin Lan bin.lan.cn@windriver.com
## mm/mmap.c ## @@ mm/mmap.c: SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, @@ mm/mmap.c: SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long + if (ret) + goto out_fput; ret = do_mmap(vma->vm_file, start, size, - prot, flags, 0, pgoff, &populate, NULL); + prot, flags, pgoff, &populate, NULL); +out_fput: fput(file); out: ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.1.y | Success | Success |