Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
xcap
xcap-capability-linux
Commits
d03d26e5
Commit
d03d26e5
authored
Oct 20, 2012
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make compat_do_execve() static, lose pt_regs argument
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
910cdc55
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
8 deletions
+4
-8
fs/exec.c
fs/exec.c
+4
-6
include/linux/compat.h
include/linux/compat.h
+0
-2
No files found.
fs/exec.c
View file @
d03d26e5
...
...
@@ -1575,10 +1575,9 @@ int do_execve(const char *filename,
}
#ifdef CONFIG_COMPAT
int
compat_do_execve
(
const
char
*
filename
,
static
int
compat_do_execve
(
const
char
*
filename
,
const
compat_uptr_t
__user
*
__argv
,
const
compat_uptr_t
__user
*
__envp
,
struct
pt_regs
*
regs
)
const
compat_uptr_t
__user
*
__envp
)
{
struct
user_arg_ptr
argv
=
{
.
is_compat
=
true
,
...
...
@@ -1588,7 +1587,7 @@ int compat_do_execve(const char *filename,
.
is_compat
=
true
,
.
ptr
.
compat
=
__envp
,
};
return
do_execve_common
(
filename
,
argv
,
envp
,
regs
);
return
do_execve_common
(
filename
,
argv
,
envp
,
current_pt_
regs
()
);
}
#endif
...
...
@@ -1682,8 +1681,7 @@ asmlinkage long compat_sys_execve(const char __user * filename,
struct
filename
*
path
=
getname
(
filename
);
int
error
=
PTR_ERR
(
path
);
if
(
!
IS_ERR
(
path
))
{
error
=
compat_do_execve
(
path
->
name
,
argv
,
envp
,
current_pt_regs
());
error
=
compat_do_execve
(
path
->
name
,
argv
,
envp
);
putname
(
path
);
}
return
error
;
...
...
include/linux/compat.h
View file @
d03d26e5
...
...
@@ -284,8 +284,6 @@ asmlinkage ssize_t compat_sys_pwritev(unsigned long fd,
const
struct
compat_iovec
__user
*
vec
,
unsigned
long
vlen
,
u32
pos_low
,
u32
pos_high
);
int
compat_do_execve
(
const
char
*
filename
,
const
compat_uptr_t
__user
*
argv
,
const
compat_uptr_t
__user
*
envp
,
struct
pt_regs
*
regs
);
asmlinkage
long
compat_sys_execve
(
const
char
__user
*
filename
,
const
compat_uptr_t
__user
*
argv
,
const
compat_uptr_t
__user
*
envp
);
...
...
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