binfmt: Fix whitespace issues

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

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 6a11025..38a9496 100644 (file)
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -248,7 +248,7 @@ create_elf_tables(struct linux_binprm *bprm, const struct elfhdr *exec,
        } while (0)
 
 #ifdef ARCH_DLINFO
-       /* 
+       /*
         * ARCH_DLINFO must come first so PPC can do its special alignment of
         * AUXV.
         * update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT() in
@@ -1020,7 +1020,7 @@ out_free_interp:
                                 executable_stack);
        if (retval < 0)
                goto out_free_dentry;
-       
+
        elf_bss = 0;
        elf_brk = 0;
 
@@ -1043,7 +1043,7 @@ out_free_interp:
 
                if (unlikely (elf_brk > elf_bss)) {
                        unsigned long nbyte;
-                   
+
                        /* There was a PT_LOAD segment with p_memsz > p_filesz
                           before this one. Map anonymous pages, if needed,
                           and clear the area.  */
@@ -1521,7 +1521,7 @@ static void fill_elf_note_phdr(struct elf_phdr *phdr, int sz, loff_t offset)
        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)
 {
        note->name = name;
@@ -2004,8 +2004,8 @@ static int elf_dump_thread_status(long signr, struct elf_thread_status *t)
        t->num_notes = 0;
 
        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),
                  &(t->prstatus));
        t->num_notes++;
@@ -2295,7 +2295,7 @@ static int elf_core_dump(struct coredump_params *cprm)
        if (!elf_core_write_extra_phdrs(cprm, offset))
                goto end_coredump;
 
-       /* write out the notes section */
+       /* write out the notes section */
        if (!write_note_info(&info, cprm))
                goto end_coredump;
 

diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index 08d0c87..e90c119 100644 (file)
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -1603,7 +1603,7 @@ static int elf_fdpic_core_dump(struct coredump_params *cprm)
        if (!elf_core_write_extra_phdrs(cprm, offset))
                goto end_coredump;
 
-       /* write out the notes section */
+       /* write out the notes section */
        if (!writenote(thread_list->notes, cprm))
                goto end_coredump;
        if (!writenote(&psinfo_note, cprm))

diff --git a/fs/exec.c b/fs/exec.c
index b3e87bd..1644bf1 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -172,7 +172,7 @@ SYSCALL_DEFINE1(uselib, const char __user *, library)
 exit:
        fput(file);
 out:
-       return error;
+       return error;
 }
 #endif /* #ifdef CONFIG_USELIB */
 

diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
index 775a17b..4c6a8fa 100644 (file)
--- a/include/uapi/linux/elf.h
+++ b/include/uapi/linux/elf.h
@@ -91,7 +91,7 @@ typedef __s64 Elf64_Sxword;
 #define DT_INIT                12
 #define DT_FINI                13
 #define DT_SONAME      14
-#define DT_RPATH       15
+#define DT_RPATH       15
 #define DT_SYMBOLIC    16
 #define DT_REL         17
 #define DT_RELSZ       18