diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-10-03 13:00:17 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-10-03 13:00:17 +1000 |
| commit | 61d335dd27c67d656f114c091a46cf95cbeeb77c (patch) | |
| tree | 1e96f07fe903f992e1e2095f1a03b61243da59f0 /security/keys/request_key_auth.c | |
| parent | 87b526d349b04c31d7b3a40b434eb3f825d22305 (diff) | |
| parent | 4442d7704c7311d1c42383d365e0b883e0075975 (diff) | |
Merge branch 'security-next-keys' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/security-keys into next-queue
As requested by David.
Diffstat (limited to 'security/keys/request_key_auth.c')
| -rw-r--r-- | security/keys/request_key_auth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c index 60d4e3f5e4b..85730d5a5a5 100644 --- a/security/keys/request_key_auth.c +++ b/security/keys/request_key_auth.c @@ -19,7 +19,8 @@ #include <asm/uaccess.h> #include "internal.h" -static int request_key_auth_instantiate(struct key *, const void *, size_t); +static int request_key_auth_instantiate(struct key *, + struct key_preparsed_payload *); static void request_key_auth_describe(const struct key *, struct seq_file *); static void request_key_auth_revoke(struct key *); static void request_key_auth_destroy(struct key *); @@ -42,10 +43,9 @@ struct key_type key_type_request_key_auth = { * Instantiate a request-key authorisation key. */ static int request_key_auth_instantiate(struct key *key, - const void *data, - size_t datalen) + struct key_preparsed_payload *prep) { - key->payload.data = (struct request_key_auth *) data; + key->payload.data = (struct request_key_auth *)prep->data; return 0; } |