Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull security subsystem fixes from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  KEYS: remove a bogus NULL check
  ima: Fix build failure on powerpc when TCG_IBMVTPM dependencies are not met
  KEYS: Fix stale key registration at error path

1 files changed, 4 insertions, 6 deletions

diff --git a/security/keys/key.c b/security/keys/key.c
index e17ba6aefdc0..aee2ec5a18fc 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -276,12 +276,10 @@ struct key *key_alloc(struct key_type *type, const char *desc,
         if (!key)
                 goto no_memory_2;
 
-        if (desc) {
-                key->index_key.desc_len = desclen;
-                key->index_key.description = kmemdup(desc, desclen + 1, GFP_KERNEL);
-                if (!key->description)
-                        goto no_memory_3;
-        }
+        key->index_key.desc_len = desclen;
+        key->index_key.description = kmemdup(desc, desclen + 1, GFP_KERNEL);
+        if (!key->description)
+                goto no_memory_3;
 
         atomic_set(&key->usage, 1);
         init_rwsem(&key->sem);