get rid of special-casing the /sbin/loader on alpha
Subsystems (3)
PATCH 1/1 get rid of special-casing the /sbin/loader on alpha
... just make it a binfmt handler like #! one.
Signed-off-by Al Viro <[email protected]>
--- arch/alpha/kernel/Makefile | 2 +- arch/alpha/kernel/binfmt_loader.c | 51 +++++++++++++++++++++++++++++++++++++ fs/exec.c | 41 +----------------------------- 3 files changed, 53 insertions(+), 41 deletions(-) create mode 100644 arch/alpha/kernel/binfmt_loader.c
arch/alpha/kernel/Makefile +1 -1
@@ -8,7 +8,7 @@ EXTRA_CFLAGS := -Werror -Wno-sign-compare obj-y := entry.o traps.o process.o init_task.o osf_sys.o irq.o \ irq_alpha.o signal.o setup.o ptrace.o time.o \ - alpha_ksyms.o systbls.o err_common.o io.o + alpha_ksyms.o systbls.o err_common.o io.o binfmt_loader.o obj-$(CONFIG_VGA_HOSE) += console.o obj-$(CONFIG_SMP) += smp.o
arch/alpha/kernel/binfmt_loader.c new file +51 -0
51 lines not on this page · raw message
fs/exec.c +0 -39
@@ -57,11 +57,6 @@#include <asm/tlb.h> #include "internal.h" -#ifdef __alpha__ -/* for /sbin/loader handling in search_binary_handler() */ -#include <linux/a.out.h> -#endif -int core_uses_pid;char core_pattern[CORENAME_MAX_SIZE ] ="core" ;int suid_dumpable =0 ;
@@ -1172,41 +1167,7 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)unsigned int depth = bprm->recursion_depth;int try,retval;struct linux_binfmt *fmt; -#ifdef __alpha__ -/* handle /sbin/loader.. */ - { -struct exec * eh = (struct exec *) bprm->buf; -if (!bprm->loader && eh->fh.f_magic ==0x183 && - (eh->fh.f_flags &0x3000 ) ==0x3000 ) - { -struct file * file; -unsigned long loader; - -allow_write_access (bprm->file); -fput (bprm->file); - bprm->file =NULL ; - - loader = bprm->vma->vm_end -sizeof (void *); - - file =open_exec ("/sbin/loader" ); - retval =PTR_ERR (file); -if (IS_ERR (file)) -return retval; - -/* Remember if the application is TASO. */ - bprm->taso = eh->ah.entry <0x100000000UL ; - - bprm->file = file; - bprm->loader = loader; - retval =prepare_binprm (bprm); -if (retval<0 ) -return retval; -/* should call search_binary_handler recursively here, -but it does not matter */ - } - } -#endif retval =security_bprm_check (bprm);if (retval)return retval;
Signature · 1 line
1.5.6.5