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

[karo-tx-linux.git] / security / keys / request_key_auth.c

diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c
index 5d672f7580dd5330516dd62f7d705cac46c319fb..4f0f112fe276fd7da1714e65113753394b5453e0 100644 (file)
--- a/security/keys/request_key_auth.c
+++ b/security/keys/request_key_auth.c
@@ -59,7 +59,7 @@ static void request_key_auth_free_preparse(struct key_preparsed_payload *prep)
 static int request_key_auth_instantiate(struct key *key,
                                        struct key_preparsed_payload *prep)
 {
-       key->payload.data = (struct request_key_auth *)prep->data;
+       key->payload.data[0] = (struct request_key_auth *)prep->data;
        return 0;
 }
 
@@ -69,7 +69,7 @@ static int request_key_auth_instantiate(struct key *key,
 static void request_key_auth_describe(const struct key *key,
                                      struct seq_file *m)
 {
-       struct request_key_auth *rka = key->payload.data;
+       struct request_key_auth *rka = key->payload.data[0];
 
        seq_puts(m, "key:");
        seq_puts(m, key->description);
@@ -84,7 +84,7 @@ static void request_key_auth_describe(const struct key *key,
 static long request_key_auth_read(const struct key *key,
                                  char __user *buffer, size_t buflen)
 {
-       struct request_key_auth *rka = key->payload.data;
+       struct request_key_auth *rka = key->payload.data[0];
        size_t datalen;
        long ret;
 
@@ -110,7 +110,7 @@ static long request_key_auth_read(const struct key *key,
  */
 static void request_key_auth_revoke(struct key *key)
 {
-       struct request_key_auth *rka = key->payload.data;
+       struct request_key_auth *rka = key->payload.data[0];
 
        kenter("{%d}", key->serial);
 
@@ -125,7 +125,7 @@ static void request_key_auth_revoke(struct key *key)
  */
 static void request_key_auth_destroy(struct key *key)
 {
-       struct request_key_auth *rka = key->payload.data;
+       struct request_key_auth *rka = key->payload.data[0];
 
        kenter("{%d}", key->serial);
 
@@ -179,7 +179,7 @@ struct key *request_key_auth_new(struct key *target, const void *callout_info,
                if (test_bit(KEY_FLAG_REVOKED, &cred->request_key_auth->flags))
                        goto auth_key_revoked;
 
-               irka = cred->request_key_auth->payload.data;
+               irka = cred->request_key_auth->payload.data[0];
                rka->cred = get_cred(irka->cred);
                rka->pid = irka->pid;