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
835ab32d
Commit
835ab32d
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_common()
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
da3d4c5f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
fs/exec.c
fs/exec.c
+4
-4
No files found.
fs/exec.c
View file @
835ab32d
...
@@ -1439,8 +1439,7 @@ EXPORT_SYMBOL(search_binary_handler);
...
@@ -1439,8 +1439,7 @@ EXPORT_SYMBOL(search_binary_handler);
*/
*/
static
int
do_execve_common
(
const
char
*
filename
,
static
int
do_execve_common
(
const
char
*
filename
,
struct
user_arg_ptr
argv
,
struct
user_arg_ptr
argv
,
struct
user_arg_ptr
envp
,
struct
user_arg_ptr
envp
)
struct
pt_regs
*
regs
)
{
{
struct
linux_binprm
*
bprm
;
struct
linux_binprm
*
bprm
;
struct
file
*
file
;
struct
file
*
file
;
...
@@ -1448,6 +1447,7 @@ static int do_execve_common(const char *filename,
...
@@ -1448,6 +1447,7 @@ static int do_execve_common(const char *filename,
bool
clear_in_exec
;
bool
clear_in_exec
;
int
retval
;
int
retval
;
const
struct
cred
*
cred
=
current_cred
();
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
* We move the actual failure in case of RLIMIT_NPROC excess from
...
@@ -1570,7 +1570,7 @@ int do_execve(const char *filename,
...
@@ -1570,7 +1570,7 @@ int do_execve(const char *filename,
{
{
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
,
current_pt_regs
()
);
return
do_execve_common
(
filename
,
argv
,
envp
);
}
}
#ifdef CONFIG_COMPAT
#ifdef CONFIG_COMPAT
...
@@ -1586,7 +1586,7 @@ static int compat_do_execve(const char *filename,
...
@@ -1586,7 +1586,7 @@ static int compat_do_execve(const char *filename,
.
is_compat
=
true
,
.
is_compat
=
true
,
.
ptr
.
compat
=
__envp
,
.
ptr
.
compat
=
__envp
,
};
};
return
do_execve_common
(
filename
,
argv
,
envp
,
current_pt_regs
()
);
return
do_execve_common
(
filename
,
argv
,
envp
);
}
}
#endif
#endif
...
...
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