Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit e33f770426674a565a188042caf3f974f8b3722d

Authored by David S. Miller
1 parent e1ad2ab2cf
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

xfrm: Mark flowi arg to security_xfrm_state_pol_flow_match() const. 

Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 5 changed files with 9 additions and 7 deletions Side-by-side Diff

include/linux/security.h
Diff comments   View file @ e33f770
... ... @@ -1623,7 +1623,7 @@
1623 1623 int (*xfrm_policy_lookup) (struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir);
1624 1624 int (*xfrm_state_pol_flow_match) (struct xfrm_state *x,
1625 1625 struct xfrm_policy *xp,
1626   - struct flowi *fl);
  1626 + const struct flowi *fl);
1627 1627 int (*xfrm_decode_session) (struct sk_buff *skb, u32 *secid, int ckall);
1628 1628 #endif /* CONFIG_SECURITY_NETWORK_XFRM */
1629 1629  
... ... @@ -2761,7 +2761,8 @@
2761 2761 void security_xfrm_state_free(struct xfrm_state *x);
2762 2762 int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir);
2763 2763 int security_xfrm_state_pol_flow_match(struct xfrm_state *x,
2764   - struct xfrm_policy *xp, struct flowi *fl);
  2764 + struct xfrm_policy *xp,
  2765 + const struct flowi *fl);
2765 2766 int security_xfrm_decode_session(struct sk_buff *skb, u32 *secid);
2766 2767 void security_skb_classify_flow(struct sk_buff *skb, struct flowi *fl);
2767 2768  
... ... @@ -2813,7 +2814,7 @@
2813 2814 }
2814 2815  
2815 2816 static inline int security_xfrm_state_pol_flow_match(struct xfrm_state *x,
2816   - struct xfrm_policy *xp, struct flowi *fl)
  2817 + struct xfrm_policy *xp, const struct flowi *fl)
2817 2818 {
2818 2819 return 1;
2819 2820 }
security/capability.c
Diff comments   View file @ e33f770
... ... @@ -760,7 +760,7 @@
760 760  
761 761 static int cap_xfrm_state_pol_flow_match(struct xfrm_state *x,
762 762 struct xfrm_policy *xp,
763   - struct flowi *fl)
  763 + const struct flowi *fl)
764 764 {
765 765 return 1;
766 766 }
... ... @@ -1233,7 +1233,8 @@
1233 1233 }
1234 1234  
1235 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 1239 return security_ops->xfrm_state_pol_flow_match(x, xp, fl);
1239 1240 }
security/selinux/include/xfrm.h
Diff comments   View file @ e33f770
... ... @@ -19,7 +19,7 @@
19 19 int selinux_xfrm_state_delete(struct xfrm_state *x);
20 20 int selinux_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir);
21 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 25 * Extract the security blob from the sock (it's actually on the socket)
security/selinux/xfrm.c
Diff comments   View file @ e33f770
... ... @@ -112,7 +112,7 @@
112 112 */
113 113  
114 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 117 u32 state_sid;
118 118 int rc;