From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 Mar 2017 22:36:56 +0000 (-0700)
Subject: Merge tag 'fscrypt-for-linus_stable' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.11-rc4~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a643f9054c21f4fae0fbb4add663462fea7a47f0;p=thirdparty%2Flinux.git

Merge tag 'fscrypt-for-linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt

Pull fscrypto fixes from Ted Ts'o:
 "A code cleanup and bugfix for fs/crypto"

* tag 'fscrypt-for-linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt:
  fscrypt: eliminate ->prepare_context() operation
  fscrypt: remove broken support for detecting keyring key revocation
---

a643f9054c21f4fae0fbb4add663462fea7a47f0
diff --cc fs/crypto/keyinfo.c
index d5d896fa5a716,cb3e82abf0347..8cdfddce2b348
--- a/fs/crypto/keyinfo.c
+++ b/fs/crypto/keyinfo.c
@@@ -102,11 -103,9 +103,9 @@@ static int validate_user_key(struct fsc
  		res = -ENOKEY;
  		goto out;
  	}
- 	down_read(&keyring_key->sem);
 -	ukp = user_key_payload(keyring_key);
 +	ukp = user_key_payload_locked(keyring_key);
  	if (ukp->datalen != sizeof(struct fscrypt_key)) {
  		res = -EINVAL;
- 		up_read(&keyring_key->sem);
  		goto out;
  	}
  	master_key = (struct fscrypt_key *)ukp->data;