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

Commit 07850552 authored by Tyler Hicks's avatar Tyler Hicks
Browse files

eCryptfs: Clear i_nlink in rmdir 

eCryptfs wasn't clearing the eCryptfs inode's i_nlink after a successful
vfs_rmdir() on the lower directory. This resulted in the inode evict and
destroy paths to be missed.

https://bugs.launchpad.net/ecryptfs/+bug/723518



Signed-off-by: default avatarTyler Hicks <tyhicks@linux.vnet.ibm.com>
Cc: <stable@kernel.org>
parent 61c4f2c8

fs/ecryptfs/inode.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -527,6 +527,8 @@ 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 && dentry->d_inode)

		clear_nlink(dentry->d_inode);

	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);