One more time ...
Subsystems (3)
v3 cover One more time ...
Version 3 of the NetLabel support for the secid patchset. This version takes into account comments made by Stephen Smalley.
--
paul moore
linux security @ hp
--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
PATCH v3 1/1 NetLabel: secid reconciliation support
This patch provides the missing NetLabel support to the secid reconciliation patchset.
--- security/selinux/hooks.c | 80 ++++++++++++++------- security/selinux/include/objsec.h | 1 security/selinux/include/selinux_netlabel.h | 28 +++---- security/selinux/ss/services.c | 106 ++++++++++------------------ 4 files changed, 107 insertions(+), 108 deletions(-)
security/selinux/hooks.c +53 -27
@@ -3465,6 +3465,10 @@ static int selinux_sock_rcv_skb_compat(s goto out; } + err =selinux_netlbl_sock_rcv_skb (sock_sid, sock_class, skb, ad); +if (err) + goto out; + err =selinux_xfrm_sock_rcv_skb (sock_sid, skb, ad); out:
@@ -3501,10 +3505,7 @@ static int selinux_socket_sock_rcv_skb(selse err =avc_has_perm (sksec->sid, skb->secmark,SECCLASS_PACKET ,PACKET__RECV , &ad); -if (err) - goto out; - err =selinux_netlbl_sock_rcv_skb (sksec, skb, &ad); out:return err; }
@@ -3527,11 +3528,8 @@ static int selinux_socket_getpeersec_str peer_sid = ssec->peer_sid; }else if (isec->sclass ==SECCLASS_TCP_SOCKET ) { - peer_sid =selinux_netlbl_socket_getpeersec_stream (sock); -if (peer_sid ==SECSID_NULL ) { - ssec = sock->sk->sk_security; - peer_sid = ssec->peer_sid; - } + ssec = sock->sk->sk_security; + peer_sid = ssec->peer_sid;if (peer_sid ==SECSID_NULL ) { err = -ENOPROTOOPT ; goto out;
@@ -3573,13 +3571,13 @@ static int selinux_socket_getpeersec_dgrif (sock && (sock->sk->sk_family ==PF_UNIX ))selinux_get_inode_sid (SOCK_INODE (sock), &peer_secid);else if (skb) { - peer_secid =selinux_netlbl_socket_getpeersec_dgram (skb); -if (peer_secid ==SECSID_NULL ) { -if (selinux_compat_net) +if (selinux_compat_net) { + peer_secid =selinux_netlbl_socket_getpeersec_dgram ( + skb); +if (peer_secid ==SECSID_NULL ) peer_secid =selinux_socket_getpeer_dgram (skb); -else - peer_secid = skb->secmark; - } + }else + peer_secid = skb->secmark; }if (peer_secid ==SECSID_NULL )
@@ -3641,13 +3639,11 @@ static int selinux_inet_conn_request(stru32 newsid;u32 peersid; - newsid =selinux_netlbl_inet_conn_request (skb, sksec->sid); -if (newsid !=SECSID_NULL ) { - req->secid = newsid; -return 0 ; - } -if (selinux_compat_net) { + err =selinux_netlbl_skb_sid (skb, sksec->sid, &peersid); +if (err ==0 && peersid !=SECSID_NULL ) + goto out; + err =selinux_xfrm_decode_session (skb, &peersid,0 );BUG_ON (err);
@@ -3659,6 +3655,7 @@ static int selinux_inet_conn_request(str }else peersid = skb->secmark; +out: err =security_sid_mls_copy (sksec->sid, peersid, &newsid);if (err)return err;
@@ -3700,6 +3697,8 @@ static void selinux_req_classify_flow(costatic int selinux_skb_flow_in (struct sk_buff *skb,unsigned short family) {u32 xfrm_sid; +u32 nlbl_sid; +u32 ext_sid;int err;if (selinux_compat_net)
@@ -3717,15 +3716,27 @@ static int selinux_skb_flow_in(struct sk err =selinux_xfrm_decode_session (skb, &xfrm_sid,0 );BUG_ON (err); - err =avc_has_perm (xfrm_sid, skb->secmark,SECCLASS_PACKET , -PACKET__FLOW_IN ,NULL ); + err =selinux_netlbl_skb_sid (skb, + xfrm_sid ? xfrm_sid : skb->secmark, + &nlbl_sid);if (err) goto out; -if (xfrm_sid) - skb->secmark = xfrm_sid; +if (nlbl_sid) + ext_sid = nlbl_sid; +else + ext_sid = xfrm_sid; -/* See if NetLabel can flow in thru the current secmark here */ + err =avc_has_perm (ext_sid, + skb->secmark, +SECCLASS_PACKET , +PACKET__FLOW_IN , +NULL ); +if (err) + goto out; + +if (ext_sid) + skb->secmark = ext_sid; out:return err ?0 :1 ;
@@ -3740,10 +3751,16 @@ static int selinux_skb_flow_out(struct sif (!skb->secmark) {u32 xfrm_sid; +u32 nlbl_sid; + err =selinux_netlbl_skb_sid (skb, skb->secmark, &nlbl_sid); +if (err) + goto out;selinux_skb_xfrm_sid (skb, &xfrm_sid); -if (xfrm_sid) +if (nlbl_sid) + skb->secmark = nlbl_sid; +else if (xfrm_sid) skb->secmark = xfrm_sid;else if (skb->sk) {struct sk_security_struct *sksec = skb->sk->sk_security;
@@ -3754,6 +3771,7 @@ static int selinux_skb_flow_out(struct s err =avc_has_perm (skb->secmark, nf_secid,SECCLASS_PACKET ,PACKET__FLOW_OUT ,NULL ); +out:return err ?0 :1 ; }
@@ -3903,10 +3921,18 @@ static unsigned int selinux_ip_postrouteelse {if (!skb->secmark) {u32 xfrm_sid; +u32 nlbl_sid; + err =selinux_netlbl_skb_sid (skb, + skb->secmark, + &nlbl_sid); +if (err) + goto out;selinux_skb_xfrm_sid (skb, &xfrm_sid); -if (xfrm_sid) +if (nlbl_sid) + skb->secmark = nlbl_sid; +else if (xfrm_sid) skb->secmark = xfrm_sid;else if (skb->sk) { struct sk_security_struct *sksec =
security/selinux/include/objsec.h +0 -1
@@ -102,7 +102,6 @@ struct sk_security_struct {u32 sid;/* SID of this object */ u32 peer_sid;/* SID of peer */ #ifdef CONFIG_NETLABEL -u16 sclass;/* sock security class */ enum {/* NetLabel state */ NLBL_UNSET =0 , NLBL_REQUIRE,
security/selinux/include/selinux_netlabel.h +13 -15
@@ -42,17 +42,17 @@ int selinux_netlbl_socket_post_create(stint sock_family, u32 sid);void selinux_netlbl_sock_graft (struct sock *sk,struct socket *sock); -u32 selinux_netlbl_inet_conn_request (struct sk_buff *skb,u32 sock_sid); -int selinux_netlbl_sock_rcv_skb (struct sk_security_struct *sksec, +int selinux_netlbl_sock_rcv_skb (u32 sock_sid, +u16 sock_class,struct sk_buff *skb,struct avc_audit_data *ad); -u32 selinux_netlbl_socket_getpeersec_stream (struct socket *sock);u32 selinux_netlbl_socket_getpeersec_dgram (struct sk_buff *skb);void selinux_netlbl_sk_security_init (struct sk_security_struct *ssec,int family);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_skb_sid (struct sk_buff *skb,u32 base_sid,u32 *sid);#else static inline void selinux_netlbl_cache_invalidate (void ) {
@@ -72,24 +72,14 @@ static inline void selinux_netlbl_sock_greturn ; } -static inline u32 selinux_netlbl_inet_conn_request (struct sk_buff *skb, -u32 sock_sid) -{ -return SECSID_NULL ; -} - -static inline int selinux_netlbl_sock_rcv_skb (struct sk_security_struct *sksec, +static inline int selinux_netlbl_sock_rcv_skb (u32 sock_sid, +u16 sock_class,struct sk_buff *skb,struct avc_audit_data *ad) {return 0 ; } -static inline u32 selinux_netlbl_socket_getpeersec_stream (struct socket *sock) -{ -return SECSID_NULL ; -} -static inline u32 selinux_netlbl_socket_getpeersec_dgram (struct sk_buff *skb) {return SECSID_NULL ;
@@ -114,6 +104,14 @@ static inline int selinux_netlbl_inode_p {return 0 ; } + +static inline int selinux_netlbl_skb_sid (struct sk_buff *skb, +u32 base_sid, +u32 *sid) +{ + *sid =SECSID_NULL ; +return 0 ; +}#endif /* CONFIG_NETLABEL */ #endif
security/selinux/ss/services.c +41 -65
180 lines not on this page · raw message
--
paul moore
linux security @ hp
--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.