KEYS: Merge the type-specific data with the payload data

Merge the type-specific data with the payload data into one four-word chunk
as it seems pointless to keep them separate.

Use user_key_payload() for accessing the payloads of overloaded
user-defined keys.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: linux-cifs@vger.kernel.org
cc: ecryptfs@vger.kernel.org
cc: linux-ext4@vger.kernel.org
cc: linux-f2fs-devel@lists.sourceforge.net
cc: linux-nfs@vger.kernel.org
cc: ceph-devel@vger.kernel.org
cc: linux-ima-devel@lists.sourceforge.net

1 files changed, 9 insertions, 9 deletions

diff --git a/security/keys/key.c b/security/keys/key.c
index c0478465d1ac..ab7997ded725 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -554,7 +554,7 @@ int key_reject_and_link(struct key *key,
         if (!test_bit(KEY_FLAG_INSTANTIATED, &key->flags)) {
                 /* mark the key as being negatively instantiated */
                 atomic_inc(&key->user->nikeys);
-                key->type_data.reject_error = -error;
+                key->reject_error = -error;
                 smp_wmb();
                 set_bit(KEY_FLAG_NEGATIVE, &key->flags);
                 set_bit(KEY_FLAG_INSTANTIATED, &key->flags);
@@ -1046,14 +1046,14 @@ int generic_key_instantiate(struct key *key, struct key_preparsed_payload *prep)
 
         ret = key_payload_reserve(key, prep->quotalen);
         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[0]);
-                key->payload.data2[1] = prep->payload[1];
-                prep->type_data[0] = NULL;
-                prep->type_data[1] = NULL;
-                prep->payload[0] = NULL;
-                prep->payload[1] = NULL;
+                rcu_assign_keypointer(key, prep->payload.data[0]);
+                key->payload.data[1] = prep->payload.data[1];
+                key->payload.data[2] = prep->payload.data[2];
+                key->payload.data[3] = prep->payload.data[3];
+                prep->payload.data[0] = NULL;
+                prep->payload.data[1] = NULL;
+                prep->payload.data[2] = NULL;
+                prep->payload.data[3] = NULL;
         }
         pr_devel("<==%s() = %d\n", __func__, ret);
         return ret;