From: Mimi Zohar <zohar@linux.vnet.ibm.com>
Date: Sun, 27 Jul 2014 03:21:02 +0000 (-0400)
Subject: KEYS: revert encrypted key change
X-Git-Tag: v3.17-rc1~108^2~8
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=b64cc5fb85f38ae7ca3c67a8fea9ad8c0d068bfa;p=cascardo%2Flinux.git

KEYS: revert encrypted key change

Commit fc7c70e "KEYS: struct key_preparsed_payload should have two
payload pointers" erroneously modified encrypted-keys.  This patch
reverts the change to that file.

Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: David Howells <dhowells@redhat.com>
---

diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
index d252c5704f8a..5fe443d120af 100644
--- a/security/keys/encrypted-keys/encrypted.c
+++ b/security/keys/encrypted-keys/encrypted.c
@@ -811,7 +811,7 @@ static int encrypted_instantiate(struct key *key,
 		goto out;
 	}
 
-	prep->payload[0] = epayload;
+	rcu_assign_keypointer(key, epayload);
 out:
 	kfree(datablob);
 	return ret;