diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-31 11:01:09 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-31 11:01:09 +1100 |
commit | 1566c85aca8c4c96882d38215248afcbecfc415f (patch) | |
tree | 9e521ed846d9e93bf408826fd8c330965bc7492d /net | |
parent | 3716b83cb0490bc678c9ea7e0ffc0b68c44fb93b (diff) | |
parent | 93b9c98b3498db5842e2812b32cff4c1ae947eb1 (diff) |
Merge remote-tracking branch 'security-testing/next'
Diffstat (limited to 'net')
-rw-r--r-- | net/dns_resolver/dns_key.c | 10 |
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); + } } /* |