aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-10-20 21:50:59 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-11-28 21:53:37 -0500
commit835ab32dff6b437e74c266468b83c4abb69041dc (patch)
treee32ab73caa7235afc3635a7f2439a427e70cbbd2
parentda3d4c5fa56236dd924d77ffc4f982356816b93b (diff)
get rid of pt_regs argument of do_execve_common()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/exec.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/exec.c b/fs/exec.c
index 5797ed07efd3..dc5e2830d353 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1439,8 +1439,7 @@ EXPORT_SYMBOL(search_binary_handler);
1439 */ 1439 */
1440static int do_execve_common(const char *filename, 1440static int do_execve_common(const char *filename,
1441 struct user_arg_ptr argv, 1441 struct user_arg_ptr argv,
1442 struct user_arg_ptr envp, 1442 struct user_arg_ptr envp)
1443 struct pt_regs *regs)
1444{ 1443{
1445 struct linux_binprm *bprm; 1444 struct linux_binprm *bprm;
1446 struct file *file; 1445 struct file *file;
@@ -1448,6 +1447,7 @@ static int do_execve_common(const char *filename,
1448 bool clear_in_exec; 1447 bool clear_in_exec;
1449 int retval; 1448 int retval;
1450 const struct cred *cred = current_cred(); 1449 const struct cred *cred = current_cred();
1450 struct pt_regs *regs = current_pt_regs();
1451 1451
1452 /* 1452 /*
1453 * We move the actual failure in case of RLIMIT_NPROC excess from 1453 * We move the actual failure in case of RLIMIT_NPROC excess from
@@ -1570,7 +1570,7 @@ int do_execve(const char *filename,
1570{ 1570{
1571 struct user_arg_ptr argv = { .ptr.native = __argv }; 1571 struct user_arg_ptr argv = { .ptr.native = __argv };
1572 struct user_arg_ptr envp = { .ptr.native = __envp }; 1572 struct user_arg_ptr envp = { .ptr.native = __envp };
1573 return do_execve_common(filename, argv, envp, current_pt_regs()); 1573 return do_execve_common(filename, argv, envp);
1574} 1574}
1575 1575
1576#ifdef CONFIG_COMPAT 1576#ifdef CONFIG_COMPAT
@@ -1586,7 +1586,7 @@ static int compat_do_execve(const char *filename,
1586 .is_compat = true, 1586 .is_compat = true,
1587 .ptr.compat = __envp, 1587 .ptr.compat = __envp,
1588 }; 1588 };
1589 return do_execve_common(filename, argv, envp, current_pt_regs()); 1589 return do_execve_common(filename, argv, envp);
1590} 1590}
1591#endif 1591#endif
1592 1592