NetLabel: shift to using SECINITSID_UNLABLED as a base
RFC 1/1 NetLabel: shift to using SECINITSID_UNLABLED as a base
This patch changes NetLabel from using SECINITSID_NETMSG and the parent socket's SID as the for the TE portion of the NetLabel context to now use SECINITSID_UNLABELED. This should address the issues brought up yesterday. Please take a look and let me know if this what you had in mind; if it is acceptable I'll repost this for inclusion.
This patch is independent of the secid patches and should be treated as a bugfix for 2.6.19. A similar patch to deal with the secid case will be coming later today.
security/selinux/ss/services.c +6 -13
@@ -2331,7 +2331,7 @@ static int selinux_netlbl_secattr_to_sidselinux_netlbl_cache_add (skb, &ctx_new);ebitmap_destroy (&ctx_new.range.level[0 ].cat); }else { - *sid =SECINITSID_UNLABELED ; + *sid =SECSID_NULL ; rc =0 ; }
@@ -2514,7 +2514,7 @@ void selinux_netlbl_sock_graft(struct soif (netlbl_sock_getattr (sk, &secattr) ==0 &&selinux_netlbl_secattr_to_sid (NULL , &secattr, - sksec->sid, +SECINITSID_UNLABELED , &nlbl_peer_sid) ==0 ) sksec->peer_sid = nlbl_peer_sid;netlbl_secattr_destroy (&secattr,0 );
@@ -2547,9 +2547,6 @@ u32 selinux_netlbl_inet_conn_request(strif (rc !=0 )return SECSID_NULL ; -if (peer_sid ==SECINITSID_UNLABELED ) -return SECSID_NULL ; -return peer_sid; }
@@ -2611,11 +2608,13 @@ int selinux_netlbl_sock_rcv_skb(struct su32 netlbl_sid;u32 recv_perm; - rc =selinux_netlbl_skbuff_getsid (skb,SECINITSID_NETMSG , &netlbl_sid); + rc =selinux_netlbl_skbuff_getsid (skb, +SECINITSID_UNLABELED , + &netlbl_sid);if (rc !=0 )return rc; -if (netlbl_sid ==SECINITSID_UNLABELED ) +if (netlbl_sid ==SECSID_NULL )return 0 ;switch (sksec->sclass) {
@@ -2653,10 +2652,6 @@ int selinux_netlbl_sock_rcv_skb(struct su32 selinux_netlbl_socket_getpeersec_stream (struct socket *sock) {struct sk_security_struct *sksec = sock->sk->sk_security; - -if (sksec->peer_sid ==SECINITSID_UNLABELED ) -return SECSID_NULL ; -return sksec->peer_sid; }
@@ -2681,8 +2676,6 @@ u32 selinux_netlbl_socket_getpeersec_dgr isec =SOCK_INODE (sk->sk_socket)->i_security;if (selinux_netlbl_skbuff_getsid (skb, isec->sid, &peer_sid) !=0 )return SECSID_NULL ; -if (peer_sid ==SECINITSID_UNLABELED ) -return SECSID_NULL ;return peer_sid; }
Signature · 7 lines
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.
Quoted 8 lines · Paul Moore
This patch changes NetLabel from using
SECINITSID_NETMSGand the parent socket's SID as the for the TE portion of the NetLabel context to now useSECINITSID_UNLABELED. This should address the issues brought up yesterday. Please take a look and let me know if this what you had in mind; if it is acceptable I'll repost this for inclusion.This patch is independent of the secid patches and should be treated as a bugfix for 2.6.19. A similar patch to deal with the secid case will be coming later today.
Testing has shown that this patch is still missing a few pieces. I'll have an updated version later. Sorry about that.
Signature · 7 lines
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.
Quoted 8 lines · Paul Moore
Quoted 6 lines · Paul Moore
This patch changes NetLabel from using
SECINITSID_NETMSGand the parent socket's SID as the for the TE portion of the NetLabel context to now useSECINITSID_UNLABELED. This should address the issues brought up yesterday. Please take a look and let me know if this what you had in mind; if it is acceptable I'll repost this for inclusion.
Quoted 6 lines
Quoted 2 lines
This patch is independent of the secid patches and should be treated as a bugfix for 2.6.19. A similar patch to deal with the secid case will be coming later today.
Testing has shown that this patch is still missing a few pieces. I'll have an updated version later. Sorry about that.
Below is the corrected patch, note the additional changes to selinux_netlbl_socket_getpeersec_dgram().
security/selinux/ss/services.c +9 -20
@@ -2331,7 +2331,7 @@ static int selinux_netlbl_secattr_to_sidselinux_netlbl_cache_add (skb, &ctx_new);ebitmap_destroy (&ctx_new.range.level[0 ].cat); }else { - *sid =SECINITSID_UNLABELED ; + *sid =SECSID_NULL ; rc =0 ; }
@@ -2514,7 +2514,7 @@ void selinux_netlbl_sock_graft(struct soif (netlbl_sock_getattr (sk, &secattr) ==0 &&selinux_netlbl_secattr_to_sid (NULL , &secattr, - sksec->sid, +SECINITSID_UNLABELED , &nlbl_peer_sid) ==0 ) sksec->peer_sid = nlbl_peer_sid;netlbl_secattr_destroy (&secattr,0 );
@@ -2547,9 +2547,6 @@ u32 selinux_netlbl_inet_conn_request(strif (rc !=0 )return SECSID_NULL ; -if (peer_sid ==SECINITSID_UNLABELED ) -return SECSID_NULL ; -return peer_sid; }
@@ -2611,11 +2608,13 @@ int selinux_netlbl_sock_rcv_skb(struct su32 netlbl_sid;u32 recv_perm; - rc =selinux_netlbl_skbuff_getsid (skb,SECINITSID_NETMSG , &netlbl_sid); + rc =selinux_netlbl_skbuff_getsid (skb, +SECINITSID_UNLABELED , + &netlbl_sid);if (rc !=0 )return rc; -if (netlbl_sid ==SECINITSID_UNLABELED ) +if (netlbl_sid ==SECSID_NULL )return 0 ;switch (sksec->sclass) {
@@ -2653,10 +2652,6 @@ int selinux_netlbl_sock_rcv_skb(struct su32 selinux_netlbl_socket_getpeersec_stream (struct socket *sock) {struct sk_security_struct *sksec = sock->sk->sk_security; - -if (sksec->peer_sid ==SECINITSID_UNLABELED ) -return SECSID_NULL ; -return sksec->peer_sid; }
@@ -2672,16 +2667,10 @@ u32 selinux_netlbl_socket_getpeersec_stru32 selinux_netlbl_socket_getpeersec_dgram (struct sk_buff *skb) {int peer_sid; -struct sock *sk = skb->sk; -struct inode_security_struct *isec; - -if (sk ==NULL || sk->sk_socket ==NULL ) -return SECSID_NULL ; - isec =SOCK_INODE (sk->sk_socket)->i_security; -if (selinux_netlbl_skbuff_getsid (skb, isec->sid, &peer_sid) !=0 ) -return SECSID_NULL ; -if (peer_sid ==SECINITSID_UNLABELED ) +if (selinux_netlbl_skbuff_getsid (skb, +SECINITSID_UNLABELED , + &peer_sid) !=0 )return SECSID_NULL ;return peer_sid;
Signature · 7 lines
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.