Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
3c456bfc
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3c456bfc
编写于
10月 20, 2012
作者:
A
Al Viro
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
get rid of pt_regs argument of search_binary_handler()
Signed-off-by:
N
Al Viro
<
viro@zeniv.linux.org.uk
>
上级
835ab32d
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
8 addition
and
9 deletion
+8
-9
arch/alpha/kernel/binfmt_loader.c
arch/alpha/kernel/binfmt_loader.c
+1
-1
fs/binfmt_em86.c
fs/binfmt_em86.c
+1
-1
fs/binfmt_misc.c
fs/binfmt_misc.c
+1
-1
fs/binfmt_script.c
fs/binfmt_script.c
+1
-1
fs/exec.c
fs/exec.c
+3
-4
include/linux/binfmts.h
include/linux/binfmts.h
+1
-1
未找到文件。
arch/alpha/kernel/binfmt_loader.c
浏览文件 @
3c456bfc
...
@@ -37,7 +37,7 @@ static int load_binary(struct linux_binprm *bprm, struct pt_regs *regs)
...
@@ -37,7 +37,7 @@ static int load_binary(struct linux_binprm *bprm, struct pt_regs *regs)
retval
=
prepare_binprm
(
bprm
);
retval
=
prepare_binprm
(
bprm
);
if
(
retval
<
0
)
if
(
retval
<
0
)
return
retval
;
return
retval
;
return
search_binary_handler
(
bprm
,
regs
);
return
search_binary_handler
(
bprm
);
}
}
static
struct
linux_binfmt
loader_format
=
{
static
struct
linux_binfmt
loader_format
=
{
...
...
fs/binfmt_em86.c
浏览文件 @
3c456bfc
...
@@ -90,7 +90,7 @@ static int load_em86(struct linux_binprm *bprm,struct pt_regs *regs)
...
@@ -90,7 +90,7 @@ static int load_em86(struct linux_binprm *bprm,struct pt_regs *regs)
if
(
retval
<
0
)
if
(
retval
<
0
)
return
retval
;
return
retval
;
return
search_binary_handler
(
bprm
,
regs
);
return
search_binary_handler
(
bprm
);
}
}
static
struct
linux_binfmt
em86_format
=
{
static
struct
linux_binfmt
em86_format
=
{
...
...
fs/binfmt_misc.c
浏览文件 @
3c456bfc
...
@@ -199,7 +199,7 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)
...
@@ -199,7 +199,7 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)
bprm
->
recursion_depth
++
;
bprm
->
recursion_depth
++
;
retval
=
search_binary_handler
(
bprm
,
regs
);
retval
=
search_binary_handler
(
bprm
);
if
(
retval
<
0
)
if
(
retval
<
0
)
goto
_error
;
goto
_error
;
...
...
fs/binfmt_script.c
浏览文件 @
3c456bfc
...
@@ -95,7 +95,7 @@ static int load_script(struct linux_binprm *bprm,struct pt_regs *regs)
...
@@ -95,7 +95,7 @@ static int load_script(struct linux_binprm *bprm,struct pt_regs *regs)
retval
=
prepare_binprm
(
bprm
);
retval
=
prepare_binprm
(
bprm
);
if
(
retval
<
0
)
if
(
retval
<
0
)
return
retval
;
return
retval
;
return
search_binary_handler
(
bprm
,
regs
);
return
search_binary_handler
(
bprm
);
}
}
static
struct
linux_binfmt
script_format
=
{
static
struct
linux_binfmt
script_format
=
{
...
...
fs/exec.c
浏览文件 @
3c456bfc
...
@@ -1349,7 +1349,7 @@ EXPORT_SYMBOL(remove_arg_zero);
...
@@ -1349,7 +1349,7 @@ EXPORT_SYMBOL(remove_arg_zero);
/*
/*
* cycle the list of binary formats handler, until one recognizes the image
* cycle the list of binary formats handler, until one recognizes the image
*/
*/
int
search_binary_handler
(
struct
linux_binprm
*
bprm
,
struct
pt_regs
*
regs
)
int
search_binary_handler
(
struct
linux_binprm
*
bprm
)
{
{
unsigned
int
depth
=
bprm
->
recursion_depth
;
unsigned
int
depth
=
bprm
->
recursion_depth
;
int
try
,
retval
;
int
try
,
retval
;
...
@@ -1380,7 +1380,7 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
...
@@ -1380,7 +1380,7 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
if
(
!
try_module_get
(
fmt
->
module
))
if
(
!
try_module_get
(
fmt
->
module
))
continue
;
continue
;
read_unlock
(
&
binfmt_lock
);
read_unlock
(
&
binfmt_lock
);
retval
=
fn
(
bprm
,
regs
);
retval
=
fn
(
bprm
,
current_pt_regs
()
);
/*
/*
* Restore the depth counter to its starting value
* Restore the depth counter to its starting value
* in this call, so we don't have to rely on every
* in this call, so we don't have to rely on every
...
@@ -1447,7 +1447,6 @@ static int do_execve_common(const char *filename,
...
@@ -1447,7 +1447,6 @@ 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
...
@@ -1524,7 +1523,7 @@ static int do_execve_common(const char *filename,
...
@@ -1524,7 +1523,7 @@ static int do_execve_common(const char *filename,
if
(
retval
<
0
)
if
(
retval
<
0
)
goto
out
;
goto
out
;
retval
=
search_binary_handler
(
bprm
,
regs
);
retval
=
search_binary_handler
(
bprm
);
if
(
retval
<
0
)
if
(
retval
<
0
)
goto
out
;
goto
out
;
...
...
include/linux/binfmts.h
浏览文件 @
3c456bfc
...
@@ -95,7 +95,7 @@ extern void unregister_binfmt(struct linux_binfmt *);
...
@@ -95,7 +95,7 @@ extern void unregister_binfmt(struct linux_binfmt *);
extern
int
prepare_binprm
(
struct
linux_binprm
*
);
extern
int
prepare_binprm
(
struct
linux_binprm
*
);
extern
int
__must_check
remove_arg_zero
(
struct
linux_binprm
*
);
extern
int
__must_check
remove_arg_zero
(
struct
linux_binprm
*
);
extern
int
search_binary_handler
(
struct
linux_binprm
*
,
struct
pt_regs
*
);
extern
int
search_binary_handler
(
struct
linux_binprm
*
);
extern
int
flush_old_exec
(
struct
linux_binprm
*
bprm
);
extern
int
flush_old_exec
(
struct
linux_binprm
*
bprm
);
extern
void
setup_new_exec
(
struct
linux_binprm
*
bprm
);
extern
void
setup_new_exec
(
struct
linux_binprm
*
bprm
);
extern
void
would_dump
(
struct
linux_binprm
*
,
struct
file
*
);
extern
void
would_dump
(
struct
linux_binprm
*
,
struct
file
*
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录