summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-05-24 14:55:24 +0200
committerJames Morris <jmorris@namei.org>2011-05-24 14:55:24 +0200
commit434d42cfd05a7cc452457a81d2029540cba12150 (patch)
tree3a6b9b7f9ff2e1b7409dd66c15242b2a75aa4422 /net
parentMerge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/let... (diff)
parentMerge branch 'master' into next (diff)
downloadlinux-434d42cfd05a7cc452457a81d2029540cba12150.tar.xz
linux-434d42cfd05a7cc452457a81d2029540cba12150.zip
Merge branch 'next' into for-linus
Diffstat (limited to 'net')
-rw-r--r--net/dns_resolver/dns_key.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/net/dns_resolver/dns_key.c b/net/dns_resolver/dns_key.c
index cfa7a5e1c5c9..fa000d26dc60 100644
--- a/net/dns_resolver/dns_key.c
+++ b/net/dns_resolver/dns_key.c
@@ -212,10 +212,12 @@ static void dns_resolver_describe(const struct key *key, struct seq_file *m)
int err = key->type_data.x[0];
seq_puts(m, key->description);
- if (err)
- seq_printf(m, ": %d", err);
- else
- seq_printf(m, ": %u", key->datalen);
+ if (key_is_instantiated(key)) {
+ if (err)
+ seq_printf(m, ": %d", err);
+ else
+ seq_printf(m, ": %u", key->datalen);
+ }
}
/*