Commit 47546208 authored May 29, 2019 by Eric Biggers Committed by David Howells May 30, 2019

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>

parent f7f13945

security/keys/process_keys.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -688,9 +688,7 @@ key_ref_t lookup_user_key(key_serial_t id, unsigned long lflags,
		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);