summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorInsu Yun <wuninsu@gmail.com>2015-10-21 14:04:47 +0100
committerDavid Howells <dhowells@redhat.com>2015-10-21 15:18:35 +0100
commit27720e75a7a1597252a81dadcd178331c83af861 (patch)
treef31843c1176e9eb3dfdba8cbab910b3460dd6260 /security
parent48dbc164b40dd9195dea8cd966e394819e420b64 (diff)
downloadlinux-stable-27720e75a7a1597252a81dadcd178331c83af861.tar.gz
linux-stable-27720e75a7a1597252a81dadcd178331c83af861.tar.bz2
linux-stable-27720e75a7a1597252a81dadcd178331c83af861.zip
keys: Be more consistent in selection of union members used
key->description and key->index_key.description are same because they are unioned. But, for readability, using same name for duplication and validation seems better. Signed-off-by: Insu Yun <wuninsu@gmail.com> Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'security')
-rw-r--r--security/keys/key.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/key.c b/security/keys/key.c
index aee2ec5a18fc..c0478465d1ac 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -278,7 +278,7 @@ struct key *key_alloc(struct key_type *type, const char *desc,
key->index_key.desc_len = desclen;
key->index_key.description = kmemdup(desc, desclen + 1, GFP_KERNEL);
- if (!key->description)
+ if (!key->index_key.description)
goto no_memory_3;
atomic_set(&key->usage, 1);