diff options
| author | David Howells <dhowells@redhat.com> | 2012-10-02 19:30:19 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2012-10-02 19:30:19 +0100 |
| commit | 4442d7704c7311d1c42383d365e0b883e0075975 (patch) | |
| tree | ee80c095ea8b13c2ad62c9406ddc6166c5b09cb4 /net/dns_resolver | |
| parent | f8aa23a55f813c9bddec2a6176e0e67274e6e7c1 (diff) | |
| parent | d4f65b5d2497b2fd9c45f06b71deb4ab084a5b66 (diff) | |
| download | linux-3.10-4442d7704c7311d1c42383d365e0b883e0075975.tar.gz linux-3.10-4442d7704c7311d1c42383d365e0b883e0075975.tar.bz2 linux-3.10-4442d7704c7311d1c42383d365e0b883e0075975.zip | |
Merge branch 'modsign-keys-devel' into security-next-keys
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/dns_resolver')
| -rw-r--r-- | net/dns_resolver/dns_key.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/dns_resolver/dns_key.c b/net/dns_resolver/dns_key.c index f2c379d835e..b53bb4a41da 100644 --- a/net/dns_resolver/dns_key.c +++ b/net/dns_resolver/dns_key.c @@ -59,13 +59,13 @@ const struct cred *dns_resolver_cache; * "ip1,ip2,...#foo=bar" */ static int -dns_resolver_instantiate(struct key *key, const void *_data, size_t datalen) +dns_resolver_instantiate(struct key *key, struct key_preparsed_payload *prep) { struct user_key_payload *upayload; unsigned long derrno; int ret; - size_t result_len = 0; - const char *data = _data, *end, *opt; + size_t datalen = prep->datalen, result_len = 0; + const char *data = prep->data, *end, *opt; kenter("%%%d,%s,'%*.*s',%zu", key->serial, key->description, |