summaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2018-01-18 18:40:25 -0800
committerTyler Hicks <tyhicks@canonical.com>2018-03-29 01:33:29 +0000
commitab13a9218c9883d1f51940b9e720c63ef54a2c07 (patch)
tree15de1ab010f40114b62aedadbce43b581cca4daa /fs/ecryptfs
parent3215b9d57a2c75c4305a3956ca303d7004485200 (diff)
downloadlinux-stable-ab13a9218c9883d1f51940b9e720c63ef54a2c07.tar.gz
linux-stable-ab13a9218c9883d1f51940b9e720c63ef54a2c07.tar.bz2
linux-stable-ab13a9218c9883d1f51940b9e720c63ef54a2c07.zip
ecryptfs: lookup: Don't check if mount_crypt_stat is NULL
mount_crypt_stat is assigned to &ecryptfs_superblock_to_private(ecryptfs_dentry->d_sb)->mount_crypt_stat, and mount_crypt_stat is not the first object in struct ecryptfs_sb_info. mount_crypt_stat is therefore never NULL. At the same time, no crash in ecryptfs_lookup() has been reported, and the lookup functions in other file systems don't check if d_sb is NULL either. Given that, remove the NULL check. Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Diffstat (limited to 'fs/ecryptfs')
-rw-r--r--fs/ecryptfs/inode.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index 847904aa63a9..97d17eaeba07 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -395,8 +395,7 @@ static struct dentry *ecryptfs_lookup(struct inode *ecryptfs_dir_inode,
mount_crypt_stat = &ecryptfs_superblock_to_private(
ecryptfs_dentry->d_sb)->mount_crypt_stat;
- if (mount_crypt_stat
- && (mount_crypt_stat->flags & ECRYPTFS_GLOBAL_ENCRYPT_FILENAMES)) {
+ if (mount_crypt_stat->flags & ECRYPTFS_GLOBAL_ENCRYPT_FILENAMES) {
rc = ecryptfs_encrypt_and_encode_filename(
&encrypted_and_encoded_name, &len,
mount_crypt_stat, name, len);