[GIT PULL] Keyrings / NFS fixes

[GIT PULL] Keyrings / NFS fixes

[James Morris]

>From David Howells, please pull for 3.18.

The first one fixes the handling of maximum buffer size for key 
descriptions, fixing the size at 4095 + NUL char rather than whatever 
PAGE_SIZE happens to be and permits you to read back the full description 
without it getting clipped because some extra information got prepended.

The second and third fix a bug in NFS idmapper handling whereby a key
representing a mapping between an id and a name expires and causing
EKEYEXPIRED to be seen internally in NFS (which prevents the mapping from
happening) rather than re-looking up the mapping.

The following changes since commit 3a18ca061311f2f1ee9c44012f89c7436d392117:

  Merge tag 'ext4_for_linus_urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 (2014-12-01 20:11:49 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git for-linus

David Howells (3):
      KEYS: Fix the size of the key description passed to/from userspace
      KEYS: Simplify KEYRING_SEARCH_{NO,DO}_STATE_CHECK flags
      KEYS: request_key() should reget expired keys rather than give EKEYEXPIRED

James Morris (1):
      Merge tag 'keys-fixes-20141201' of git://git.kernel.org/.../dhowells/linux-fs into for-linus

 security/keys/internal.h         |    1 +
 security/keys/keyctl.c           |   56 +++++++++++++++++--------------------
 security/keys/keyring.c          |   10 ++++---
 security/keys/request_key.c      |    2 +
 security/keys/request_key_auth.c |    1 +
 5 files changed, 36 insertions(+), 34 deletions(-)