These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / security / keys / encrypted-keys / masterkey_trusted.c

diff --git a/kernel/security/keys/encrypted-keys/masterkey_trusted.c b/kernel/security/keys/encrypted-keys/masterkey_trusted.c
index 013f7e5..b5b4812 100644 (file)
--- a/kernel/security/keys/encrypted-keys/masterkey_trusted.c
+++ b/kernel/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: