diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-22 20:48:50 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-22 20:48:50 -0500 |
commit | cb268d806972c76c34e5d74343fb6064cd722c7c (patch) | |
tree | b51d3f5c0431da9b15c65736fe67f9d27e7aca93 /security/keys/request_key_auth.c | |
parent | ef4edb3ed830cbbb443de9906b8cf16dc0653a74 (diff) | |
parent | ede0fa98a900e657d1fcd80b50920efc896c1a4c (diff) |
Merge branch 'fixes-v5.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull keys fixes from James Morris:
"Two fixes from Eric Biggers"
* 'fixes-v5.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
KEYS: always initialize keyring_index_key::desc_len
KEYS: user: Align the payload buffer
Diffstat (limited to 'security/keys/request_key_auth.c')
-rw-r--r-- | security/keys/request_key_auth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c index afc304e8b61e..bda6201c6c45 100644 --- a/security/keys/request_key_auth.c +++ b/security/keys/request_key_auth.c | |||
@@ -247,7 +247,7 @@ struct key *key_get_instantiation_authkey(key_serial_t target_id) | |||
247 | struct key *authkey; | 247 | struct key *authkey; |
248 | key_ref_t authkey_ref; | 248 | key_ref_t authkey_ref; |
249 | 249 | ||
250 | sprintf(description, "%x", target_id); | 250 | ctx.index_key.desc_len = sprintf(description, "%x", target_id); |
251 | 251 | ||
252 | authkey_ref = search_process_keyrings(&ctx); | 252 | authkey_ref = search_process_keyrings(&ctx); |
253 | 253 | ||