aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
Diffstat (limited to 'include/net')
-rw-r--r--include/net/cipso_ipv4.h5
-rw-r--r--include/net/netlabel.h13
2 files changed, 18 insertions, 0 deletions
diff --git a/include/net/cipso_ipv4.h b/include/net/cipso_ipv4.h
index 2ce093ba553d..811febf97caf 100644
--- a/include/net/cipso_ipv4.h
+++ b/include/net/cipso_ipv4.h
@@ -207,6 +207,7 @@ void cipso_v4_error(struct sk_buff *skb, int error, u32 gateway);
207int cipso_v4_sock_setattr(struct sock *sk, 207int cipso_v4_sock_setattr(struct sock *sk,
208 const struct cipso_v4_doi *doi_def, 208 const struct cipso_v4_doi *doi_def,
209 const struct netlbl_lsm_secattr *secattr); 209 const struct netlbl_lsm_secattr *secattr);
210void cipso_v4_sock_delattr(struct sock *sk);
210int cipso_v4_sock_getattr(struct sock *sk, struct netlbl_lsm_secattr *secattr); 211int cipso_v4_sock_getattr(struct sock *sk, struct netlbl_lsm_secattr *secattr);
211int cipso_v4_skbuff_setattr(struct sk_buff *skb, 212int cipso_v4_skbuff_setattr(struct sk_buff *skb,
212 const struct cipso_v4_doi *doi_def, 213 const struct cipso_v4_doi *doi_def,
@@ -230,6 +231,10 @@ static inline int cipso_v4_sock_setattr(struct sock *sk,
230 return -ENOSYS; 231 return -ENOSYS;
231} 232}
232 233
234static inline void cipso_v4_sock_delattr(struct sock *sk)
235{
236}
237
233static inline int cipso_v4_sock_getattr(struct sock *sk, 238static inline int cipso_v4_sock_getattr(struct sock *sk,
234 struct netlbl_lsm_secattr *secattr) 239 struct netlbl_lsm_secattr *secattr)
235{ 240{
diff --git a/include/net/netlabel.h b/include/net/netlabel.h
index 3f67e6d49e40..074cad40ac66 100644
--- a/include/net/netlabel.h
+++ b/include/net/netlabel.h
@@ -380,8 +380,12 @@ int netlbl_secattr_catmap_setrng(struct netlbl_lsm_secattr_catmap *catmap,
380int netlbl_enabled(void); 380int netlbl_enabled(void);
381int netlbl_sock_setattr(struct sock *sk, 381int netlbl_sock_setattr(struct sock *sk,
382 const struct netlbl_lsm_secattr *secattr); 382 const struct netlbl_lsm_secattr *secattr);
383void netlbl_sock_delattr(struct sock *sk);
383int netlbl_sock_getattr(struct sock *sk, 384int netlbl_sock_getattr(struct sock *sk,
384 struct netlbl_lsm_secattr *secattr); 385 struct netlbl_lsm_secattr *secattr);
386int netlbl_conn_setattr(struct sock *sk,
387 struct sockaddr *addr,
388 const struct netlbl_lsm_secattr *secattr);
385int netlbl_skbuff_setattr(struct sk_buff *skb, 389int netlbl_skbuff_setattr(struct sk_buff *skb,
386 u16 family, 390 u16 family,
387 const struct netlbl_lsm_secattr *secattr); 391 const struct netlbl_lsm_secattr *secattr);
@@ -449,11 +453,20 @@ static inline int netlbl_sock_setattr(struct sock *sk,
449{ 453{
450 return -ENOSYS; 454 return -ENOSYS;
451} 455}
456static inline void netlbl_sock_delattr(struct sock *sk)
457{
458}
452static inline int netlbl_sock_getattr(struct sock *sk, 459static inline int netlbl_sock_getattr(struct sock *sk,
453 struct netlbl_lsm_secattr *secattr) 460 struct netlbl_lsm_secattr *secattr)
454{ 461{
455 return -ENOSYS; 462 return -ENOSYS;
456} 463}
464static inline int netlbl_conn_setattr(struct sock *sk,
465 struct sockaddr *addr,
466 const struct netlbl_lsm_secattr *secattr)
467{
468 return -ENOSYS;
469}
457static inline int netlbl_skbuff_setattr(struct sk_buff *skb, 470static inline int netlbl_skbuff_setattr(struct sk_buff *skb,
458 u16 family, 471 u16 family,
459 const struct netlbl_lsm_secattr *secattr) 472 const struct netlbl_lsm_secattr *secattr)