Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
e33f7704
L
linux
项目概览
xiphi1978
/
linux
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e33f7704
编写于
2月 22, 2011
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
xfrm: Mark flowi arg to security_xfrm_state_pol_flow_match() const.
Signed-off-by:
N
David S. Miller
<
davem@davemloft.net
>
上级
e1ad2ab2
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
9 addition
and
7 deletion
+9
-7
include/linux/security.h
include/linux/security.h
+4
-3
security/capability.c
security/capability.c
+1
-1
security/security.c
security/security.c
+2
-1
security/selinux/include/xfrm.h
security/selinux/include/xfrm.h
+1
-1
security/selinux/xfrm.c
security/selinux/xfrm.c
+1
-1
未找到文件。
include/linux/security.h
浏览文件 @
e33f7704
...
@@ -1623,7 +1623,7 @@ struct security_operations {
...
@@ -1623,7 +1623,7 @@ struct security_operations {
int
(
*
xfrm_policy_lookup
)
(
struct
xfrm_sec_ctx
*
ctx
,
u32
fl_secid
,
u8
dir
);
int
(
*
xfrm_policy_lookup
)
(
struct
xfrm_sec_ctx
*
ctx
,
u32
fl_secid
,
u8
dir
);
int
(
*
xfrm_state_pol_flow_match
)
(
struct
xfrm_state
*
x
,
int
(
*
xfrm_state_pol_flow_match
)
(
struct
xfrm_state
*
x
,
struct
xfrm_policy
*
xp
,
struct
xfrm_policy
*
xp
,
struct
flowi
*
fl
);
const
struct
flowi
*
fl
);
int
(
*
xfrm_decode_session
)
(
struct
sk_buff
*
skb
,
u32
*
secid
,
int
ckall
);
int
(
*
xfrm_decode_session
)
(
struct
sk_buff
*
skb
,
u32
*
secid
,
int
ckall
);
#endif
/* CONFIG_SECURITY_NETWORK_XFRM */
#endif
/* CONFIG_SECURITY_NETWORK_XFRM */
...
@@ -2761,7 +2761,8 @@ int security_xfrm_state_delete(struct xfrm_state *x);
...
@@ -2761,7 +2761,8 @@ int security_xfrm_state_delete(struct xfrm_state *x);
void
security_xfrm_state_free
(
struct
xfrm_state
*
x
);
void
security_xfrm_state_free
(
struct
xfrm_state
*
x
);
int
security_xfrm_policy_lookup
(
struct
xfrm_sec_ctx
*
ctx
,
u32
fl_secid
,
u8
dir
);
int
security_xfrm_policy_lookup
(
struct
xfrm_sec_ctx
*
ctx
,
u32
fl_secid
,
u8
dir
);
int
security_xfrm_state_pol_flow_match
(
struct
xfrm_state
*
x
,
int
security_xfrm_state_pol_flow_match
(
struct
xfrm_state
*
x
,
struct
xfrm_policy
*
xp
,
struct
flowi
*
fl
);
struct
xfrm_policy
*
xp
,
const
struct
flowi
*
fl
);
int
security_xfrm_decode_session
(
struct
sk_buff
*
skb
,
u32
*
secid
);
int
security_xfrm_decode_session
(
struct
sk_buff
*
skb
,
u32
*
secid
);
void
security_skb_classify_flow
(
struct
sk_buff
*
skb
,
struct
flowi
*
fl
);
void
security_skb_classify_flow
(
struct
sk_buff
*
skb
,
struct
flowi
*
fl
);
...
@@ -2813,7 +2814,7 @@ static inline int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_s
...
@@ -2813,7 +2814,7 @@ static inline int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_s
}
}
static
inline
int
security_xfrm_state_pol_flow_match
(
struct
xfrm_state
*
x
,
static
inline
int
security_xfrm_state_pol_flow_match
(
struct
xfrm_state
*
x
,
struct
xfrm_policy
*
xp
,
struct
flowi
*
fl
)
struct
xfrm_policy
*
xp
,
const
struct
flowi
*
fl
)
{
{
return
1
;
return
1
;
}
}
...
...
security/capability.c
浏览文件 @
e33f7704
...
@@ -760,7 +760,7 @@ static int cap_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 sk_sid, u8 dir)
...
@@ -760,7 +760,7 @@ static int cap_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 sk_sid, u8 dir)
static
int
cap_xfrm_state_pol_flow_match
(
struct
xfrm_state
*
x
,
static
int
cap_xfrm_state_pol_flow_match
(
struct
xfrm_state
*
x
,
struct
xfrm_policy
*
xp
,
struct
xfrm_policy
*
xp
,
struct
flowi
*
fl
)
const
struct
flowi
*
fl
)
{
{
return
1
;
return
1
;
}
}
...
...
security/security.c
浏览文件 @
e33f7704
...
@@ -1233,7 +1233,8 @@ int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir)
...
@@ -1233,7 +1233,8 @@ int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir)
}
}
int
security_xfrm_state_pol_flow_match
(
struct
xfrm_state
*
x
,
int
security_xfrm_state_pol_flow_match
(
struct
xfrm_state
*
x
,
struct
xfrm_policy
*
xp
,
struct
flowi
*
fl
)
struct
xfrm_policy
*
xp
,
const
struct
flowi
*
fl
)
{
{
return
security_ops
->
xfrm_state_pol_flow_match
(
x
,
xp
,
fl
);
return
security_ops
->
xfrm_state_pol_flow_match
(
x
,
xp
,
fl
);
}
}
...
...
security/selinux/include/xfrm.h
浏览文件 @
e33f7704
...
@@ -19,7 +19,7 @@ void selinux_xfrm_state_free(struct xfrm_state *x);
...
@@ -19,7 +19,7 @@ void selinux_xfrm_state_free(struct xfrm_state *x);
int
selinux_xfrm_state_delete
(
struct
xfrm_state
*
x
);
int
selinux_xfrm_state_delete
(
struct
xfrm_state
*
x
);
int
selinux_xfrm_policy_lookup
(
struct
xfrm_sec_ctx
*
ctx
,
u32
fl_secid
,
u8
dir
);
int
selinux_xfrm_policy_lookup
(
struct
xfrm_sec_ctx
*
ctx
,
u32
fl_secid
,
u8
dir
);
int
selinux_xfrm_state_pol_flow_match
(
struct
xfrm_state
*
x
,
int
selinux_xfrm_state_pol_flow_match
(
struct
xfrm_state
*
x
,
struct
xfrm_policy
*
xp
,
struct
flowi
*
fl
);
struct
xfrm_policy
*
xp
,
const
struct
flowi
*
fl
);
/*
/*
* Extract the security blob from the sock (it's actually on the socket)
* Extract the security blob from the sock (it's actually on the socket)
...
...
security/selinux/xfrm.c
浏览文件 @
e33f7704
...
@@ -112,7 +112,7 @@ int selinux_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir)
...
@@ -112,7 +112,7 @@ int selinux_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir)
*/
*/
int
selinux_xfrm_state_pol_flow_match
(
struct
xfrm_state
*
x
,
struct
xfrm_policy
*
xp
,
int
selinux_xfrm_state_pol_flow_match
(
struct
xfrm_state
*
x
,
struct
xfrm_policy
*
xp
,
struct
flowi
*
fl
)
const
struct
flowi
*
fl
)
{
{
u32
state_sid
;
u32
state_sid
;
int
rc
;
int
rc
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录