projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
44183d4
)
ext4: don't dereference null pointer when make_indexed_dir() fails
author
Allison Henderson
<achender@linux.vnet.ibm.com>
Sun, 15 May 2011 04:19:41 +0000
(
00:19
-0400)
committer
Theodore Ts'o
<tytso@mit.edu>
Sun, 15 May 2011 04:19:41 +0000
(
00:19
-0400)
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>
fs/ext4/namei.c
patch
|
blob
|
history
diff --git
a/fs/ext4/namei.c
b/fs/ext4/namei.c
index
3c7a06e
..
b754b77
100644
(file)
--- 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;
}