Merge tag 'r8169-upstream-20061204-00' of git://electric-eye.fr.zoreil.com/home/romie...

[linux-2.6-omap-h63xx.git] / security / selinux / include / xfrm.h

diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h
index c10f1fc415026257cdec73e7a1bd99eefb8b876d..161eb571c82dfa471238d1fb5a535b7cdc75c389 100644 (file)
--- a/security/selinux/include/xfrm.h
+++ b/security/selinux/include/xfrm.h
@@ -2,16 +2,23 @@
  * SELinux support for the XFRM LSM hooks
  *
  * Author : Trent Jaeger, <jaegert@us.ibm.com>
+ * Updated : Venkat Yekkirala, <vyekkirala@TrustedCS.com>
  */
 #ifndef _SELINUX_XFRM_H_
 #define _SELINUX_XFRM_H_
 
-int selinux_xfrm_policy_alloc(struct xfrm_policy *xp, struct xfrm_user_sec_ctx *sec_ctx);
+int selinux_xfrm_policy_alloc(struct xfrm_policy *xp,
+               struct xfrm_user_sec_ctx *sec_ctx);
 int selinux_xfrm_policy_clone(struct xfrm_policy *old, struct xfrm_policy *new);
 void selinux_xfrm_policy_free(struct xfrm_policy *xp);
-int selinux_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *sec_ctx);
+int selinux_xfrm_policy_delete(struct xfrm_policy *xp);
+int selinux_xfrm_state_alloc(struct xfrm_state *x,
+       struct xfrm_user_sec_ctx *sec_ctx, u32 secid);
 void selinux_xfrm_state_free(struct xfrm_state *x);
-int selinux_xfrm_policy_lookup(struct xfrm_policy *xp, u32 sk_sid, u8 dir);
+int selinux_xfrm_state_delete(struct xfrm_state *x);
+int selinux_xfrm_policy_lookup(struct xfrm_policy *xp, u32 fl_secid, u8 dir);
+int selinux_xfrm_state_pol_flow_match(struct xfrm_state *x,
+                       struct xfrm_policy *xp, struct flowi *fl);
 
 /*
  * Extract the security blob from the sock (it's actually on the socket)
@@ -24,43 +31,36 @@ static inline struct inode_security_struct *get_sock_isec(struct sock *sk)
        return SOCK_INODE(sk->sk_socket)->i_security;
 }
 
-
-static inline u32 selinux_no_sk_sid(struct flowi *fl)
-{
-       /* NOTE: no sock occurs on ICMP reply, forwards, ... */
-       /* icmp_reply: authorize as kernel packet */
-       if (fl && fl->proto == IPPROTO_ICMP) {
-               return SECINITSID_KERNEL;
-       }
-
-       return SECINITSID_ANY_SOCKET;
-}
-
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
-int selinux_xfrm_sock_rcv_skb(u32 sid, struct sk_buff *skb);
-int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb);
-u32 selinux_socket_getpeer_stream(struct sock *sk);
-u32 selinux_socket_getpeer_dgram(struct sk_buff *skb);
+int selinux_xfrm_sock_rcv_skb(u32 sid, struct sk_buff *skb,
+                       struct avc_audit_data *ad);
+int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb,
+                       struct avc_audit_data *ad, u8 proto);
+int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *sid, int ckall);
 #else
-static inline int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb)
+static inline int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb,
+                       struct avc_audit_data *ad)
 {
        return 0;
 }
 
-static inline int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb)
+static inline int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb,
+                       struct avc_audit_data *ad, u8 proto)
 {
-       return NF_ACCEPT;
+       return 0;
 }
 
-static inline int selinux_socket_getpeer_stream(struct sock *sk)
+static inline int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *sid, int ckall)
 {
-       return SECSID_NULL;
+       *sid = SECSID_NULL;
+       return 0;
 }
+#endif
 
-static inline int selinux_socket_getpeer_dgram(struct sk_buff *skb)
+static inline void selinux_skb_xfrm_sid(struct sk_buff *skb, u32 *sid)
 {
-       return SECSID_NULL;
+       int err = selinux_xfrm_decode_session(skb, sid, 0);
+       BUG_ON(err);
 }
-#endif
 
 #endif /* _SELINUX_XFRM_H_ */