diff options
| author | James Morris <jmorris@namei.org> | 2011-05-24 08:55:24 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-05-24 08:55:24 -0400 |
| commit | 434d42cfd05a7cc452457a81d2029540cba12150 (patch) | |
| tree | 3a6b9b7f9ff2e1b7409dd66c15242b2a75aa4422 /security/keys/user_defined.c | |
| parent | d762f4383100c2a87b1a3f2d678cd3b5425655b4 (diff) | |
| parent | 12a5a2621b1ee14d32beca35304d7c6076a58815 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/keys/user_defined.c')
| -rw-r--r-- | security/keys/user_defined.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/keys/user_defined.c b/security/keys/user_defined.c index f66baf44f32..5b366d7af3c 100644 --- a/security/keys/user_defined.c +++ b/security/keys/user_defined.c | |||
| @@ -157,8 +157,8 @@ EXPORT_SYMBOL_GPL(user_destroy); | |||
| 157 | void user_describe(const struct key *key, struct seq_file *m) | 157 | void user_describe(const struct key *key, struct seq_file *m) |
| 158 | { | 158 | { |
| 159 | seq_puts(m, key->description); | 159 | seq_puts(m, key->description); |
| 160 | 160 | if (key_is_instantiated(key)) | |
| 161 | seq_printf(m, ": %u", key->datalen); | 161 | seq_printf(m, ": %u", key->datalen); |
| 162 | } | 162 | } |
| 163 | 163 | ||
| 164 | EXPORT_SYMBOL_GPL(user_describe); | 164 | EXPORT_SYMBOL_GPL(user_describe); |