diff options
Diffstat (limited to 'security/selinux/include')
| -rw-r--r-- | security/selinux/include/selinux_netlabel.h | 10 | ||||
| -rw-r--r-- | security/selinux/include/xfrm.h | 3 | 
2 files changed, 12 insertions, 1 deletions
| diff --git a/security/selinux/include/selinux_netlabel.h b/security/selinux/include/selinux_netlabel.h index ecab4bddaaf..9de10cc2cef 100644 --- a/security/selinux/include/selinux_netlabel.h +++ b/security/selinux/include/selinux_netlabel.h @@ -53,6 +53,9 @@ void selinux_netlbl_sk_security_init(struct sk_security_struct *ssec,  void selinux_netlbl_sk_clone_security(struct sk_security_struct *ssec,  				      struct sk_security_struct *newssec);  int selinux_netlbl_inode_permission(struct inode *inode, int mask); +int selinux_netlbl_socket_setsockopt(struct socket *sock, +				     int level, +				     int optname);  #else  static inline void selinux_netlbl_cache_invalidate(void)  { @@ -114,6 +117,13 @@ static inline int selinux_netlbl_inode_permission(struct inode *inode,  {  	return 0;  } + +static inline int selinux_netlbl_socket_setsockopt(struct socket *sock, +						   int level, +						   int optname) +{ +	return 0; +}  #endif /* CONFIG_NETLABEL */  #endif diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h index 81eb5989016..526b28019ac 100644 --- a/security/selinux/include/xfrm.h +++ b/security/selinux/include/xfrm.h @@ -19,7 +19,8 @@ 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); -int selinux_xfrm_flow_state_match(struct flowi *fl, struct xfrm_state *xfrm); +int selinux_xfrm_flow_state_match(struct flowi *fl, struct xfrm_state *xfrm, +			struct xfrm_policy *xp);  /* | 
