git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: e78c38f 2eb9eab)
Merge branch 'fixes-v4.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorr...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Nov 2017 14:43:40 +0000 (07:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Nov 2017 14:43:40 +0000 (07:43 -0700)
Pull key handling fixes from James Morris:
 "Fixes for the Keys subsystem by Eric Biggers"

* 'fixes-v4.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  KEYS: fix out-of-bounds read during ASN.1 parsing
  KEYS: trusted: fix writing past end of buffer in trusted_read()
  KEYS: return full count in keyring_read() if buffer is too small


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.