diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-04-11 12:15:20 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-04-11 12:15:20 +1000 |
| commit | 2aadf2bf9511ae4fbef720ab5fee479a6c6dde9f (patch) | |
| tree | 257050eb4606922c34964bf12b1acc7e175bccc6 /net | |
| parent | 268f23a27be96ba9a7beb00eb9547e533b769e4a (diff) | |
| parent | a3232d2fa2e3cbab3e76d91cdae5890fee8a4034 (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); + } } /* |