diff options
| author | Allison Henderson <achender@linux.vnet.ibm.com> | 2011-05-15 00:19:41 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2011-05-15 00:19:41 -0400 |
| commit | 6976a6f2acde2b0443cd64f1d08af90630e4ce81 (patch) | |
| tree | 754e33f280a83ac2f843f2dcafd1b2fbffdd92ca /fs/ext4/namei.c | |
| parent | 44183d4231a52a797beb477f962e1d361e31299d (diff) | |
| download | lwn-6976a6f2acde2b0443cd64f1d08af90630e4ce81.tar.gz lwn-6976a6f2acde2b0443cd64f1d08af90630e4ce81.zip | |
ext4: don't dereference null pointer when make_indexed_dir() fails
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>
Diffstat (limited to 'fs/ext4/namei.c')
| -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 3c7a06e58469..b754b7721f51 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1413,6 +1413,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) { /* @@ -1421,8 +1425,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; } |