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/proc.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/proc.c')
| -rw-r--r-- | security/keys/proc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/keys/proc.c b/security/keys/proc.c index d2b802072693..78ac305d715e 100644 --- a/security/keys/proc.c +++ b/security/keys/proc.c | |||
| @@ -165,8 +165,7 @@ static int proc_keys_show(struct seq_file *m, void *v) | |||
| 165 | int rc; | 165 | int rc; |
| 166 | 166 | ||
| 167 | struct keyring_search_context ctx = { | 167 | struct keyring_search_context ctx = { |
| 168 | .index_key.type = key->type, | 168 | .index_key = key->index_key, |
| 169 | .index_key.description = key->description, | ||
| 170 | .cred = m->file->f_cred, | 169 | .cred = m->file->f_cred, |
| 171 | .match_data.cmp = lookup_user_key_possessed, | 170 | .match_data.cmp = lookup_user_key_possessed, |
| 172 | .match_data.raw_data = key, | 171 | .match_data.raw_data = key, |