git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[pandora-kernel.git]
/
security
/
keys
/
request_key_auth.c
diff --git
a/security/keys/request_key_auth.c
b/security/keys/request_key_auth.c
index
6816403
..
f6337c9
100644
(file)
--- 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);
}
/*