diff options
| author | James Morris <james.l.morris@oracle.com> | 2017-10-19 12:28:38 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-10-19 12:28:38 +1100 |
| commit | 494b9ae7abb84e6d88d7587906aff29dd26cf9d0 (patch) | |
| tree | aeb24854a715777aaa9d433d57f5e45d05017f73 /net | |
| parent | 73d3393ada4f70fa3df5639c8d438f2f034c0ecb (diff) | |
| parent | 68a1fdbbf8bd3378325e45c19e167a165f9ffc3a (diff) | |
| download | linux-stable-494b9ae7abb84e6d88d7587906aff29dd26cf9d0.tar.gz linux-stable-494b9ae7abb84e6d88d7587906aff29dd26cf9d0.tar.bz2 linux-stable-494b9ae7abb84e6d88d7587906aff29dd26cf9d0.zip | |
Merge commit 'tags/keys-fixes-20171018' into fixes-v4.14-rc5
Diffstat (limited to 'net')
| -rw-r--r-- | net/dns_resolver/dns_key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dns_resolver/dns_key.c b/net/dns_resolver/dns_key.c index 8737412c7b27..e1d4d898a007 100644 --- a/net/dns_resolver/dns_key.c +++ b/net/dns_resolver/dns_key.c @@ -224,7 +224,7 @@ static int dns_resolver_match_preparse(struct key_match_data *match_data) static void dns_resolver_describe(const struct key *key, struct seq_file *m) { seq_puts(m, key->description); - if (key_is_instantiated(key)) { + if (key_is_positive(key)) { int err = PTR_ERR(key->payload.data[dns_key_error]); if (err) |