summaryrefslogtreecommitdiffstats
path: root/fs/crypto
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2018-04-30 15:51:44 -0700
committerTheodore Ts'o <tytso@mit.edu>2018-05-20 16:21:03 -0400
commite12ee6836a3fd3c6ebc9b2dc8a7974af592340d0 (patch)
tree64b030404b24cab9026483250f29aaca36741c5c /fs/crypto
parent0c4cdb27caa40167a7369a986afcde3d1d913b06 (diff)
downloadlinux-e12ee6836a3fd3c6ebc9b2dc8a7974af592340d0.tar.gz
linux-e12ee6836a3fd3c6ebc9b2dc8a7974af592340d0.tar.bz2
linux-e12ee6836a3fd3c6ebc9b2dc8a7974af592340d0.zip
fscrypt: make fscrypt_operations.max_namelen an integer
Now ->max_namelen() is only called to limit the filename length when adding NUL padding, and only for real filenames -- not symlink targets. It also didn't give the correct length for symlink targets anyway since it forgot to subtract 'sizeof(struct fscrypt_symlink_data)'. Thus, change ->max_namelen from a function to a simple 'unsigned int' that gives the filesystem's maximum filename length. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/crypto')
-rw-r--r--fs/crypto/fname.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c
index c4eb3a235ae4..39091fc31e98 100644
--- a/fs/crypto/fname.c
+++ b/fs/crypto/fname.c
@@ -334,7 +334,7 @@ int fscrypt_setup_filename(struct inode *dir, const struct qstr *iname,
if (dir->i_crypt_info) {
if (!fscrypt_fname_encrypted_size(dir, iname->len,
- dir->i_sb->s_cop->max_namelen(dir),
+ dir->i_sb->s_cop->max_namelen,
&fname->crypto_buf.len))
return -ENAMETOOLONG;
fname->crypto_buf.name = kmalloc(fname->crypto_buf.len,