diff options
| author | James Morris <jmorris@namei.org> | 2011-03-29 17:51:46 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-29 17:51:46 -0400 |
| commit | 93b9c98b3498db5842e2812b32cff4c1ae947eb1 (patch) | |
| tree | 2d18e46cadcbf66fff695bb16e86531281cde7be /security/keys/user_defined.c | |
| parent | efb3bb4fad062f8e9b8c9c945d499597e14007e7 (diff) | |
| parent | 5806896019ceaa0a1e808182afb4bba33c948ad6 (diff) | |
Merge branch 'next-queue' into next
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 c6ca8662a468..63bb1aaffc0a 100644 --- a/security/keys/user_defined.c +++ b/security/keys/user_defined.c | |||
| @@ -169,8 +169,8 @@ EXPORT_SYMBOL_GPL(user_destroy); | |||
| 169 | void user_describe(const struct key *key, struct seq_file *m) | 169 | void user_describe(const struct key *key, struct seq_file *m) |
| 170 | { | 170 | { |
| 171 | seq_puts(m, key->description); | 171 | seq_puts(m, key->description); |
| 172 | 172 | if (key_is_instantiated(key)) | |
| 173 | seq_printf(m, ": %u", key->datalen); | 173 | seq_printf(m, ": %u", key->datalen); |
| 174 | } | 174 | } |
| 175 | 175 | ||
| 176 | EXPORT_SYMBOL_GPL(user_describe); | 176 | EXPORT_SYMBOL_GPL(user_describe); |