diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-22 17:48:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-22 17:48:50 -0800 |
| commit | cb268d806972c76c34e5d74343fb6064cd722c7c (patch) | |
| tree | b51d3f5c0431da9b15c65736fe67f9d27e7aca93 /security/keys/request_key_auth.c | |
| parent | Merge tag 'pm-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
| parent | KEYS: always initialize keyring_index_key::desc_len (diff) | |
| download | linux-dev-cb268d806972c76c34e5d74343fb6064cd722c7c.tar.xz linux-dev-cb268d806972c76c34e5d74343fb6064cd722c7c.zip | |
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) struct key *authkey; key_ref_t authkey_ref; - sprintf(description, "%x", target_id); + ctx.index_key.desc_len = sprintf(description, "%x", target_id); authkey_ref = search_process_keyrings(&ctx); |