Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35ffa948 authored by Tyler Hicks's avatar Tyler Hicks
Browse files

eCryptfs: Remove extra d_delete in ecryptfs_rmdir 



vfs_rmdir() already calls d_delete() on the lower dentry. That was being
duplicated in ecryptfs_rmdir() and caused a NULL pointer dereference
when NFSv3 was the lower filesystem.

Signed-off-by: default avatarTyler Hicks <tyhicks@linux.vnet.ibm.com>
parent 5dd12af0

fs/ecryptfs/inode.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -538,8 +538,6 @@ static int ecryptfs_rmdir(struct inode *dir, struct dentry *dentry) 
	dget(lower_dentry);

	dget(lower_dentry);

	rc = vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry);

	rc = vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry);

	dput(lower_dentry);

	dput(lower_dentry);

	if (!rc)

		d_delete(lower_dentry);

	fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);

	fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);

	dir->i_nlink = lower_dir_dentry->d_inode->i_nlink;

	dir->i_nlink = lower_dir_dentry->d_inode->i_nlink;

	unlock_dir(lower_dir_dentry);

	unlock_dir(lower_dir_dentry);