Skip to content

Commit 8f6e3f9

Browse files
committed
binfmt: Fix whitespace issues
Fix the annoying whitespace issues that have been following these files around for years. Cc: [email protected] Signed-off-by: Kees Cook <[email protected]> Acked-by: Christian Brauner (Microsoft) <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 275498a commit 8f6e3f9

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

fs/binfmt_elf.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ create_elf_tables(struct linux_binprm *bprm, const struct elfhdr *exec,
248248
} while (0)
249249

250250
#ifdef ARCH_DLINFO
251-
/*
251+
/*
252252
* ARCH_DLINFO must come first so PPC can do its special alignment of
253253
* AUXV.
254254
* update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT() in
@@ -1020,7 +1020,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
10201020
executable_stack);
10211021
if (retval < 0)
10221022
goto out_free_dentry;
1023-
1023+
10241024
elf_bss = 0;
10251025
elf_brk = 0;
10261026

@@ -1043,7 +1043,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
10431043

10441044
if (unlikely (elf_brk > elf_bss)) {
10451045
unsigned long nbyte;
1046-
1046+
10471047
/* There was a PT_LOAD segment with p_memsz > p_filesz
10481048
before this one. Map anonymous pages, if needed,
10491049
and clear the area. */
@@ -1521,7 +1521,7 @@ static void fill_elf_note_phdr(struct elf_phdr *phdr, int sz, loff_t offset)
15211521
phdr->p_align = 0;
15221522
}
15231523

1524-
static void fill_note(struct memelfnote *note, const char *name, int type,
1524+
static void fill_note(struct memelfnote *note, const char *name, int type,
15251525
unsigned int sz, void *data)
15261526
{
15271527
note->name = name;
@@ -2004,8 +2004,8 @@ static int elf_dump_thread_status(long signr, struct elf_thread_status *t)
20042004
t->num_notes = 0;
20052005

20062006
fill_prstatus(&t->prstatus.common, p, signr);
2007-
elf_core_copy_task_regs(p, &t->prstatus.pr_reg);
2008-
2007+
elf_core_copy_task_regs(p, &t->prstatus.pr_reg);
2008+
20092009
fill_note(&t->notes[0], "CORE", NT_PRSTATUS, sizeof(t->prstatus),
20102010
&(t->prstatus));
20112011
t->num_notes++;
@@ -2295,7 +2295,7 @@ static int elf_core_dump(struct coredump_params *cprm)
22952295
if (!elf_core_write_extra_phdrs(cprm, offset))
22962296
goto end_coredump;
22972297

2298-
/* write out the notes section */
2298+
/* write out the notes section */
22992299
if (!write_note_info(&info, cprm))
23002300
goto end_coredump;
23012301

fs/binfmt_elf_fdpic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1603,7 +1603,7 @@ static int elf_fdpic_core_dump(struct coredump_params *cprm)
16031603
if (!elf_core_write_extra_phdrs(cprm, offset))
16041604
goto end_coredump;
16051605

1606-
/* write out the notes section */
1606+
/* write out the notes section */
16071607
if (!writenote(thread_list->notes, cprm))
16081608
goto end_coredump;
16091609
if (!writenote(&psinfo_note, cprm))

fs/exec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ SYSCALL_DEFINE1(uselib, const char __user *, library)
172172
exit:
173173
fput(file);
174174
out:
175-
return error;
175+
return error;
176176
}
177177
#endif /* #ifdef CONFIG_USELIB */
178178

include/uapi/linux/elf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ typedef __s64 Elf64_Sxword;
9191
#define DT_INIT 12
9292
#define DT_FINI 13
9393
#define DT_SONAME 14
94-
#define DT_RPATH 15
94+
#define DT_RPATH 15
9595
#define DT_SYMBOLIC 16
9696
#define DT_REL 17
9797
#define DT_RELSZ 18

0 commit comments

Comments
 (0)