From: Insu Yun <wuninsu@gmail.com>
Date: Wed, 21 Oct 2015 13:04:47 +0000 (+0100)
Subject: keys: Be more consistent in selection of union members used
X-Git-Tag: v4.4-rc1~107^2^2~3
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=27720e75a7a1597252a81dadcd178331c83af861;p=linux-2.6-block.git

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>
---

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);