diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-22 21:13:15 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-22 21:13:15 -0500 |
commit | e33f770426674a565a188042caf3f974f8b3722d (patch) | |
tree | 6ee309a1cbccec1cef9972fc6c8f8d9b280978f5 /security | |
parent | e1ad2ab2cf0cabcd81861e2c61870fc27bb27ded (diff) |
xfrm: Mark flowi arg to security_xfrm_state_pol_flow_match() const.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'security')
-rw-r--r-- | security/capability.c | 2 | ||||
-rw-r--r-- | security/security.c | 3 | ||||
-rw-r--r-- | security/selinux/include/xfrm.h | 2 | ||||
-rw-r--r-- | security/selinux/xfrm.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/security/capability.c b/security/capability.c index 2a5df2b7da83..b8eeaee5c99e 100644 --- a/security/capability.c +++ b/security/capability.c | |||
@@ -760,7 +760,7 @@ static int cap_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 sk_sid, u8 dir) | |||
760 | 760 | ||
761 | static int cap_xfrm_state_pol_flow_match(struct xfrm_state *x, | 761 | static int cap_xfrm_state_pol_flow_match(struct xfrm_state *x, |
762 | struct xfrm_policy *xp, | 762 | struct xfrm_policy *xp, |
763 | struct flowi *fl) | 763 | const struct flowi *fl) |
764 | { | 764 | { |
765 | return 1; | 765 | return 1; |
766 | } | 766 | } |
diff --git a/security/security.c b/security/security.c index 7b7308ace8c5..8ef1f7dff277 100644 --- a/security/security.c +++ b/security/security.c | |||
@@ -1233,7 +1233,8 @@ int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir) | |||
1233 | } | 1233 | } |
1234 | 1234 | ||
1235 | int security_xfrm_state_pol_flow_match(struct xfrm_state *x, | 1235 | int security_xfrm_state_pol_flow_match(struct xfrm_state *x, |
1236 | struct xfrm_policy *xp, struct flowi *fl) | 1236 | struct xfrm_policy *xp, |
1237 | const struct flowi *fl) | ||
1237 | { | 1238 | { |
1238 | return security_ops->xfrm_state_pol_flow_match(x, xp, fl); | 1239 | return security_ops->xfrm_state_pol_flow_match(x, xp, fl); |
1239 | } | 1240 | } |
diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h index 13128f9a3e5a..b43813c9e049 100644 --- a/security/selinux/include/xfrm.h +++ b/security/selinux/include/xfrm.h | |||
@@ -19,7 +19,7 @@ void selinux_xfrm_state_free(struct xfrm_state *x); | |||
19 | int selinux_xfrm_state_delete(struct xfrm_state *x); | 19 | int selinux_xfrm_state_delete(struct xfrm_state *x); |
20 | int selinux_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir); | 20 | int selinux_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir); |
21 | int selinux_xfrm_state_pol_flow_match(struct xfrm_state *x, | 21 | int selinux_xfrm_state_pol_flow_match(struct xfrm_state *x, |
22 | struct xfrm_policy *xp, struct flowi *fl); | 22 | struct xfrm_policy *xp, const struct flowi *fl); |
23 | 23 | ||
24 | /* | 24 | /* |
25 | * Extract the security blob from the sock (it's actually on the socket) | 25 | * Extract the security blob from the sock (it's actually on the socket) |
diff --git a/security/selinux/xfrm.c b/security/selinux/xfrm.c index fff78d3b51a2..c43ab542246c 100644 --- a/security/selinux/xfrm.c +++ b/security/selinux/xfrm.c | |||
@@ -112,7 +112,7 @@ int selinux_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir) | |||
112 | */ | 112 | */ |
113 | 113 | ||
114 | int selinux_xfrm_state_pol_flow_match(struct xfrm_state *x, struct xfrm_policy *xp, | 114 | int selinux_xfrm_state_pol_flow_match(struct xfrm_state *x, struct xfrm_policy *xp, |
115 | struct flowi *fl) | 115 | const struct flowi *fl) |
116 | { | 116 | { |
117 | u32 state_sid; | 117 | u32 state_sid; |
118 | int rc; | 118 | int rc; |