2.6.32-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Tyler Hicks <[email protected]> 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 <[email protected]> Signed-off-by: Colin King <[email protected]> Signed-off-by: Tim Gardner <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- fs/ecryptfs/inode.c | 2 -- 1 file changed, 2 deletions(-) --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c @@ -575,8 +575,6 @@ static int ecryptfs_rmdir(struct inode * dget(lower_dentry); rc = vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry); dput(lower_dentry); - if (!rc) - d_delete(lower_dentry); fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode); dir->i_nlink = lower_dir_dentry->d_inode->i_nlink; unlock_dir(lower_dir_dentry); -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
