shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 02:21:52 +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

14
fs/binfmt_elf.c
View File

@@ -248,7 +248,7 @@ create_elf_tables(struct linux_binprm *bprm, const struct elfhdr *exec,
} while (0) } while (0)
#ifdef ARCH_DLINFO #ifdef ARCH_DLINFO
/* /*
* ARCH_DLINFO must come first so PPC can do its special alignment of * ARCH_DLINFO must come first so PPC can do its special alignment of
* AUXV. * AUXV.
* update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT() in * update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT() in
@@ -1021,7 +1021,7 @@ out_free_interp:
executable_stack); executable_stack);
if (retval < 0) if (retval < 0)
goto out_free_dentry; goto out_free_dentry;
elf_bss = 0; elf_bss = 0;
elf_brk = 0; elf_brk = 0;
@@ -1044,7 +1044,7 @@ out_free_interp:
if (unlikely (elf_brk > elf_bss)) { if (unlikely (elf_brk > elf_bss)) {
unsigned long nbyte; unsigned long nbyte;
/* There was a PT_LOAD segment with p_memsz > p_filesz /* There was a PT_LOAD segment with p_memsz > p_filesz
before this one. Map anonymous pages, if needed, before this one. Map anonymous pages, if needed,
and clear the area. */ and clear the area. */
@@ -1522,7 +1522,7 @@ static void fill_elf_note_phdr(struct elf_phdr *phdr, int sz, loff_t offset)
phdr->p_align = 0; phdr->p_align = 0;
} }
static void fill_note(struct memelfnote *note, const char *name, int type, static void fill_note(struct memelfnote *note, const char *name, int type,
unsigned int sz, void *data) unsigned int sz, void *data)
{ {
note->name = name; note->name = name;
@@ -2005,8 +2005,8 @@ static int elf_dump_thread_status(long signr, struct elf_thread_status *t)
t->num_notes = 0; t->num_notes = 0;
fill_prstatus(&t->prstatus.common, p, signr); fill_prstatus(&t->prstatus.common, p, signr);
elf_core_copy_task_regs(p, &t->prstatus.pr_reg); elf_core_copy_task_regs(p, &t->prstatus.pr_reg);
fill_note(&t->notes[0], "CORE", NT_PRSTATUS, sizeof(t->prstatus), fill_note(&t->notes[0], "CORE", NT_PRSTATUS, sizeof(t->prstatus),
&(t->prstatus)); &(t->prstatus));
t->num_notes++; t->num_notes++;
@@ -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