Skip to content

Commit

Permalink
get rid of pt_regs argument of do_execve()
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Nov 29, 2012
1 parent d03d26e commit da3d4c5
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 13 deletions.
16 changes: 6 additions & 10 deletions fs/exec.c
Original file line number Diff line number Diff line change
Expand Up @@ -1566,12 +1566,11 @@ static int do_execve_common(const char *filename,

int do_execve(const char *filename,
const char __user *const __user *__argv,
const char __user *const __user *__envp,
struct pt_regs *regs)
const char __user *const __user *__envp)
{
struct user_arg_ptr argv = { .ptr.native = __argv };
struct user_arg_ptr envp = { .ptr.native = __envp };
return do_execve_common(filename, argv, envp, regs);
return do_execve_common(filename, argv, envp, current_pt_regs());
}

#ifdef CONFIG_COMPAT
Expand Down Expand Up @@ -1668,7 +1667,7 @@ SYSCALL_DEFINE3(execve,
struct filename *path = getname(filename);
int error = PTR_ERR(path);
if (!IS_ERR(path)) {
error = do_execve(path->name, argv, envp, current_pt_regs());
error = do_execve(path->name, argv, envp);
putname(path);
}
return error;
Expand All @@ -1694,19 +1693,16 @@ int kernel_execve(const char *filename,
const char *const argv[],
const char *const envp[])
{
struct pt_regs *p = current_pt_regs();
int ret;

ret = do_execve(filename,
int ret = do_execve(filename,
(const char __user *const __user *)argv,
(const char __user *const __user *)envp, p);
(const char __user *const __user *)envp);
if (ret < 0)
return ret;

/*
* We were successful. We won't be returning to our caller, but
* instead to user space by manipulating the kernel stack.
*/
ret_from_kernel_execve(p);
ret_from_kernel_execve(current_pt_regs());
}
#endif
2 changes: 1 addition & 1 deletion include/linux/sched.h
Original file line number Diff line number Diff line change
Expand Up @@ -2288,7 +2288,7 @@ extern int disallow_signal(int);

extern int do_execve(const char *,
const char __user * const __user *,
const char __user * const __user *, struct pt_regs *);
const char __user * const __user *);
extern long do_fork(unsigned long, unsigned long, struct pt_regs *, unsigned long, int __user *, int __user *);
struct task_struct *fork_idle(int);
#ifdef CONFIG_GENERIC_KERNEL_THREAD
Expand Down
3 changes: 1 addition & 2 deletions include/linux/syscalls.h
Original file line number Diff line number Diff line change
Expand Up @@ -833,8 +833,7 @@ int kernel_execve(const char *filename, const char *const argv[], const char *co
#define kernel_execve(filename, argv, envp) \
do_execve(filename, \
(const char __user *const __user *)argv, \
(const char __user *const __user *)envp, \
current_pt_regs())
(const char __user *const __user *)envp)
#endif

asmlinkage long sys_execve(const char __user *filename,
Expand Down

0 comments on commit da3d4c5

Please sign in to comment.