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

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

diff --git a/security/keys/encrypted-keys/masterkey_trusted.c b/security/keys/encrypted-keys/masterkey_trusted.c
index 013f7e5d3a2fce42d026fd87a4a0d6e94af1d53f..b5b4812dbc87bbaba9f2c00812ca770d82a9bd29 100644 (file)
--- a/security/keys/encrypted-keys/masterkey_trusted.c
+++ b/security/keys/encrypted-keys/masterkey_trusted.c
@@ -29,7 +29,7 @@
  * data, trusted key type data is not visible decrypted from userspace.
  */
 struct key *request_trusted_key(const char *trusted_desc,
-                               u8 **master_key, size_t *master_keylen)
+                               const u8 **master_key, size_t *master_keylen)
 {
        struct trusted_key_payload *tpayload;
        struct key *tkey;
@@ -39,7 +39,7 @@ struct key *request_trusted_key(const char *trusted_desc,
                goto error;
 
        down_read(&tkey->sem);
-       tpayload = tkey->payload.data;
+       tpayload = tkey->payload.data[0];
        *master_key = tpayload->key;
        *master_keylen = tpayload->key_len;
 error: