Skip to content

Commit

Permalink
KEYS: remove a bogus NULL check
Browse files Browse the repository at this point in the history
We already checked if "desc" was NULL at the beginning of the function
and we've dereferenced it so this causes a static checker warning.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
  • Loading branch information
Dan Carpenter authored and James Morris committed Dec 16, 2014
1 parent d0bffab commit 5057975
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions security/keys/key.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 5057975

Please sign in to comment.