diff options
| author | James Morris <jmorris@namei.org> | 2011-03-30 08:51:46 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-30 08:51:46 +1100 |
| commit | 93b9c98b3498db5842e2812b32cff4c1ae947eb1 (patch) | |
| tree | 2d18e46cadcbf66fff695bb16e86531281cde7be /security/keys/request_key_auth.c | |
| parent | efb3bb4fad062f8e9b8c9c945d499597e14007e7 (diff) | |
| parent | 5806896019ceaa0a1e808182afb4bba33c948ad6 (diff) | |
| download | kernel_samsung_smdk4412-93b9c98b3498db5842e2812b32cff4c1ae947eb1.zip kernel_samsung_smdk4412-93b9c98b3498db5842e2812b32cff4c1ae947eb1.tar.gz kernel_samsung_smdk4412-93b9c98b3498db5842e2812b32cff4c1ae947eb1.tar.bz2 | |
Merge branch 'next-queue' into next
Diffstat (limited to 'security/keys/request_key_auth.c')
| -rw-r--r-- | security/keys/request_key_auth.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c index 6816403..f6337c9 100644 --- a/security/keys/request_key_auth.c +++ b/security/keys/request_key_auth.c @@ -59,7 +59,8 @@ static void request_key_auth_describe(const struct key *key, seq_puts(m, "key:"); seq_puts(m, key->description); - seq_printf(m, " pid:%d ci:%zu", rka->pid, rka->callout_len); + if (key_is_instantiated(key)) + seq_printf(m, " pid:%d ci:%zu", rka->pid, rka->callout_len); } /* |