From: Yonatan Goldschmidt Date: Sun, 23 Feb 2025 22:32:34 +0000 (+0200) Subject: binfmt: Remove loader from linux_binprm struct X-Git-Tag: v6.15-rc1~235^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc9554e662a3b5a13f514cfcced54ac263c07094;p=thirdparty%2Fkernel%2Flinux.git 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 Link: https://lore.kernel.org/r/20250223223234.13764-1-yon.goldschmidt@gmail.com Signed-off-by: Kees Cook --- diff --git a/fs/exec.c b/fs/exec.c index 506cd411f4ac2..f45859ad13aca 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 60d674af3080a..1625c8529e700 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. */