Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

     usage.  This is called key->payload.rcu_data0.  The following accessors

     wrap the RCU calls to this element:

     (a) Set or change the first payload pointer:

		rcu_assign_keypointer(struct key *key, void *data);

	void *rcu_dereference_key(struct key *key);

     (b) Read the first payload pointer with the key semaphore held:

		[const] void *dereference_key_locked([const] struct key *key);

	 Note that the return value will inherit its constness from the key

	 parameter.  Static analysis will give an error if it things the lock

	 isn't held.

     (c) Read the first payload pointer with the RCU read lock held:

		const void *dereference_key_rcu(const struct key *key);

===================

	down_read(&key->sem);

	ukp = user_key_payload(key);

	ukp = user_key_payload_locked(key);

	if (!ukp) {

		up_read(&key->sem);

		key_put(key);

	}

	down_read(&key->sem);

	upayload = user_key_payload(key);

	upayload = user_key_payload_locked(key);

	if (IS_ERR_OR_NULL(upayload)) {

		rc = upayload ? PTR_ERR(upayload) : -EINVAL;

		goto out_key_put;

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

	auth_tok = ecryptfs_get_encrypted_key_payload_data(key);

	if (!auth_tok)

		return (struct ecryptfs_auth_tok *)user_key_payload(key)->data;

		return (struct ecryptfs_auth_tok *)user_key_payload_locked(key)->data;

	else

		return auth_tok;

}