selinux: add likely hints for fast paths

In the network hashtable lookup code add likely() compiler hints in the
fast path, like already done in sel_netif_sid().

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>

diff --git a/security/selinux/ibpkey.c b/security/selinux/ibpkey.c
index 48f537b41c583235d08bf2985c4fb45da9078bec..94f3eef22bad712e217efcceb716410cf3e21c4a 100644 (file)
--- a/security/selinux/ibpkey.c
+++ b/security/selinux/ibpkey.c
@@ -184,7 +184,7 @@ int sel_ib_pkey_sid(u64 subnet_prefix, u16 pkey_num, u32 *sid)
 
        rcu_read_lock();
        pkey = sel_ib_pkey_find(subnet_prefix, pkey_num);
-       if (pkey) {
+       if (likely(pkey)) {
                *sid = pkey->psec.sid;
                rcu_read_unlock();
                return 0;

diff --git a/security/selinux/netnode.c b/security/selinux/netnode.c
index b7900d5ae557ca276e2e100573b195dcbe0dd108..8bb456d80dd54025955de65a24b69013b7eab8c9 100644 (file)
--- a/security/selinux/netnode.c
+++ b/security/selinux/netnode.c
@@ -253,7 +253,7 @@ int sel_netnode_sid(const void *addr, u16 family, u32 *sid)
 
        rcu_read_lock();
        node = sel_netnode_find(addr, family);
-       if (node != NULL) {
+       if (likely(node != NULL)) {
                *sid = node->nsec.sid;
                rcu_read_unlock();
                return 0;

diff --git a/security/selinux/netport.c b/security/selinux/netport.c
index 2e22ad9c2bd0d116668985e0fb579b5934df9394..7d2207384d401a1f39ff1690f0adb557c4ea34e3 100644 (file)
--- a/security/selinux/netport.c
+++ b/security/selinux/netport.c
@@ -186,7 +186,7 @@ int sel_netport_sid(u8 protocol, u16 pnum, u32 *sid)
 
        rcu_read_lock();
        port = sel_netport_find(protocol, pnum);
-       if (port != NULL) {
+       if (likely(port != NULL)) {
                *sid = port->psec.sid;
                rcu_read_unlock();
                return 0;