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
7e15134c
Commit
7e15134c
authored
Sep 09, 2003
by
Matthew Wilcox
Committed by
Linus Torvalds
Sep 09, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] fs/exec.c whitespace cleanups
Whitespace cleanup (mostly deleting trailing whitespace).
parent
53949f83
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
17 deletions
+17
-17
fs/exec.c
fs/exec.c
+17
-17
No files found.
fs/exec.c
View file @
7e15134c
...
@@ -56,7 +56,7 @@
...
@@ -56,7 +56,7 @@
int
core_uses_pid
;
int
core_uses_pid
;
char
core_pattern
[
65
]
=
"core"
;
char
core_pattern
[
65
]
=
"core"
;
/* The maximal length of core_pattern is also specified in sysctl.c */
/* The maximal length of core_pattern is also specified in sysctl.c */
static
struct
linux_binfmt
*
formats
;
static
struct
linux_binfmt
*
formats
;
static
rwlock_t
binfmt_lock
=
RW_LOCK_UNLOCKED
;
static
rwlock_t
binfmt_lock
=
RW_LOCK_UNLOCKED
;
...
@@ -190,7 +190,7 @@ static int count(char __user * __user * argv, int max)
...
@@ -190,7 +190,7 @@ static int count(char __user * __user * argv, int max)
* memory to free pages in kernel mem. These are in a format ready
* memory to free pages in kernel mem. These are in a format ready
* to be put directly into the top of new user memory.
* to be put directly into the top of new user memory.
*/
*/
int
copy_strings
(
int
argc
,
char
__user
*
__user
*
argv
,
struct
linux_binprm
*
bprm
)
int
copy_strings
(
int
argc
,
char
__user
*
__user
*
argv
,
struct
linux_binprm
*
bprm
)
{
{
struct
page
*
kmapped_page
=
NULL
;
struct
page
*
kmapped_page
=
NULL
;
char
*
kaddr
=
NULL
;
char
*
kaddr
=
NULL
;
...
@@ -213,7 +213,7 @@ int copy_strings(int argc,char __user * __user * argv, struct linux_binprm *bprm
...
@@ -213,7 +213,7 @@ int copy_strings(int argc,char __user * __user * argv, struct linux_binprm *bprm
}
}
bprm
->
p
-=
len
;
bprm
->
p
-=
len
;
/* XXX: add architecture specific overflow check here. */
/* XXX: add architecture specific overflow check here. */
pos
=
bprm
->
p
;
pos
=
bprm
->
p
;
while
(
len
>
0
)
{
while
(
len
>
0
)
{
...
@@ -275,10 +275,10 @@ int copy_strings_kernel(int argc,char ** argv, struct linux_binprm *bprm)
...
@@ -275,10 +275,10 @@ int copy_strings_kernel(int argc,char ** argv, struct linux_binprm *bprm)
{
{
int
r
;
int
r
;
mm_segment_t
oldfs
=
get_fs
();
mm_segment_t
oldfs
=
get_fs
();
set_fs
(
KERNEL_DS
);
set_fs
(
KERNEL_DS
);
r
=
copy_strings
(
argc
,
(
char
__user
*
__user
*
)
argv
,
bprm
);
r
=
copy_strings
(
argc
,
(
char
__user
*
__user
*
)
argv
,
bprm
);
set_fs
(
oldfs
);
set_fs
(
oldfs
);
return
r
;
return
r
;
}
}
#ifdef CONFIG_MMU
#ifdef CONFIG_MMU
...
@@ -427,7 +427,7 @@ int setup_arg_pages(struct linux_binprm *bprm)
...
@@ -427,7 +427,7 @@ int setup_arg_pages(struct linux_binprm *bprm)
mpnt
->
vm_private_data
=
(
void
*
)
0
;
mpnt
->
vm_private_data
=
(
void
*
)
0
;
insert_vm_struct
(
mm
,
mpnt
);
insert_vm_struct
(
mm
,
mpnt
);
mm
->
total_vm
=
(
mpnt
->
vm_end
-
mpnt
->
vm_start
)
>>
PAGE_SHIFT
;
mm
->
total_vm
=
(
mpnt
->
vm_end
-
mpnt
->
vm_start
)
>>
PAGE_SHIFT
;
}
}
for
(
i
=
0
;
i
<
MAX_ARG_PAGES
;
i
++
)
{
for
(
i
=
0
;
i
<
MAX_ARG_PAGES
;
i
++
)
{
struct
page
*
page
=
bprm
->
page
[
i
];
struct
page
*
page
=
bprm
->
page
[
i
];
...
@@ -809,7 +809,7 @@ int flush_old_exec(struct linux_binprm * bprm)
...
@@ -809,7 +809,7 @@ int flush_old_exec(struct linux_binprm * bprm)
/* An exec changes our domain. We are no longer part of the thread
/* An exec changes our domain. We are no longer part of the thread
group */
group */
current
->
self_exec_id
++
;
current
->
self_exec_id
++
;
flush_signal_handlers
(
current
,
0
);
flush_signal_handlers
(
current
,
0
);
...
@@ -893,7 +893,7 @@ int prepare_binprm(struct linux_binprm *bprm)
...
@@ -893,7 +893,7 @@ int prepare_binprm(struct linux_binprm *bprm)
*
*
*/
*/
void
compute_creds
(
struct
linux_binprm
*
bprm
)
void
compute_creds
(
struct
linux_binprm
*
bprm
)
{
{
task_lock
(
current
);
task_lock
(
current
);
if
(
bprm
->
e_uid
!=
current
->
uid
||
bprm
->
e_gid
!=
current
->
gid
)
{
if
(
bprm
->
e_uid
!=
current
->
uid
||
bprm
->
e_gid
!=
current
->
gid
)
{
...
@@ -1058,7 +1058,7 @@ int do_execve(char * filename,
...
@@ -1058,7 +1058,7 @@ int do_execve(char * filename,
return
retval
;
return
retval
;
bprm
.
p
=
PAGE_SIZE
*
MAX_ARG_PAGES
-
sizeof
(
void
*
);
bprm
.
p
=
PAGE_SIZE
*
MAX_ARG_PAGES
-
sizeof
(
void
*
);
memset
(
bprm
.
page
,
0
,
MAX_ARG_PAGES
*
sizeof
(
bprm
.
page
[
0
]));
memset
(
bprm
.
page
,
0
,
MAX_ARG_PAGES
*
sizeof
(
bprm
.
page
[
0
]));
bprm
.
file
=
file
;
bprm
.
file
=
file
;
bprm
.
filename
=
filename
;
bprm
.
filename
=
filename
;
...
@@ -1089,21 +1089,21 @@ int do_execve(char * filename,
...
@@ -1089,21 +1089,21 @@ int do_execve(char * filename,
goto
out
;
goto
out
;
retval
=
prepare_binprm
(
&
bprm
);
retval
=
prepare_binprm
(
&
bprm
);
if
(
retval
<
0
)
if
(
retval
<
0
)
goto
out
;
goto
out
;
retval
=
copy_strings_kernel
(
1
,
&
bprm
.
filename
,
&
bprm
);
retval
=
copy_strings_kernel
(
1
,
&
bprm
.
filename
,
&
bprm
);
if
(
retval
<
0
)
if
(
retval
<
0
)
goto
out
;
goto
out
;
bprm
.
exec
=
bprm
.
p
;
bprm
.
exec
=
bprm
.
p
;
retval
=
copy_strings
(
bprm
.
envc
,
envp
,
&
bprm
);
retval
=
copy_strings
(
bprm
.
envc
,
envp
,
&
bprm
);
if
(
retval
<
0
)
if
(
retval
<
0
)
goto
out
;
goto
out
;
retval
=
copy_strings
(
bprm
.
argc
,
argv
,
&
bprm
);
retval
=
copy_strings
(
bprm
.
argc
,
argv
,
&
bprm
);
if
(
retval
<
0
)
if
(
retval
<
0
)
goto
out
;
goto
out
;
retval
=
search_binary_handler
(
&
bprm
,
regs
);
retval
=
search_binary_handler
(
&
bprm
,
regs
);
if
(
retval
>=
0
)
{
if
(
retval
>=
0
)
{
...
...
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