Skip to content

Commit cc9554e

Browse files
Jongykees
authored andcommitted
binfmt: Remove loader from linux_binprm struct
Commit 987f20a ("a.out: Remove the a.out implementation") removed the last in-tree user of the loader field, and as far as I can tell, it was the only one historically. Signed-off-by: Yonatan Goldschmidt <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Kees Cook <[email protected]>
1 parent 7e620b5 commit cc9554e

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

fs/exec.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -755,8 +755,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
755755
mm->arg_start = bprm->p;
756756
#endif
757757

758-
if (bprm->loader)
759-
bprm->loader -= stack_shift;
760758
bprm->exec -= stack_shift;
761759

762760
if (mmap_write_lock_killable(mm))

include/linux/binfmts.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ struct linux_binprm {
6464
const char *fdpath; /* generated filename for execveat */
6565
unsigned interp_flags;
6666
int execfd; /* File descriptor of the executable */
67-
unsigned long loader, exec;
67+
unsigned long exec;
6868

6969
struct rlimit rlim_stack; /* Saved RLIMIT_STACK used during exec. */
7070

0 commit comments

Comments
 (0)