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
Kirill Smelkov
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
Show 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,
...
@@ -1575,10 +1575,9 @@ int do_execve(const char *filename,
}
}
#ifdef CONFIG_COMPAT
#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
*
__argv
,
const
compat_uptr_t
__user
*
__envp
,
const
compat_uptr_t
__user
*
__envp
)
struct
pt_regs
*
regs
)
{
{
struct
user_arg_ptr
argv
=
{
struct
user_arg_ptr
argv
=
{
.
is_compat
=
true
,
.
is_compat
=
true
,
...
@@ -1588,7 +1587,7 @@ int compat_do_execve(const char *filename,
...
@@ -1588,7 +1587,7 @@ 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
,
regs
);
return
do_execve_common
(
filename
,
argv
,
envp
,
current_pt_regs
()
);
}
}
#endif
#endif
...
@@ -1682,8 +1681,7 @@ asmlinkage long compat_sys_execve(const char __user * filename,
...
@@ -1682,8 +1681,7 @@ asmlinkage long compat_sys_execve(const char __user * filename,
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
=
compat_do_execve
(
path
->
name
,
argv
,
envp
,
error
=
compat_do_execve
(
path
->
name
,
argv
,
envp
);
current_pt_regs
());
putname
(
path
);
putname
(
path
);
}
}
return
error
;
return
error
;
...
...
include/linux/compat.h
View file @
d03d26e5
...
@@ -284,8 +284,6 @@ asmlinkage ssize_t compat_sys_pwritev(unsigned long fd,
...
@@ -284,8 +284,6 @@ asmlinkage ssize_t compat_sys_pwritev(unsigned long fd,
const
struct
compat_iovec
__user
*
vec
,
const
struct
compat_iovec
__user
*
vec
,
unsigned
long
vlen
,
u32
pos_low
,
u32
pos_high
);
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
,
asmlinkage
long
compat_sys_execve
(
const
char
__user
*
filename
,
const
compat_uptr_t
__user
*
argv
,
const
compat_uptr_t
__user
*
envp
);
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