KEYS: struct key_preparsed_payload should have two payload pointers

struct key_preparsed_payload should have two payload pointers to correspond
with those in struct key.

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Steve Dickson <steved@redhat.com>
Acked-by: Jeff Layton <jlayton@primarydata.com>
Reviewed-by: Sage Weil <sage@redhat.com>

2 files changed, 5 insertions, 3 deletions

diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
index 5fe443d120af..d252c5704f8a 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;
         }
 
-        rcu_assign_keypointer(key, epayload);
+        prep->payload[0] = epayload;
 out:
         kfree(datablob);
         return ret;
diff --git a/security/keys/key.c b/security/keys/key.c
index 7c9acbf106b6..03620a35a4dc 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -1043,10 +1043,12 @@ int generic_key_instantiate(struct key *key, struct key_preparsed_payload *prep)
         if (ret == 0) {
                 key->type_data.p[0] = prep->type_data[0];
                 key->type_data.p[1] = prep->type_data[1];
-                rcu_assign_keypointer(key, prep->payload);
+                rcu_assign_keypointer(key, prep->payload[0]);
+                key->payload.data2[1] = prep->payload[1];
                 prep->type_data[0] = NULL;
                 prep->type_data[1] = NULL;
-                prep->payload = NULL;
+                prep->payload[0] = NULL;
+                prep->payload[1] = NULL;
         }
         pr_devel("<==%s() = %d\n", __func__, ret);
         return ret;