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

5 files changed, 22 insertions, 22 deletions

diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c
index f4cf200b3c76..6908080e9b6d 100644
--- a/fs/cifs/cifs_spnego.c
+++ b/fs/cifs/cifs_spnego.c
@@ -42,7 +42,7 @@ cifs_spnego_key_instantiate(struct key *key, struct key_preparsed_payload *prep)
                 goto error;
 
         /* attach the data */
-        key->payload.data = payload;
+        key->payload.data[0] = payload;
         ret = 0;
 
 error:
@@ -52,7 +52,7 @@ error:
 static void
 cifs_spnego_key_destroy(struct key *key)
 {
-        kfree(key->payload.data);
+        kfree(key->payload.data[0]);
 }
 
 
@@ -167,7 +167,7 @@ cifs_get_spnego_key(struct cifs_ses *sesInfo)
 
 #ifdef CONFIG_CIFS_DEBUG2
         if (cifsFYI && !IS_ERR(spnego_key)) {
-                struct cifs_spnego_msg *msg = spnego_key->payload.data;
+                struct cifs_spnego_msg *msg = spnego_key->payload.data[0];
                 cifs_dump_mem("SPNEGO reply blob:", msg->data, min(1024U,
                                 msg->secblob_len + msg->sesskey_len));
         }
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index 1ea780bc6376..3f93125916bf 100644
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
@@ -58,16 +58,15 @@ cifs_idmap_key_instantiate(struct key *key, struct key_preparsed_payload *prep)
          * dereference payload.data!
          */
         if (prep->datalen <= sizeof(key->payload)) {
-                key->payload.value = 0;
-                memcpy(&key->payload.value, prep->data, prep->datalen);
-                key->datalen = prep->datalen;
-                return 0;
+                key->payload.data[0] = NULL;
+                memcpy(&key->payload, prep->data, prep->datalen);
+        } else {
+                payload = kmemdup(prep->data, prep->datalen, GFP_KERNEL);
+                if (!payload)
+                        return -ENOMEM;
+                key->payload.data[0] = payload;
         }
-        payload = kmemdup(prep->data, prep->datalen, GFP_KERNEL);
-        if (!payload)
-                return -ENOMEM;
 
-        key->payload.data = payload;
         key->datalen = prep->datalen;
         return 0;
 }
@@ -76,7 +75,7 @@ static inline void
 cifs_idmap_key_destroy(struct key *key)
 {
         if (key->datalen > sizeof(key->payload))
-                kfree(key->payload.data);
+                kfree(key->payload.data[0]);
 }
 
 static struct key_type cifs_idmap_key_type = {
@@ -233,8 +232,8 @@ id_to_sid(unsigned int cid, uint sidtype, struct cifs_sid *ssid)
          * it could be.
          */
         ksid = sidkey->datalen <= sizeof(sidkey->payload) ?
-                (struct cifs_sid *)&sidkey->payload.value :
-                (struct cifs_sid *)sidkey->payload.data;
+                (struct cifs_sid *)&sidkey->payload :
+                (struct cifs_sid *)sidkey->payload.data[0];
 
         ksid_size = CIFS_SID_BASE_SIZE + (ksid->num_subauth * sizeof(__le32));
         if (ksid_size > sidkey->datalen) {
@@ -307,14 +306,14 @@ sid_to_id(struct cifs_sb_info *cifs_sb, struct cifs_sid *psid,
         if (sidtype == SIDOWNER) {
                 kuid_t uid;
                 uid_t id;
-                memcpy(&id, &sidkey->payload.value, sizeof(uid_t));
+                memcpy(&id, &sidkey->payload.data[0], sizeof(uid_t));
                 uid = make_kuid(&init_user_ns, id);
                 if (uid_valid(uid))
                         fuid = uid;
         } else {
                 kgid_t gid;
                 gid_t id;
-                memcpy(&id, &sidkey->payload.value, sizeof(gid_t));
+                memcpy(&id, &sidkey->payload.data[0], sizeof(gid_t));
                 gid = make_kgid(&init_user_ns, id);
                 if (gid_valid(gid))
                         fgid = gid;
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 773f4dc77630..3f2228570d44 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2325,13 +2325,14 @@ static int
 cifs_set_cifscreds(struct smb_vol *vol, struct cifs_ses *ses)
 {
         int rc = 0;
-        char *desc, *delim, *payload;
+        const char *delim, *payload;
+        char *desc;
         ssize_t len;
         struct key *key;
         struct TCP_Server_Info *server = ses->server;
         struct sockaddr_in *sa;
         struct sockaddr_in6 *sa6;
-        struct user_key_payload *upayload;
+        const struct user_key_payload *upayload;
 
         desc = kmalloc(CIFSCREDS_DESC_SIZE, GFP_KERNEL);
         if (!desc)
@@ -2374,14 +2375,14 @@ cifs_set_cifscreds(struct smb_vol *vol, struct cifs_ses *ses)
         }
 
         down_read(&key->sem);
-        upayload = key->payload.data;
+        upayload = user_key_payload(key);
         if (IS_ERR_OR_NULL(upayload)) {
                 rc = upayload ? PTR_ERR(upayload) : -EINVAL;
                 goto out_key_put;
         }
 
         /* find first : in payload */
-        payload = (char *)upayload->data;
+        payload = upayload->data;
         delim = strnchr(payload, upayload->datalen, ':');
         cifs_dbg(FYI, "payload=%s\n", payload);
         if (!delim) {
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index bce6fdcd5d48..59727e32ed0f 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -988,7 +988,7 @@ sess_auth_kerberos(struct sess_data *sess_data)
                 goto out;
         }
 
-        msg = spnego_key->payload.data;
+        msg = spnego_key->payload.data[0];
         /*
          * check version field to make sure that cifs.upcall is
          * sending us a response in an expected form
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index ce83e2edbe0a..52d14c9cf052 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -660,7 +660,7 @@ ssetup_ntlmssp_authenticate:
                         goto ssetup_exit;
                 }
 
-                msg = spnego_key->payload.data;
+                msg = spnego_key->payload.data[0];
                 /*
                  * check version field to make sure that cifs.upcall is
                  * sending us a response in an expected form