From: Eric Biggers <ebiggers@google.com>
Date: Wed, 29 May 2019 21:01:52 +0000 (-0700)
Subject: keys: Reuse keyring_index_key::desc_len in lookup_user_key()
X-Git-Tag: for-linus-20190715~49^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=47546208657f28007f41574c2d27a3fe760f987d;p=linux-2.6-block.git

keys: Reuse keyring_index_key::desc_len in lookup_user_key()

When lookup_user_key() checks whether the key is possessed, it should
use the key's existing index_key including the 'desc_len' field, rather
than recomputing the 'desc_len'.  This doesn't change the behavior; this
way is just simpler and faster.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: James Morris <jamorris@linux.microsoft.com>
---

diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index ba5d3172cafe..39aaa21462bf 100644
--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
@@ -688,9 +688,7 @@ try_again:
 		key_ref = make_key_ref(key, 0);
 
 		/* check to see if we possess the key */
-		ctx.index_key.type		= key->type;
-		ctx.index_key.description	= key->description;
-		ctx.index_key.desc_len		= strlen(key->description);
+		ctx.index_key			= key->index_key;
 		ctx.match_data.raw_data		= key;
 		kdebug("check possessed");
 		skey_ref = search_process_keyrings(&ctx);