diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-10-23 04:07:52 +0300 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-10-23 04:07:52 +0300 |
| commit | ba94c3ff20c9c179f2a80f0e4c71e1571ebbf5c7 (patch) | |
| tree | 8f94d0fcb68cdcff0d00a7911ddb494705cf7c72 /security/keys/trusted.c | |
| parent | a47c7a6c8aff0563c0ef4adf299268f3c27af0f6 (diff) | |
| parent | 146aa8b1453bd8f1ff2304ffb71b4ee0eb9acdcc (diff) | |
| download | linux-ba94c3ff20c9c179f2a80f0e4c71e1571ebbf5c7.tar.xz | |
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/trusted.c')
| -rw-r--r-- | security/keys/trusted.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/keys/trusted.c b/security/keys/trusted.c index d3633cf17c7d..903dace648a1 100644 --- a/security/keys/trusted.c +++ b/security/keys/trusted.c @@ -1007,7 +1007,7 @@ static void trusted_rcu_free(struct rcu_head *rcu) */ static int trusted_update(struct key *key, struct key_preparsed_payload *prep) { - struct trusted_key_payload *p = key->payload.data; + struct trusted_key_payload *p = key->payload.data[0]; struct trusted_key_payload *new_p; struct trusted_key_options *new_o; size_t datalen = prep->datalen; @@ -1114,12 +1114,12 @@ static long trusted_read(const struct key *key, char __user *buffer, */ static void trusted_destroy(struct key *key) { - struct trusted_key_payload *p = key->payload.data; + struct trusted_key_payload *p = key->payload.data[0]; if (!p) return; memset(p->key, 0, p->key_len); - kfree(key->payload.data); + kfree(key->payload.data[0]); } struct key_type key_type_trusted = { |