diff options
| author | Eric Biggers <ebiggers@google.com> | 2018-01-11 23:30:08 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2018-01-11 23:30:08 -0500 |
| commit | b9db0b4a68d373897119d1e0a3beebe1c1a23936 (patch) | |
| tree | 3cb57195d294dae3eb19378428cabc75e78621e3 /fs/crypto/fscrypt_private.h | |
| parent | 2cbadadcfdf0d8a538ce32ed12e18ef487773b07 (diff) | |
| download | linux-stable-b9db0b4a68d373897119d1e0a3beebe1c1a23936.tar.gz linux-stable-b9db0b4a68d373897119d1e0a3beebe1c1a23936.tar.bz2 linux-stable-b9db0b4a68d373897119d1e0a3beebe1c1a23936.zip | |
fscrypt: fix up fscrypt_fname_encrypted_size() for internal use
Filesystems don't need fscrypt_fname_encrypted_size() anymore, so
unexport it and move it to fscrypt_private.h.
We also never calculate the encrypted size of a filename without having
the fscrypt_info present since it is needed to know the amount of
NUL-padding which is determined by the encryption policy, and also we
will always truncate the NUL-padding to the maximum filename length.
Therefore, also make fscrypt_fname_encrypted_size() assume that the
fscrypt_info is present, and make it truncate the returned length to the
specified max_len.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/crypto/fscrypt_private.h')
| -rw-r--r-- | fs/crypto/fscrypt_private.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/crypto/fscrypt_private.h b/fs/crypto/fscrypt_private.h index 053917587200..ad6722bae8b7 100644 --- a/fs/crypto/fscrypt_private.h +++ b/fs/crypto/fscrypt_private.h @@ -110,6 +110,9 @@ extern struct page *fscrypt_alloc_bounce_page(struct fscrypt_ctx *ctx, /* fname.c */ extern int fname_encrypt(struct inode *inode, const struct qstr *iname, u8 *out, unsigned int olen); +extern bool fscrypt_fname_encrypted_size(const struct inode *inode, + u32 orig_len, u32 max_len, + u32 *encrypted_len_ret); /* keyinfo.c */ extern void __exit fscrypt_essiv_cleanup(void); |