diff options
| author | Allison Henderson <achender@linux.vnet.ibm.com> | 2011-05-15 00:19:41 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2014-02-10 16:11:28 -0500 |
| commit | 3b73beed27b6ad3877b7257ae17419930b8ae90c (patch) | |
| tree | a3de7694fe7660b41b558e6faf70934e9a94bf6c | |
| parent | 20341d16ad9e8df56cbeac40471a6883ca60d751 (diff) | |
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 <achender@us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | fs/ext4/namei.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index caa3c77f1743..41198b355a26 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; } |