diff options
| author | James Morris <james.l.morris@oracle.com> | 2017-10-19 12:28:38 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-10-19 12:28:38 +1100 |
| commit | 494b9ae7abb84e6d88d7587906aff29dd26cf9d0 (patch) | |
| tree | aeb24854a715777aaa9d433d57f5e45d05017f73 /security/keys/big_key.c | |
| parent | 73d3393ada4f70fa3df5639c8d438f2f034c0ecb (diff) | |
| parent | 68a1fdbbf8bd3378325e45c19e167a165f9ffc3a (diff) | |
| download | op-kernel-dev-494b9ae7abb84e6d88d7587906aff29dd26cf9d0.zip op-kernel-dev-494b9ae7abb84e6d88d7587906aff29dd26cf9d0.tar.gz | |
Merge commit 'tags/keys-fixes-20171018' into fixes-v4.14-rc5
Diffstat (limited to 'security/keys/big_key.c')
| -rw-r--r-- | security/keys/big_key.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/keys/big_key.c b/security/keys/big_key.c index e607830..929e149 100644 --- a/security/keys/big_key.c +++ b/security/keys/big_key.c @@ -247,7 +247,7 @@ void big_key_revoke(struct key *key) /* clear the quota */ key_payload_reserve(key, 0); - if (key_is_instantiated(key) && + if (key_is_positive(key) && (size_t)key->payload.data[big_key_len] > BIG_KEY_FILE_THRESHOLD) vfs_truncate(path, 0); } @@ -279,7 +279,7 @@ void big_key_describe(const struct key *key, struct seq_file *m) seq_puts(m, key->description); - if (key_is_instantiated(key)) + if (key_is_positive(key)) seq_printf(m, ": %zu [%s]", datalen, datalen > BIG_KEY_FILE_THRESHOLD ? "file" : "buff"); |
