[PATCH] binfmt: Remove loader from linux_binprm struct

From: Yonatan Goldschmidt
Date: Sat Jan 11 2025 - 14:16:05 EST


Commit 987f20a9dcce ("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 <yon.goldschmidt@xxxxxxxxx>
---
Applies on e0daef7de1acec.

fs/exec.c | 2 --
include/linux/binfmts.h | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/fs/exec.c b/fs/exec.c
index 98cb7ba99..0e642f111 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -763,8 +763,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
mm->arg_start = bprm->p;
#endif

- if (bprm->loader)
- bprm->loader -= stack_shift;
bprm->exec -= stack_shift;

if (mmap_write_lock_killable(mm))
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
index e6c00e860..3513e6fe7 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -57,7 +57,7 @@ struct linux_binprm {
const char *fdpath; /* generated filename for execveat */
unsigned interp_flags;
int execfd; /* File descriptor of the executable */
- unsigned long loader, exec;
+ unsigned long exec;

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

--
2.39.5 (Apple Git-154)