Merge branch 'fixes-v5.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Browse source

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

...

This commit is contained in:

Linus Torvalds 2019-02-22 17:48:50 -08:00

parent ef4edb3ed8 ede0fa98a9

commit cb268d8069

5 changed files with 5 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

include/keys/user-type.h

View file

4

security/keys/keyring.c

View file

3

security/keys/proc.c

View file

1

security/keys/request_key.c

View file

2

security/keys/request_key_auth.c

View file