Merge branch 'next' into for-linus

[karo-tx-linux.git] / security / keys / user_defined.c

diff --git a/security/keys/user_defined.c b/security/keys/user_defined.c
index f66baf44f32d16344756635321fffb98b34f0034..5b366d7af3c4dc17b595c67af3dbe99d5fd69df1 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);