shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

binfmt: Fix whitespace issues

Browse Source 
[ Upstream commit 8f6e3f9e5a ]

Fix the annoying whitespace issues that have been following these files
around for years.

Cc: linux-fsdevel@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Christian Brauner (Microsoft) <brauner@kernel.org>
Link: https://lore.kernel.org/r/20221018071350.never.230-kees@kernel.org
Stable-dep-of: 11854fe263eb ("binfmt_elf: Move brk for static PIE even if ASLR disabled")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Kees Cook
2022-10-18 00:14:20 -07:00
committed by Greg Kroah-Hartman
parent 325285d9fc
commit e20878d4eb
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/binfmt_elf.c
View File

@@ -2296,7 +2296,7 @@ static int elf_core_dump(struct coredump_params *cprm)
if (!elf_core_write_extra_phdrs(cprm, offset)) if (!elf_core_write_extra_phdrs(cprm, offset))
goto end_coredump; goto end_coredump;
/* write out the notes section */ /* write out the notes section */
if (!write_note_info(&info, cprm)) if (!write_note_info(&info, cprm))
goto end_coredump; goto end_coredump;

2
fs/binfmt_elf_fdpic.c
View File

@@ -1603,7 +1603,7 @@ static int elf_fdpic_core_dump(struct coredump_params *cprm)
if (!elf_core_write_extra_phdrs(cprm, offset)) if (!elf_core_write_extra_phdrs(cprm, offset))
goto end_coredump; goto end_coredump;
/* write out the notes section */ /* write out the notes section */
if (!writenote(thread_list->notes, cprm)) if (!writenote(thread_list->notes, cprm))
goto end_coredump; goto end_coredump;
if (!writenote(&psinfo_note, cprm)) if (!writenote(&psinfo_note, cprm))

2
fs/exec.c
View File

@@ -169,7 +169,7 @@ SYSCALL_DEFINE1(uselib, const char __user *, library)
exit: exit:
fput(file); fput(file);
out: out:
return error; return error;
} }
#endif /* #ifdef CONFIG_USELIB */ #endif /* #ifdef CONFIG_USELIB */

2
include/uapi/linux/elf.h
View File

@@ -91,7 +91,7 @@ typedef __s64 Elf64_Sxword;
#define DT_INIT 12 #define DT_INIT 12
#define DT_FINI 13 #define DT_FINI 13
#define DT_SONAME 14 #define DT_SONAME 14
#define DT_RPATH 15 #define DT_RPATH 15
#define DT_SYMBOLIC 16 #define DT_SYMBOLIC 16
#define DT_REL 17 #define DT_REL 17
#define DT_RELSZ 18 #define DT_RELSZ 18