1 files changed, 4 insertions, 12 deletions

diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index 03140edf97a3..d572dc908f31 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -353,12 +353,8 @@ static int context_struct_compute_av(struct context *scontext,
         avkey.specified = AVTAB_AV;
         sattr = &policydb.type_attr_map[scontext->type - 1];
         tattr = &policydb.type_attr_map[tcontext->type - 1];
-        ebitmap_for_each_bit(sattr, snode, i) {
-                if (!ebitmap_node_get_bit(snode, i))
-                        continue;
-                ebitmap_for_each_bit(tattr, tnode, j) {
-                        if (!ebitmap_node_get_bit(tnode, j))
-                                continue;
+        ebitmap_for_each_positive_bit(sattr, snode, i) {
+                ebitmap_for_each_positive_bit(tattr, tnode, j) {
                         avkey.source_type = i + 1;
                         avkey.target_type = j + 1;
                         for (node = avtab_search_node(&policydb.te_avtab, &avkey);
@@ -1668,14 +1664,10 @@ int security_get_user_sids(u32 fromsid,
                 goto out_unlock;
         }
 
-        ebitmap_for_each_bit(&user->roles, rnode, i) {
-                if (!ebitmap_node_get_bit(rnode, i))
-                        continue;
+        ebitmap_for_each_positive_bit(&user->roles, rnode, i) {
                 role = policydb.role_val_to_struct[i];
                 usercon.role = i+1;
-                ebitmap_for_each_bit(&role->types, tnode, j) {
-                        if (!ebitmap_node_get_bit(tnode, j))
-                                continue;
+                ebitmap_for_each_positive_bit(&role->types, tnode, j) {
                         usercon.type = j+1;
 
                         if (mls_setup_user_range(fromcon, user, &usercon))