diff options
author | Eric Biggers <ebiggers@google.com> | 2018-01-12 05:30:08 +0100 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2018-01-12 05:30:08 +0100 |
commit | 2cbadadcfdf0d8a538ce32ed12e18ef487773b07 (patch) | |
tree | 27e38f4642a9dd981e8cc7451b4f116cc678dea8 /include | |
parent | fscrypt: calculate NUL-padding length in one place only (diff) | |
download | linux-2cbadadcfdf0d8a538ce32ed12e18ef487773b07.tar.xz linux-2cbadadcfdf0d8a538ce32ed12e18ef487773b07.zip |
fscrypt: define fscrypt_fname_alloc_buffer() to be for presented names
Previously fscrypt_fname_alloc_buffer() was used to allocate buffers for
both presented (decrypted or encoded) and encrypted filenames. That was
confusing, because it had to allocate the worst-case size for either,
e.g. including NUL-padding even when it was meaningless.
But now that fscrypt_setup_filename() no longer calls it, it is only
used in the ->get_link() and ->readdir() paths, which specifically want
a buffer for presented filenames. Therefore, switch the behavior over
to allocating the buffer for presented filenames only.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/fscrypt_notsupp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fscrypt_notsupp.h b/include/linux/fscrypt_notsupp.h index 0962f504aa91..c9592e307df5 100644 --- a/include/linux/fscrypt_notsupp.h +++ b/include/linux/fscrypt_notsupp.h @@ -140,7 +140,7 @@ static inline u32 fscrypt_fname_encrypted_size(const struct inode *inode, } static inline int fscrypt_fname_alloc_buffer(const struct inode *inode, - u32 ilen, + u32 max_encrypted_len, struct fscrypt_str *crypto_str) { return -EOPNOTSUPP; |