diff options
| author | James Morris <jmorris@namei.org> | 2011-03-29 23:51:46 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-29 23:51:46 +0200 |
| commit | 93b9c98b3498db5842e2812b32cff4c1ae947eb1 (patch) | |
| tree | 2d18e46cadcbf66fff695bb16e86531281cde7be /net | |
| parent | Merge branch 'master'; commit 'v2.6.39-rc1' into next (diff) | |
| parent | security: select correct default LSM_MMAP_MIN_ADDR on ARM. (diff) | |
| download | linux-93b9c98b3498db5842e2812b32cff4c1ae947eb1.tar.xz linux-93b9c98b3498db5842e2812b32cff4c1ae947eb1.zip | |
Merge branch 'next-queue' into 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); + } } /* |