selinux: Cleanup the socket handling functions
PATCH 1/1 selinux: Cleanup the socket handling functions
A few small cleanups to the SELinux sock/socket hooks:
* Remove sk_alloc_security() by moving the code into the selinux_sk_alloc_security() hook, move the selinux_netlbl_sk_security_reset() up above the sk->sk_security assignment while we are at it
* Remove sk_free_security() by movingthe code into the selinux_sk_free_security() hook
* Make use of current_security() in selinux_socket_create() and selinux_socket_post_create()
Signed-off-by Paul Moore <[email protected]>
---
security/selinux/hooks.c | 59 ++++++++++++++++------------------------------ 1 files changed, 21 insertions(+), 38 deletions(-)
security/selinux/hooks.c +21 -38
@@ -298,32 +298,6 @@ static void superblock_free_security(struct super_block *sb)kfree (sbsec); } -static int sk_alloc_security (struct sock *sk,int family,gfp_t priority) -{ -struct sk_security_struct *ssec; - - ssec =kzalloc (sizeof (*ssec), priority); -if (!ssec) -return -ENOMEM ; - - ssec->peer_sid =SECINITSID_UNLABELED ; - ssec->sid =SECINITSID_UNLABELED ; - sk->sk_security = ssec; - -selinux_netlbl_sk_security_reset (ssec); - -return 0 ; -} - -static void sk_free_security (struct sock *sk) -{ -struct sk_security_struct *ssec = sk->sk_security; - - sk->sk_security =NULL ; -selinux_netlbl_sk_security_free (ssec); -kfree (ssec); -} -/* The security server must be initialized before any labeling or access decisions can be provided. */ extern int ss_initialized;
@@ -3651,30 +3625,24 @@ out:static int selinux_socket_create (int family,int type,int protocol,int kern) { -const struct cred *cred =current_cred (); -const struct task_security_struct *tsec = cred->security; +const struct task_security_struct *tsec =current_security ();u32 sid, newsid;u16 secclass; -int err =0 ;if (kern) - goto out; +return 0 ; sid = tsec->sid; newsid = tsec->sockcreate_sid ?: sid; - secclass =socket_type_to_security_class (family, type, protocol); - err =avc_has_perm (sid, newsid, secclass,SOCKET__CREATE ,NULL ); -out: -return err; +return avc_has_perm (sid, newsid, secclass,SOCKET__CREATE ,NULL ); }static int selinux_socket_post_create (struct socket *sock,int family,int type,int protocol,int kern) { -const struct cred *cred =current_cred (); -const struct task_security_struct *tsec = cred->security; +const struct task_security_struct *tsec =current_security ();struct inode_security_struct *isec;struct sk_security_struct *sksec;u32 sid, newsid;
@@ -4189,12 +4157,27 @@ out:static int selinux_sk_alloc_security (struct sock *sk,int family,gfp_t priority) { -return sk_alloc_security (sk, family, priority); +struct sk_security_struct *ssec; + + ssec =kzalloc (sizeof (*ssec), priority); +if (!ssec) +return -ENOMEM ; + + ssec->peer_sid =SECINITSID_UNLABELED ; + ssec->sid =SECINITSID_UNLABELED ; +selinux_netlbl_sk_security_reset (ssec); + sk->sk_security = ssec; + +return 0 ; }static void selinux_sk_free_security (struct sock *sk) { -sk_free_security (sk); +struct sk_security_struct *ssec = sk->sk_security; + + sk->sk_security =NULL ; +selinux_netlbl_sk_security_free (ssec); +kfree (ssec); }static void selinux_sk_clone_security (const struct sock *sk,struct sock *newsk)
--
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.