Skip to content

Commit

Permalink
keys: Reuse keyring_index_key::desc_len in lookup_user_key()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric Biggers authored and David Howells committed May 30, 2019
1 parent f7f1394 commit 4754620
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions security/keys/process_keys.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 4754620

Please sign in to comment.