From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Nov 2017 14:43:40 +0000 (-0700)
Subject: Merge branch 'fixes-v4.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorr... 
X-Git-Tag: v4.14-rc8~28
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6965f1aa7142a2989733c6ec53cc42ae97fd7f9d;p=users%2Fdwmw2%2Flinux.git

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
---

6965f1aa7142a2989733c6ec53cc42ae97fd7f9d