openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

get rid of pt_regs argument of do_execve() 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2012-10-20 21:49:33 -04:00
parent d03d26e58f
commit da3d4c5fa5
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/exec.c
View File

@ -1566,12 +1566,11 @@ static int do_execve_common(const char *filename,
int do_execve(const char *filename, int do_execve(const char *filename,
const char __user *const __user *__argv, const char __user *const __user *__argv,
const char __user *const __user *__envp, const char __user *const __user *__envp)
struct pt_regs *regs)
{ {
struct user_arg_ptr argv = { .ptr.native = __argv }; struct user_arg_ptr argv = { .ptr.native = __argv };
struct user_arg_ptr envp = { .ptr.native = __envp }; 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 #ifdef CONFIG_COMPAT
@ -1668,7 +1667,7 @@ SYSCALL_DEFINE3(execve,
struct filename *path = getname(filename); struct filename *path = getname(filename);
int error = PTR_ERR(path); int error = PTR_ERR(path);
if (!IS_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); putname(path);
} }
return error; return error;
@ -1694,12 +1693,9 @@ int kernel_execve(const char *filename,
const char *const argv[], const char *const argv[],
const char *const envp[]) const char *const envp[])
{ {
struct pt_regs *p = current_pt_regs(); int ret = do_execve(filename,
int ret;
ret = do_execve(filename,
(const char __user *const __user *)argv, (const char __user *const __user *)argv,
(const char __user *const __user *)envp, p); (const char __user *const __user *)envp);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -1707,6 +1703,6 @@ int kernel_execve(const char *filename,
* We were successful. We won't be returning to our caller, but * We were successful. We won't be returning to our caller, but
* instead to user space by manipulating the kernel stack. * instead to user space by manipulating the kernel stack.
*/ */
ret_from_kernel_execve(p); ret_from_kernel_execve(current_pt_regs());
} }
#endif #endif

2
include/linux/sched.h
View File

@ -2288,7 +2288,7 @@ extern int disallow_signal(int);
extern int do_execve(const char *, extern int do_execve(const char *,
const char __user * const __user *, 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 *); extern long do_fork(unsigned long, unsigned long, struct pt_regs *, unsigned long, int __user *, int __user *);
struct task_struct *fork_idle(int); struct task_struct *fork_idle(int);
#ifdef CONFIG_GENERIC_KERNEL_THREAD #ifdef CONFIG_GENERIC_KERNEL_THREAD

3
include/linux/syscalls.h
View File

@ -833,8 +833,7 @@ int kernel_execve(const char *filename, const char *const argv[], const char *co
#define kernel_execve(filename, argv, envp) \ #define kernel_execve(filename, argv, envp) \
do_execve(filename, \ do_execve(filename, \
(const char __user *const __user *)argv, \ (const char __user *const __user *)argv, \
(const char __user *const __user *)envp, \ (const char __user *const __user *)envp)
current_pt_regs())
#endif #endif
asmlinkage long sys_execve(const char __user *filename, asmlinkage long sys_execve(const char __user *filename,