Consolidate of_get_parent

[karo-tx-linux.git] / security / selinux / netlabel.c

diff --git a/security/selinux/netlabel.c b/security/selinux/netlabel.c
index 8192e8bc9f5aa6665ce37fc219981bab206bb6b9..051b14c88e2dbde9b4acef924594b42a3a3e4087 100644 (file)
--- a/security/selinux/netlabel.c
+++ b/security/selinux/netlabel.c
@@ -155,6 +155,11 @@ int selinux_netlbl_skbuff_getsid(struct sk_buff *skb, u32 base_sid, u32 *sid)
        int rc;
        struct netlbl_lsm_secattr secattr;
 
+       if (!netlbl_enabled()) {
+               *sid = SECSID_NULL;
+               return 0;
+       }
+
        netlbl_secattr_init(&secattr);
        rc = netlbl_skbuff_getattr(skb, &secattr);
        if (rc == 0 && secattr.flags != NETLBL_SECATTR_NONE)
@@ -295,12 +300,22 @@ int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec,
        int rc;
        u32 nlbl_sid;
        u32 perm;
+       struct netlbl_lsm_secattr secattr;
+
+       if (!netlbl_enabled())
+               return 0;
 
-       rc = selinux_netlbl_skbuff_getsid(skb, SECINITSID_NETMSG, &nlbl_sid);
+       netlbl_secattr_init(&secattr);
+       rc = netlbl_skbuff_getattr(skb, &secattr);
+       if (rc == 0 && secattr.flags != NETLBL_SECATTR_NONE)
+               rc = security_netlbl_secattr_to_sid(&secattr,
+                                                   SECINITSID_NETMSG,
+                                                   &nlbl_sid);
+       else
+               nlbl_sid = SECINITSID_UNLABELED;
+       netlbl_secattr_destroy(&secattr);
        if (rc != 0)
                return rc;
-       if (nlbl_sid == SECSID_NULL)
-               nlbl_sid = SECINITSID_UNLABELED;
 
        switch (sksec->sclass) {
        case SECCLASS_UDP_SOCKET: