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 d252c5704f8a087005f345cff961ee2c1d1ad6be..5fe443d120afe81826902cc70efecff24ccee1bb 100644 (file)
--- 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;