diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-10-23 12:07:52 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-10-23 12:07:52 +1100 |
| commit | ba94c3ff20c9c179f2a80f0e4c71e1571ebbf5c7 (patch) | |
| tree | 8f94d0fcb68cdcff0d00a7911ddb494705cf7c72 /security/keys/encrypted-keys/masterkey_trusted.c | |
| parent | a47c7a6c8aff0563c0ef4adf299268f3c27af0f6 (diff) | |
| parent | 146aa8b1453bd8f1ff2304ffb71b4ee0eb9acdcc (diff) | |
| download | linux-ba94c3ff20c9c179f2a80f0e4c71e1571ebbf5c7.tar.gz | |
Merge tag 'keys-next-20151021' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'security/keys/encrypted-keys/masterkey_trusted.c')
| -rw-r--r-- | security/keys/encrypted-keys/masterkey_trusted.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/keys/encrypted-keys/masterkey_trusted.c b/security/keys/encrypted-keys/masterkey_trusted.c index 013f7e5d3a2f..b5b4812dbc87 100644 --- 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: |