]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
eCryptfs: Remove extra d_delete in ecryptfs_rmdir
authorTyler Hicks <tyhicks@linux.vnet.ibm.com>
Tue, 12 Apr 2011 16:21:36 +0000 (11:21 -0500)
committerWilly Tarreau <w@1wt.eu>
Sat, 17 Mar 2012 13:03:56 +0000 (14:03 +0100)
commit3c153f95d2e8dd33c3cc8d5432a57194c7bda933
tree7b122909479f9b897409f64d0d8a8599fc33a476
parent1663b5e456b6dc59d02224f93bd36d4580b94dd5
eCryptfs: Remove extra d_delete in ecryptfs_rmdir

commit 35ffa948b2f7bdf79e488cd496232935d095087a upstream.

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.

BugLink: http://bugs.launchpad.net/bugs/723518
Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Signed-off-by: Colin King <colin.king@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
fs/ecryptfs/inode.c