Merge tag 'for-linus-2' of git://git.code.sf.net/p/openipmi/linux-ipmi

[cascardo/linux.git] / security / keys / key.c

diff --git a/security/keys/key.c b/security/keys/key.c
index e17ba6a..aee2ec5 100644 (file)
--- 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);