From 3b73beed27b6ad3877b7257ae17419930b8ae90c Mon Sep 17 00:00:00 2001 From: Allison Henderson Date: Sun, 15 May 2011 00:19:41 -0400 Subject: [PATCH] ext4: don't dereference null pointer when make_indexed_dir() fails commit 6976a6f2acde2b0443cd64f1d08af90630e4ce81 upstream. Fix for a null pointer bug found while running punch hole tests Signed-off-by: Allison Henderson Signed-off-by: "Theodore Ts'o" Signed-off-by: Paul Gortmaker --- fs/ext4/namei.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index caa3c77f17437..41198b355a261 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1451,6 +1451,10 @@ static int make_indexed_dir(handle_t *handle, struct dentry *dentry, frame->at = entries; frame->bh = bh; bh = bh2; + + ext4_handle_dirty_metadata(handle, dir, frame->bh); + ext4_handle_dirty_metadata(handle, dir, bh); + de = do_split(handle,dir, &bh, frame, &hinfo, &retval); if (!de) { /* @@ -1459,8 +1463,6 @@ static int make_indexed_dir(handle_t *handle, struct dentry *dentry, * with corrupted filesystem. */ ext4_mark_inode_dirty(handle, dir); - ext4_handle_dirty_metadata(handle, dir, frame->bh); - ext4_handle_dirty_metadata(handle, dir, bh); dx_release(frames); return retval; } -- 2.47.2