diff options
| author | Eric Biggers <ebiggers@google.com> | 2018-04-30 15:51:42 -0700 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2018-06-28 12:18:52 -0700 |
| commit | 0077eff1d2e3816a40b71997ab677bb6ca671115 (patch) | |
| tree | 807a5461b00ae55a82a10c0b98bbc7e850e9f82f | |
| parent | 3f7af9d27fd6cabff05d149ca1178a5e27852c19 (diff) | |
fscrypt: drop max_namelen check from fname_decrypt()
fname_decrypt() returns an error if the input filename is longer than
the inode's ->max_namelen() as given by the filesystem. But, this
doesn't actually make sense because the filesystem provided the input
filename in the first place, where it was subject to the filesystem's
limits. And fname_decrypt() has no internal limit itself.
Thus, remove this unnecessary check.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | fs/crypto/fname.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c index 19715de54d37..d21a5329d6ca 100644 --- a/fs/crypto/fname.c +++ b/fs/crypto/fname.c @@ -92,14 +92,11 @@ static int fname_decrypt(struct inode *inode, struct skcipher_request *req = NULL; DECLARE_CRYPTO_WAIT(wait); struct scatterlist src_sg, dst_sg; - struct fscrypt_info *ci = inode->i_crypt_info; - struct crypto_skcipher *tfm = ci->ci_ctfm; + struct crypto_skcipher *tfm = inode->i_crypt_info->ci_ctfm; int res = 0; char iv[FS_CRYPTO_BLOCK_SIZE]; - unsigned lim; - lim = inode->i_sb->s_cop->max_namelen(inode); - if (iname->len <= 0 || iname->len > lim) + if (iname->len <= 0) return -EIO; /* Allocate request */ |