aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorYonatan Goldschmidt <yon.goldschmidt@gmail.com>2025-02-24 00:32:34 +0200
committerKees Cook <kees@kernel.org>2025-02-24 11:30:16 -0800
commitcc9554e662a3b5a13f514cfcced54ac263c07094 (patch)
treec59c69f9138dca52ec9b30d959d74a2654dc9b19
parentcrash: Remove KEXEC_CORE_NOTE_NAME (diff)
downloadwireguard-linux-cc9554e662a3b5a13f514cfcced54ac263c07094.tar.xz
wireguard-linux-cc9554e662a3b5a13f514cfcced54ac263c07094.zip
binfmt: Remove loader from linux_binprm struct
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@gmail.com> Link: https://lore.kernel.org/r/20250223223234.13764-1-yon.goldschmidt@gmail.com Signed-off-by: Kees Cook <kees@kernel.org>
-rw-r--r--fs/exec.c2
-rw-r--r--include/linux/binfmts.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/fs/exec.c b/fs/exec.c
index 506cd411f4ac..f45859ad13ac 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -755,8 +755,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 60d674af3080..1625c8529e70 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -64,7 +64,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. */