The quilt patch titled
Subject: binfmt_elf_fdpic-fix-proc-pid-auxv-checkpatch-fixes
has been removed from the -mm tree. Its filename was
binfmt_elf_fdpic-fix-proc-pid-auxv-checkpatch-fixes.patch
This patch was dropped because it was folded into binfmt_elf_fdpic-fix-proc-pid-auxv.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: binfmt_elf_fdpic-fix-proc-pid-auxv-checkpatch-fixes
Date: Mon Apr 22 03:02:28 PM PDT 2024
WARNING: braces {} are not necessary for single statement blocks
#122: FILE: fs/binfmt_elf_fdpic.c:651:
+ if (bprm->have_execfd) {
+ NEW_AUX_ENT(AT_EXECFD, bprm->execfd);
+ }
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Christian Brauner <brauner@xxxxxxxxxx>
Cc: Eric Biederman <ebiederm@xxxxxxxxxxxx>
Cc: Jan Kara <jack@xxxxxxx>
Cc: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: Max Filippov <jcmvbkbc@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/binfmt_elf_fdpic.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
--- a/fs/binfmt_elf_fdpic.c~binfmt_elf_fdpic-fix-proc-pid-auxv-checkpatch-fixes
+++ a/fs/binfmt_elf_fdpic.c
@@ -640,17 +640,12 @@ static int create_elf_fdpic_tables(struc
NEW_AUX_ENT(AT_EGID, (elf_addr_t) from_kgid_munged(cred->user_ns, cred->egid));
NEW_AUX_ENT(AT_SECURE, bprm->secureexec);
NEW_AUX_ENT(AT_EXECFN, bprm->exec);
- if (k_platform) {
- NEW_AUX_ENT(AT_PLATFORM,
- (elf_addr_t)(unsigned long)u_platform);
- }
- if (k_base_platform) {
- NEW_AUX_ENT(AT_BASE_PLATFORM,
- (elf_addr_t)(unsigned long)u_base_platform);
- }
- if (bprm->have_execfd) {
+ if (k_platform)
+ NEW_AUX_ENT(AT_PLATFORM, (elf_addr_t)(unsigned long)u_platform);
+ if (k_base_platform)
+ NEW_AUX_ENT(AT_BASE_PLATFORM, (elf_addr_t)(unsigned long)u_base_platform);
+ if (bprm->have_execfd)
NEW_AUX_ENT(AT_EXECFD, bprm->execfd);
- }
#undef NEW_AUX_ENT
/* AT_NULL is zero; clear the rest too */
memset(elf_info, 0, (char *)mm->saved_auxv +
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
arm-mm-drop-vm_fault_badmap-vm_fault_badaccess-checkpatch-fixes.patch
mm-hugetlb-rename-dissolve_free_huge_pages-to-dissolve_free_hugetlb_folios-fix.patch
doc-split-bufferrst-out-of-api-summaryrst-fix-fix.patch
__mod_memcg_lruvec_state-enhance-diagnostics.patch
__mod_memcg_lruvec_state-enhance-diagnostics-fix.patch
binfmt_elf_fdpic-fix-proc-pid-auxv.patch
