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

Commit 3c456bfc authored by Al Viro's avatar Al Viro
Browse files

get rid of pt_regs argument of search_binary_handler() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 835ab32d

arch/alpha/kernel/binfmt_loader.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static int load_binary(struct linux_binprm *bprm, struct pt_regs *regs) 
	retval = prepare_binprm(bprm);

	if (retval < 0)

		return retval;

	return search_binary_handler(bprm,regs);

	return search_binary_handler(bprm);

}



static struct linux_binfmt loader_format = {

fs/binfmt_em86.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static int load_em86(struct linux_binprm *bprm,struct pt_regs *regs) 
	if (retval < 0)

		return retval;



	return search_binary_handler(bprm, regs);

	return search_binary_handler(bprm);

}



static struct linux_binfmt em86_format = {

fs/binfmt_misc.c

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs) 


	bprm->recursion_depth++;



	retval = search_binary_handler (bprm, regs);

	retval = search_binary_handler(bprm);

	if (retval < 0)

		goto _error;

fs/binfmt_script.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static int load_script(struct linux_binprm *bprm,struct pt_regs *regs) 
	retval = prepare_binprm(bprm);

	if (retval < 0)

		return retval;

	return search_binary_handler(bprm,regs);

	return search_binary_handler(bprm);

}



static struct linux_binfmt script_format = {

fs/exec.c

+3 −4
Original line number Diff line number Diff line
@@ -1349,7 +1349,7 @@ EXPORT_SYMBOL(remove_arg_zero); 
/*

 * cycle the list of binary formats handler, until one recognizes the image

 */

int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)

int search_binary_handler(struct linux_binprm *bprm)

{

	unsigned int depth = bprm->recursion_depth;

	int try,retval;
@@ -1380,7 +1380,7 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs) 
			if (!try_module_get(fmt->module))

				continue;

			read_unlock(&binfmt_lock);

			retval = fn(bprm, regs);

			retval = fn(bprm, current_pt_regs());

			/*

			 * Restore the depth counter to its starting value

			 * in this call, so we don't have to rely on every
@@ -1447,7 +1447,6 @@ static int do_execve_common(const char *filename, 
	bool clear_in_exec;

	int retval;

	const struct cred *cred = current_cred();

	struct pt_regs *regs = current_pt_regs();



	/*

	 * We move the actual failure in case of RLIMIT_NPROC excess from
@@ -1524,7 +1523,7 @@ static int do_execve_common(const char *filename, 
	if (retval < 0)

		goto out;



	retval = search_binary_handler(bprm,regs);

	retval = search_binary_handler(bprm);

	if (retval < 0)

		goto out;