projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 014018e 0aa0409)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Sep 2014 17:09:40 +0000 (10:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Sep 2014 17:09:40 +0000 (10:09 -0700)
commit5a147c9f57bab06183b2bdde78aa49f3e332a557
treef9831506047d62d94fd3d40ff448e0830f2eb897tree | snapshot (tar.gz zip)
parent014018e0b4f7edc3f7f73ef780f7d6680c70861ccommit | diff
parent0aa0409401046b3ec44d9f6d6d015edab885a579commit | diff
Merge branch 'for-linus' of git://git./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