Merge branches 'pxa' and 'orion-fixes1'

[linux-2.6] / security / selinux / netnode.c

diff --git a/security/selinux/netnode.c b/security/selinux/netnode.c
index 49c5277992405b8301e45c5edc6b476180718ced..2edc4c5e0c619ab532ff63763ef455a210e44fee 100644 (file)
--- a/security/selinux/netnode.c
+++ b/security/selinux/netnode.c
@@ -264,8 +264,12 @@ static int sel_netnode_sid_slow(void *addr, u16 family, u32 *sid)
 
 out:
        spin_unlock_bh(&sel_netnode_lock);
-       if (ret != 0)
+       if (unlikely(ret)) {
+               printk(KERN_WARNING
+                      "SELinux: failure in sel_netnode_sid_slow(),"
+                      " unable to determine network node label\n");
                kfree(new);
+       }
        return ret;
 }
 
@@ -340,7 +344,7 @@ static __init int sel_netnode_init(void)
                INIT_LIST_HEAD(&sel_netnode_hash[iter]);
 
        ret = avc_add_callback(sel_netnode_avc_callback, AVC_CALLBACK_RESET,
-                              SECSID_NULL, SECSID_NULL, SECCLASS_NULL, 0);
+                              SECSID_NULL, SECSID_NULL, SECCLASS_NULL, 0);
        if (ret != 0)
                panic("avc_add_callback() failed, error %d\n", ret);