Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
da3d4c5f
Commit
da3d4c5f
authored
Oct 20, 2012
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
get rid of pt_regs argument of do_execve()
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
d03d26e5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
13 deletions
+8
-13
fs/exec.c
fs/exec.c
+6
-10
include/linux/sched.h
include/linux/sched.h
+1
-1
include/linux/syscalls.h
include/linux/syscalls.h
+1
-2
No files found.
fs/exec.c
View file @
da3d4c5f
...
...
@@ -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
...
...
@@ -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
;
...
...
@@ -1694,12 +1693,9 @@ 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
;
...
...
@@ -1707,6 +1703,6 @@ int kernel_execve(const char *filename,
* 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
include/linux/sched.h
View file @
da3d4c5f
...
...
@@ -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
...
...
include/linux/syscalls.h
View file @
da3d4c5f
...
...
@@ -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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment