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

[deliverable/linux.git] / security / keys / keyctl.c

diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 6110fa498494af097b38fbe5202cb55150340d15..fb111eafcb893e4f5146c74a84f8499d4e1553c4 100644 (file)
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -1027,7 +1027,7 @@ long keyctl_instantiate_key_common(key_serial_t id,
        if (!instkey)
                goto error;
 
-       rka = instkey->payload.data;
+       rka = instkey->payload.data[0];
        if (rka->target_key->serial != id)
                goto error;
 
@@ -1194,7 +1194,7 @@ long keyctl_reject_key(key_serial_t id, unsigned timeout, unsigned error,
        if (!instkey)
                goto error;
 
-       rka = instkey->payload.data;
+       rka = instkey->payload.data[0];
        if (rka->target_key->serial != id)
                goto error;