3 files changed, 11 insertions, 12 deletions

diff --git a/security/keys/key.c b/security/keys/key.c
index ccde17aff6..01bcfecb7e 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -115,8 +115,7 @@ struct key_user *key_user_lookup(uid_t uid)
  found:
         atomic_inc(&user->usage);
         spin_unlock(&key_user_lock);
-        if (candidate)
-                kfree(candidate);
+        kfree(candidate);
  out:
         return user;
 
diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index e1cc4dd790..c7a0ab1cfd 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -434,8 +434,8 @@ ascend:
                 if (sp >= KEYRING_SEARCH_MAX_DEPTH)
                         continue;
 
-                if (!key_task_permission(make_key_ref(key, possessed),
-                                         context, KEY_SEARCH) < 0)
+                if (key_task_permission(make_key_ref(key, possessed),
+                                        context, KEY_SEARCH) < 0)
                         continue;
 
                 /* stack the current position */
@@ -621,8 +621,8 @@ struct key *find_keyring_by_name(const char *name, key_serial_t bound)
                         if (strcmp(keyring->description, name) != 0)
                                 continue;
 
-                        if (!key_permission(make_key_ref(keyring, 0),
-                                            KEY_SEARCH) < 0)
+                        if (key_permission(make_key_ref(keyring, 0),
+                                           KEY_SEARCH) < 0)
                                 continue;
 
                         /* found a potential candidate, but we still need to
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index 2f5f539875..0ac311dc83 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -632,22 +632,22 @@ void policydb_destroy(struct policydb *p)
         cond_policydb_destroy(p);
 
         for (tr = p->role_tr; tr; tr = tr->next) {
-                if (ltr) kfree(ltr);
+                kfree(ltr);
                 ltr = tr;
         }
-        if (ltr) kfree(ltr);
+        kfree(ltr);
 
         for (ra = p->role_allow; ra; ra = ra -> next) {
-                if (lra) kfree(lra);
+                kfree(lra);
                 lra = ra;
         }
-        if (lra) kfree(lra);
+        kfree(lra);
 
         for (rt = p->range_tr; rt; rt = rt -> next) {
-                if (lrt) kfree(lrt);
+                kfree(lrt);
                 lrt = rt;
         }
-        if (lrt) kfree(lrt);
+        kfree(lrt);
 
         if (p->type_attr_map) {
                 for (i = 0; i < p->p_types.nprim; i++)