From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Apr 2017 18:12:51 +0000 (-0700)
Subject: Merge tag 'keys-fixes-20170419' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.11-rc8~16
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f205b5dc1c9e62237ac6e21642724d8cbc85f7ee;p=linux.git

Merge tag 'keys-fixes-20170419' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs

Pull keyrings fixes from David Howells:

 (1) Disallow keyrings whose name begins with a '.' to be joined
     [CVE-2016-9604].

 (2) Change the name of the dead type to ".dead" to prevent user access
     [CVE-2017-6951].

 (3) Fix keyctl_set_reqkey_keyring() to not leak thread keyrings
     [CVE-2017-7472]

* tag 'keys-fixes-20170419' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
  KEYS: fix keyctl_set_reqkey_keyring() to not leak thread keyrings
  KEYS: Change the name of the dead type to ".dead" to prevent user access
  KEYS: Disallow keyrings beginning with '.' to be joined as session keyrings
---

f205b5dc1c9e62237ac6e21642724d8cbc85f7ee