diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-03 17:09:40 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-03 17:09:40 (GMT) |
| commit | 5a147c9f57bab06183b2bdde78aa49f3e332a557 (patch) | |
| tree | f9831506047d62d94fd3d40ff448e0830f2eb897 /include | |
| parent | 014018e0b4f7edc3f7f73ef780f7d6680c70861c (diff) | |
| parent | 0aa0409401046b3ec44d9f6d6d015edab885a579 (diff) | |
| download | linux-5a147c9f57bab06183b2bdde78aa49f3e332a557.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull key subsystem fixes from James Morris:
"Fixes for the keys subsystem, one of which addresses a use-after-free
bug"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
PEFILE: Relax the check on the length of the PKCS#7 cert
KEYS: Fix use-after-free in assoc_array_gc()
KEYS: Fix public_key asymmetric key subtype name
KEYS: Increase root_maxkeys and root_maxbytes sizes
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions