diff options
| author | Eric Biggers <ebiggers@google.com> | 2019-05-29 14:01:52 -0700 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2019-05-30 22:54:43 +0100 |
| commit | 47546208657f28007f41574c2d27a3fe760f987d (patch) | |
| tree | d6186a25fdd0cc9ee0c9a8249221a5806dc2fbd9 /security | |
| parent | f7f1394576563b7096fe858fb178bcaedfa0b245 (diff) | |
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>
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/process_keys.c | 4 |
1 files changed, 1 insertions, 3 deletions
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); |