Skip to content

Commit 786d52a

Browse files
committed
binfmt_elf_fdpic-fix-proc-pid-auxv-checkpatch-fixes
WARNING: braces {} are not necessary for single statement blocks torvalds#122: FILE: fs/binfmt_elf_fdpic.c:651: + if (bprm->have_execfd) { + NEW_AUX_ENT(AT_EXECFD, bprm->execfd); + } Cc: Al Viro <[email protected]> Cc: Christian Brauner <[email protected]> Cc: Eric Biederman <[email protected]> Cc: Jan Kara <[email protected]> Cc: Kees Cook <[email protected]> Cc: Max Filippov <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 2626676 commit 786d52a

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

fs/binfmt_elf_fdpic.c

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -640,17 +640,12 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,
640640
NEW_AUX_ENT(AT_EGID, (elf_addr_t) from_kgid_munged(cred->user_ns, cred->egid));
641641
NEW_AUX_ENT(AT_SECURE, bprm->secureexec);
642642
NEW_AUX_ENT(AT_EXECFN, bprm->exec);
643-
if (k_platform) {
644-
NEW_AUX_ENT(AT_PLATFORM,
645-
(elf_addr_t)(unsigned long)u_platform);
646-
}
647-
if (k_base_platform) {
648-
NEW_AUX_ENT(AT_BASE_PLATFORM,
649-
(elf_addr_t)(unsigned long)u_base_platform);
650-
}
651-
if (bprm->have_execfd) {
643+
if (k_platform)
644+
NEW_AUX_ENT(AT_PLATFORM, (elf_addr_t)(unsigned long)u_platform);
645+
if (k_base_platform)
646+
NEW_AUX_ENT(AT_BASE_PLATFORM, (elf_addr_t)(unsigned long)u_base_platform);
647+
if (bprm->have_execfd)
652648
NEW_AUX_ENT(AT_EXECFD, bprm->execfd);
653-
}
654649
#undef NEW_AUX_ENT
655650
/* AT_NULL is zero; clear the rest too */
656651
memset(elf_info, 0, (char *)mm->saved_auxv +

0 commit comments

Comments
 (0)