Merge branch 'modsign-keys-devel' into security-next-keys

[firefly-linux-kernel-4.4.55.git] / net / dns_resolver / dns_key.c

diff --git a/net/dns_resolver/dns_key.c b/net/dns_resolver/dns_key.c
index f2c379d835e33031d23c0d2a862c437b19da7c62..b53bb4a41daa6cf0b05dedfb5df9c1979af46bf8 100644 (file)
--- 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,