Browse Source

get rid of pt_regs argument of search_binary_handler()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
master
Al Viro 9 years ago
parent
commit
3c456bfc4b
  1. 2
      arch/alpha/kernel/binfmt_loader.c
  2. 2
      fs/binfmt_em86.c
  3. 2
      fs/binfmt_misc.c
  4. 2
      fs/binfmt_script.c
  5. 7
      fs/exec.c
  6. 2
      include/linux/binfmts.h

2
arch/alpha/kernel/binfmt_loader.c

@ -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 = {

2
fs/binfmt_em86.c

@ -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 = {

2
fs/binfmt_misc.c

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

2
fs/binfmt_script.c

@ -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 = {

7
fs/exec.c

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

2
include/linux/binfmts.h

@ -95,7 +95,7 @@ extern void unregister_binfmt(struct linux_binfmt *);
extern int prepare_binprm(struct linux_binprm *);
extern int __must_check remove_arg_zero(struct linux_binprm *);
extern int search_binary_handler(struct linux_binprm *, struct pt_regs *);
extern int search_binary_handler(struct linux_binprm *);
extern int flush_old_exec(struct linux_binprm * bprm);
extern void setup_new_exec(struct linux_binprm * bprm);
extern void would_dump(struct linux_binprm *, struct file *);

Loading…
Cancel
Save