tree fbd13ab1bc848d3f44b821df307c8538ab965972
parent e78c38f6bdd900b2ad9ac9df8eff58b745dc5b3c
parent 2eb9eabf1e868fda15808954fb29b0f105ed65f1
author Linus Torvalds <torvalds@linux-foundation.org> 1509633820 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1509633820 -0700

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

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