diff options
| author | Eric Biggers <ebiggers@google.com> | 2020-07-08 14:57:22 -0700 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2020-07-20 17:26:33 -0700 |
| commit | 1d6217a4f9905917ee63315c8ea3d63833792f51 (patch) | |
| tree | 37cb1e743e5ae2c7b9fb063dcea047492c13a668 /fs/crypto/policy.c | |
| parent | e455de313ef8bd1fa05a3eb6ef1bfd96eaf38e2a (diff) | |
fscrypt: rename FS_KEY_DERIVATION_NONCE_SIZE
The name "FS_KEY_DERIVATION_NONCE_SIZE" is a bit outdated since due to
the addition of FSCRYPT_POLICY_FLAG_DIRECT_KEY, the file nonce may now
be used as a tweak instead of for key derivation. Also, we're now
prefixing the fscrypt constants with "FSCRYPT_" instead of "FS_".
Therefore, rename this constant to FSCRYPT_FILE_NONCE_SIZE.
Link: https://lore.kernel.org/r/20200708215722.147154-1-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
Diffstat (limited to 'fs/crypto/policy.c')
| -rw-r--r-- | fs/crypto/policy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c index d23ff162c78b..8a8ad0e44bb8 100644 --- a/fs/crypto/policy.c +++ b/fs/crypto/policy.c @@ -529,7 +529,7 @@ int fscrypt_ioctl_get_nonce(struct file *filp, void __user *arg) if (!fscrypt_context_is_valid(&ctx, ret)) return -EINVAL; if (copy_to_user(arg, fscrypt_context_nonce(&ctx), - FS_KEY_DERIVATION_NONCE_SIZE)) + FSCRYPT_FILE_NONCE_SIZE)) return -EFAULT; return 0; } |