diff options
Diffstat (limited to 'security/selinux/include')
-rw-r--r-- | security/selinux/include/xfrm.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h index 8e329ddb5e37..27502365d706 100644 --- a/security/selinux/include/xfrm.h +++ b/security/selinux/include/xfrm.h | |||
@@ -39,7 +39,6 @@ int selinux_xfrm_sock_rcv_skb(u32 sid, struct sk_buff *skb, | |||
39 | struct avc_audit_data *ad); | 39 | struct avc_audit_data *ad); |
40 | int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb, | 40 | int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb, |
41 | struct avc_audit_data *ad); | 41 | struct avc_audit_data *ad); |
42 | u32 selinux_socket_getpeer_stream(struct sock *sk); | ||
43 | u32 selinux_socket_getpeer_dgram(struct sk_buff *skb); | 42 | u32 selinux_socket_getpeer_dgram(struct sk_buff *skb); |
44 | int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *sid, int ckall); | 43 | int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *sid, int ckall); |
45 | #else | 44 | #else |
@@ -55,11 +54,6 @@ static inline int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb, | |||
55 | return 0; | 54 | return 0; |
56 | } | 55 | } |
57 | 56 | ||
58 | static inline int selinux_socket_getpeer_stream(struct sock *sk) | ||
59 | { | ||
60 | return SECSID_NULL; | ||
61 | } | ||
62 | |||
63 | static inline int selinux_socket_getpeer_dgram(struct sk_buff *skb) | 57 | static inline int selinux_socket_getpeer_dgram(struct sk_buff *skb) |
64 | { | 58 | { |
65 | return SECSID_NULL; | 59 | return SECSID_NULL; |
@@ -71,4 +65,10 @@ static inline int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *sid, int | |||
71 | } | 65 | } |
72 | #endif | 66 | #endif |
73 | 67 | ||
68 | static inline void selinux_skb_xfrm_sid(struct sk_buff *skb, u32 *sid) | ||
69 | { | ||
70 | int err = selinux_xfrm_decode_session(skb, sid, 0); | ||
71 | BUG_ON(err); | ||
72 | } | ||
73 | |||
74 | #endif /* _SELINUX_XFRM_H_ */ | 74 | #endif /* _SELINUX_XFRM_H_ */ |