Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[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 0a69d075779556fa1f8093b2ba6816e7f7d5cb77..f347a2ca7d7e6c5c1f6feae5e8edae91b487500e 100644 (file)
--- a/net/dns_resolver/dns_key.c
+++ b/net/dns_resolver/dns_key.c
@@ -118,7 +118,7 @@ dns_resolver_instantiate(struct key *key, struct key_preparsed_payload *prep)
                                if (opt_vlen <= 0)
                                        goto bad_option_value;
 
-                               ret = strict_strtoul(eq, 10, &derrno);
+                               ret = kstrtoul(eq, 10, &derrno);
                                if (ret < 0)
                                        goto bad_option_value;