2 files changed, 16 insertions, 19 deletions

diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 7bd296cca041..46f23971f7e4 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -508,12 +508,11 @@ int devcgroup_inode_permission(struct inode *inode, int mask)
                 return 0;
         if (!S_ISBLK(inode->i_mode) && !S_ISCHR(inode->i_mode))
                 return 0;
-        dev_cgroup = css_to_devcgroup(task_subsys_state(current,
-                                devices_subsys_id));
-        if (!dev_cgroup)
-                return 0;
 
         rcu_read_lock();
+
+        dev_cgroup = task_devcgroup(current);
+
         list_for_each_entry_rcu(wh, &dev_cgroup->whitelist, list) {
                 if (wh->type & DEV_ALL)
                         goto acc_check;
@@ -533,6 +532,7 @@ acc_check:
                 rcu_read_unlock();
                 return 0;
         }
+
         rcu_read_unlock();
 
         return -EPERM;
@@ -543,12 +543,10 @@ int devcgroup_inode_mknod(int mode, dev_t dev)
         struct dev_cgroup *dev_cgroup;
         struct dev_whitelist_item *wh;
 
-        dev_cgroup = css_to_devcgroup(task_subsys_state(current,
-                                devices_subsys_id));
-        if (!dev_cgroup)
-                return 0;
-
         rcu_read_lock();
+
+        dev_cgroup = task_devcgroup(current);
+
         list_for_each_entry(wh, &dev_cgroup->whitelist, list) {
                 if (wh->type & DEV_ALL)
                         goto acc_check;
@@ -566,6 +564,8 @@ acc_check:
                 rcu_read_unlock();
                 return 0;
         }
+
         rcu_read_unlock();
+
         return -EPERM;
 }
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index b52f923ce680..8551952ef329 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -811,11 +811,12 @@ static int string_to_context_struct(struct policydb *pol,
         /* Check the validity of the new context. */
         if (!policydb_context_isvalid(pol, ctx)) {
                 rc = -EINVAL;
-                context_destroy(ctx);
                 goto out;
         }
         rc = 0;
 out:
+        if (rc)
+                context_destroy(ctx);
         return rc;
 }
 
@@ -868,8 +869,7 @@ static int security_context_to_sid_core(const char *scontext, u32 scontext_len,
         } else if (rc)
                 goto out;
         rc = sidtab_context_to_sid(&sidtab, &context, sid);
-        if (rc)
-                context_destroy(&context);
+        context_destroy(&context);
 out:
         read_unlock(&policy_rwlock);
         kfree(scontext2);
@@ -2737,6 +2737,7 @@ int security_netlbl_secattr_to_sid(struct netlbl_lsm_secattr *secattr,
                 if (ctx == NULL)
                         goto netlbl_secattr_to_sid_return;
 
+                context_init(&ctx_new);
                 ctx_new.user = ctx->user;
                 ctx_new.role = ctx->role;
                 ctx_new.type = ctx->type;
@@ -2745,13 +2746,9 @@ int security_netlbl_secattr_to_sid(struct netlbl_lsm_secattr *secattr,
                         if (ebitmap_netlbl_import(&ctx_new.range.level[0].cat,
                                                   secattr->attr.mls.cat) != 0)
                                 goto netlbl_secattr_to_sid_return;
-                        ctx_new.range.level[1].cat.highbit =
-                                ctx_new.range.level[0].cat.highbit;
-                        ctx_new.range.level[1].cat.node =
-                                ctx_new.range.level[0].cat.node;
-                } else {
-                        ebitmap_init(&ctx_new.range.level[0].cat);
-                        ebitmap_init(&ctx_new.range.level[1].cat);
+                        memcpy(&ctx_new.range.level[1].cat,
+                               &ctx_new.range.level[0].cat,
+                               sizeof(ctx_new.range.level[0].cat));
                 }
                 if (mls_context_isvalid(&policydb, &ctx_new) != 1)
                         goto netlbl_secattr_to_sid_return_cleanup;