Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bfacef4 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

get rid of special-casing the /sbin/loader on alpha 



... just make it a binfmt handler like #! one.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 17580d7f

arch/alpha/kernel/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -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 \

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 \

	    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_VGA_HOSE)	+= console.o

obj-$(CONFIG_SMP)	+= smp.o

obj-$(CONFIG_SMP)	+= smp.o

arch/alpha/kernel/binfmt_loader.c

0 → 100644
+51 −0
Original line number Original line Diff line number Diff line 
#include <linux/init.h>

#include <linux/fs.h>

#include <linux/file.h>

#include <linux/mm_types.h>

#include <linux/binfmts.h>

#include <linux/a.out.h>



static int load_binary(struct linux_binprm *bprm, struct pt_regs *regs)

{

	struct exec *eh = (struct exec *)bprm->buf;

	unsigned long loader;

	struct file *file;

	int retval;



	if (eh->fh.f_magic != 0x183 || (eh->fh.f_flags & 0x3000) != 0x3000)

		return -ENOEXEC;



	if (bprm->loader)

		return -ENOEXEC;



	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;

	return search_binary_handler(bprm,regs);

}



static struct linux_binfmt loader_format = {

	.load_binary	= load_binary,

};



static int __init init_loader_binfmt(void)

{

	return register_binfmt(&loader_format);

}

arch_initcall(init_loader_binfmt);

fs/exec.c

+0 −39
Original line number Original line Diff line number Diff line
@@ -57,11 +57,6 @@ 
#include <asm/tlb.h>

#include <asm/tlb.h>

#include "internal.h"

#include "internal.h"





#ifdef __alpha__

/* for /sbin/loader handling in search_binary_handler() */

#include <linux/a.out.h>

#endif



int core_uses_pid;

int core_uses_pid;

char core_pattern[CORENAME_MAX_SIZE] = "core";

char core_pattern[CORENAME_MAX_SIZE] = "core";

int suid_dumpable = 0;

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;

	unsigned int depth = bprm->recursion_depth;

	int try,retval;

	int try,retval;

	struct linux_binfmt *fmt;

	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);

	retval = security_bprm_check(bprm);

	if (retval)

	if (retval)

		return retval;

		return retval;