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 'next' into for-linus
[pandora-kernel.git]
/
security
/
keys
/
user_defined.c
diff --git
a/security/keys/user_defined.c
b/security/keys/user_defined.c
index
f66baf4
..
5b366d7
100644
(file)
--- a/
security/keys/user_defined.c
+++ b/
security/keys/user_defined.c
@@
-157,8
+157,8
@@
EXPORT_SYMBOL_GPL(user_destroy);
void user_describe(const struct key *key, struct seq_file *m)
{
seq_puts(m, key->description);
-
- seq_printf(m, ": %u", key->datalen);
+ if (key_is_instantiated(key))
+
seq_printf(m, ": %u", key->datalen);
}
EXPORT_SYMBOL_GPL(user_describe);