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
e33f7704
Commit
e33f7704
authored
Feb 22, 2011
by
David S. Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xfrm: Mark flowi arg to security_xfrm_state_pol_flow_match() const.
Signed-off-by:
David S. Miller
<
davem@davemloft.net
>
parent
e1ad2ab2
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
7 deletions
+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
No files found.
include/linux/security.h
View file @
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
View file @
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
View file @
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
View file @
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
View file @
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
;
...
...
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