The quilt patch titled
Subject: mm: deduplicate error handling for map_deny_write_exec
has been removed from the -mm tree. Its filename was
mm-deduplicate-error-handling-for-map_deny_write_exec.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Joey Gouly <joey.gouly@xxxxxxx>
Subject: mm: deduplicate error handling for map_deny_write_exec
Date: Wed, 8 Mar 2023 19:04:20 +0000
Patch series "Fixes for MDWE prctl"
These are four small fixes for the recent memory-write-deny-execute prctl
patches [1]. Two reported by Alexey about error handling and two tooling
fixes by Peter.
This patch (of 4):
Commit cc8d1b097de7 ("mmap: clean up mmap_region() unrolling")
deduplicated the error handling, do the same for the return value of
`map_deny_write_exec`.
Link: https://lkml.kernel.org/r/20230308190423.46491-1-joey.gouly@xxxxxxx
Link: https://lkml.kernel.org/r/20230308190423.46491-2-joey.gouly@xxxxxxx
Link: https://lore.kernel.org/linux-arm-kernel/20230119160344.54358-1-joey.gouly@xxxxxxx/ [1]
Fixes: b507808ebce2 ("mm: implement memory-deny-write-execute as a prctl")
Signed-off-by: Joey Gouly <joey.gouly@xxxxxxx>
Reported-by: Alexey Izbyshev <izbyshev@xxxxxxxxx>
Link: https://lore.kernel.org/linux-arm-kernel/8408d8901e9d7ee6b78db4c6cba04b78@xxxxxxxxx/
Reviewed-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: nd <nd@xxxxxxx>
Cc: Peter Xu <peterx@xxxxxxxxxx>
Cc: Shuah Khan <shuah@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
--- a/mm/mmap.c~mm-deduplicate-error-handling-for-map_deny_write_exec
+++ a/mm/mmap.c
@@ -2621,12 +2621,7 @@ cannot_expand:
if (map_deny_write_exec(vma, vma->vm_flags)) {
error = -EACCES;
- if (file)
- goto close_and_free_vma;
- else if (vma->vm_file)
- goto unmap_and_free_vma;
- else
- goto free_vma;
+ goto close_and_free_vma;
}
/* Allow architectures to sanity-check the vm_flags */
_
Patches currently in -mm which might be from joey.gouly@xxxxxxx are
