SELinux: extract the NetLabel SELinux support from the security server

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

diff --git a/security/selinux/include/selinux_netlabel.h b/security/selinux/include/selinux_netlabel.h
index 2a732c9033e37e9b99fe56660cb655c168d865eb..218e3f77c35096f1dd5d37a992191242517e6691 100644 (file)
--- a/security/selinux/include/selinux_netlabel.h
+++ b/security/selinux/include/selinux_netlabel.h
@@ -38,19 +38,22 @@
 
 #ifdef CONFIG_NETLABEL
 void selinux_netlbl_cache_invalidate(void);
-int selinux_netlbl_skbuff_getsid(struct sk_buff *skb, u32 base_sid, u32 *sid);
-int selinux_netlbl_socket_post_create(struct socket *sock);
-void selinux_netlbl_sock_graft(struct sock *sk, struct socket *sock);
-int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec,
-                               struct sk_buff *skb,
-                               struct avc_audit_data *ad);
+
 void selinux_netlbl_sk_security_reset(struct sk_security_struct *ssec,
                                      int family);
 void selinux_netlbl_sk_security_init(struct sk_security_struct *ssec,
                                     int family);
 void selinux_netlbl_sk_security_clone(struct sk_security_struct *ssec,
                                      struct sk_security_struct *newssec);
+
+int selinux_netlbl_skbuff_getsid(struct sk_buff *skb, u32 base_sid, u32 *sid);
+
+void selinux_netlbl_sock_graft(struct sock *sk, struct socket *sock);
+int selinux_netlbl_socket_post_create(struct socket *sock);
 int selinux_netlbl_inode_permission(struct inode *inode, int mask);
+int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec,
+                               struct sk_buff *skb,
+                               struct avc_audit_data *ad);
 int selinux_netlbl_socket_setsockopt(struct socket *sock,
                                     int level,
                                     int optname);
@@ -60,59 +63,53 @@ static inline void selinux_netlbl_cache_invalidate(void)
        return;
 }
 
-static inline int selinux_netlbl_skbuff_getsid(struct sk_buff *skb,
-                                              u32 base_sid,
-                                              u32 *sid)
+static inline void selinux_netlbl_sk_security_reset(
+                                              struct sk_security_struct *ssec,
+                                              int family)
 {
-       *sid = SECSID_NULL;
-       return 0;
+       return;
 }
-
-static inline int selinux_netlbl_socket_post_create(struct socket *sock)
+static inline void selinux_netlbl_sk_security_init(
+                                              struct sk_security_struct *ssec,
+                                              int family)
 {
-       return 0;
+       return;
 }
-
-static inline void selinux_netlbl_sock_graft(struct sock *sk,
-                                            struct socket *sock)
+static inline void selinux_netlbl_sk_security_clone(
+                                           struct sk_security_struct *ssec,
+                                           struct sk_security_struct *newssec)
 {
        return;
 }
 
-static inline int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec,
-                                             struct sk_buff *skb,
-                                             struct avc_audit_data *ad)
+static inline int selinux_netlbl_skbuff_getsid(struct sk_buff *skb,
+                                              u32 base_sid,
+                                              u32 *sid)
 {
+       *sid = SECSID_NULL;
        return 0;
 }
 
-static inline void selinux_netlbl_sk_security_reset(
-                                              struct sk_security_struct *ssec,
-                                              int family)
-{
-       return;
-}
-
-static inline void selinux_netlbl_sk_security_init(
-                                              struct sk_security_struct *ssec,
-                                              int family)
+static inline void selinux_netlbl_sock_graft(struct sock *sk,
+                                            struct socket *sock)
 {
        return;
 }
-
-static inline void selinux_netlbl_sk_security_clone(
-                                          struct sk_security_struct *ssec,
-                                          struct sk_security_struct *newssec)
+static inline int selinux_netlbl_socket_post_create(struct socket *sock)
 {
-       return;
+       return 0;
 }
-
 static inline int selinux_netlbl_inode_permission(struct inode *inode,
                                                  int mask)
 {
        return 0;
 }
-
+static inline int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec,
+                                             struct sk_buff *skb,
+                                             struct avc_audit_data *ad)
+{
+       return 0;
+}
 static inline int selinux_netlbl_socket_setsockopt(struct socket *sock,
                                                   int level,
                                                   int optname)