Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Browse source

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

...

This commit is contained in:

Linus Torvalds 2014-09-03 10:09:40 -07:00

parent 014018e0b4 0aa0409401

commit 5a147c9f57

4 changed files with 37 additions and 19 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

1

crypto/asymmetric_keys/public_key.c

View file

49

crypto/asymmetric_keys/verify_pefile.c

View file

2

lib/assoc_array.c

View file

4

security/keys/key.c

View file