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

1 files changed, 1 insertions, 0 deletions

diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index 3f56a312dd35..7a0c6b666ff0 100644
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -531,6 +531,7 @@ struct key *request_key_and_link(struct key_type *type,
         struct keyring_search_context ctx = {
                 .index_key.type         = type,
                 .index_key.description  = description,
+                .index_key.desc_len     = strlen(description),
                 .cred                   = current_cred(),
                 .match_data.cmp         = key_default_cmp,
                 .match_data.raw_data    = description,