diff options
Diffstat (limited to 'security/selinux/include/netlabel.h')
-rw-r--r-- | security/selinux/include/netlabel.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/security/selinux/include/netlabel.h b/security/selinux/include/netlabel.h index b3e6ae071fc3..982bac0ac328 100644 --- a/security/selinux/include/netlabel.h +++ b/security/selinux/include/netlabel.h | |||
@@ -52,7 +52,7 @@ int selinux_netlbl_skbuff_setsid(struct sk_buff *skb, | |||
52 | u16 family, | 52 | u16 family, |
53 | u32 sid); | 53 | u32 sid); |
54 | 54 | ||
55 | void selinux_netlbl_sock_graft(struct sock *sk, struct socket *sock); | 55 | void selinux_netlbl_inet_conn_established(struct sock *sk, u16 family); |
56 | int selinux_netlbl_socket_post_create(struct socket *sock); | 56 | int selinux_netlbl_socket_post_create(struct socket *sock); |
57 | int selinux_netlbl_inode_permission(struct inode *inode, int mask); | 57 | int selinux_netlbl_inode_permission(struct inode *inode, int mask); |
58 | int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec, | 58 | int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec, |
@@ -62,6 +62,8 @@ int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec, | |||
62 | int selinux_netlbl_socket_setsockopt(struct socket *sock, | 62 | int selinux_netlbl_socket_setsockopt(struct socket *sock, |
63 | int level, | 63 | int level, |
64 | int optname); | 64 | int optname); |
65 | int selinux_netlbl_socket_connect(struct sock *sk, struct sockaddr *addr); | ||
66 | |||
65 | #else | 67 | #else |
66 | static inline void selinux_netlbl_cache_invalidate(void) | 68 | static inline void selinux_netlbl_cache_invalidate(void) |
67 | { | 69 | { |
@@ -98,8 +100,14 @@ static inline int selinux_netlbl_skbuff_setsid(struct sk_buff *skb, | |||
98 | return 0; | 100 | return 0; |
99 | } | 101 | } |
100 | 102 | ||
101 | static inline void selinux_netlbl_sock_graft(struct sock *sk, | 103 | static inline int selinux_netlbl_conn_setsid(struct sock *sk, |
102 | struct socket *sock) | 104 | struct sockaddr *addr) |
105 | { | ||
106 | return 0; | ||
107 | } | ||
108 | |||
109 | static inline void selinux_netlbl_inet_conn_established(struct sock *sk, | ||
110 | u16 family) | ||
103 | { | 111 | { |
104 | return; | 112 | return; |
105 | } | 113 | } |
@@ -125,6 +133,11 @@ static inline int selinux_netlbl_socket_setsockopt(struct socket *sock, | |||
125 | { | 133 | { |
126 | return 0; | 134 | return 0; |
127 | } | 135 | } |
136 | static inline int selinux_netlbl_socket_connect(struct sock *sk, | ||
137 | struct sockaddr *addr) | ||
138 | { | ||
139 | return 0; | ||
140 | } | ||
128 | #endif /* CONFIG_NETLABEL */ | 141 | #endif /* CONFIG_NETLABEL */ |
129 | 142 | ||
130 | #endif | 143 | #endif |