| Message ID | 20130315145314.GB7403@thunk.org |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Fri, Mar 15, 2013 at 10:53:14AM -0400, Theodore Ts'o wrote: > On Fri, Mar 15, 2013 at 03:16:52PM +0800, zhuyj wrote: > > Hi, all > > > > The two patches can fix this problem. > > ext4: Fix fs corruption when make_indexed_dir() fails > > ext4: don't dereference null pointer when make_indexed_dir() fails > > Thanks, Zhujh for figuring this out. Those two patches weren't > taggled with cc: stable@vger.kernel.org, but they probably should have > been. Since they first appeared in v3.0, the two long-term stable > kernels that would benefit with these patches are v3.0.x and v3.2.x. > > Willy, Paul, would you consider cherry-picking the following commits > for your respective stable kernels? > > git cherry-pick 7ad8e4e6ae2a7c95445ee1715b1714106fb95037 > git cherry-pick 6976a6f2acde2b0443cd64f1d08af90630e4ce81 Yes of course ! Thank you Ted! Willy -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Mar 15, 2013 at 03:56:04PM +0100, Willy Tarreau wrote: > > Thanks, Zhujh for figuring this out. Those two patches weren't > > taggled with cc: stable@vger.kernel.org, but they probably should have > > been. Since they first appeared in v3.0, the two long-term stable > > kernels that would benefit with these patches are v3.0.x and v3.2.x. Oops, sorry, that should have read 2.6.32 and 2.6.34. :-) > > Willy, Paul, would you consider cherry-picking the following commits > > for your respective stable kernels? > > > > git cherry-pick 7ad8e4e6ae2a7c95445ee1715b1714106fb95037 > > git cherry-pick 6976a6f2acde2b0443cd64f1d08af90630e4ce81 > > Yes of course ! Great, thanks!! - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 13-03-15 10:53 AM, Theodore Ts'o wrote: > On Fri, Mar 15, 2013 at 03:16:52PM +0800, zhuyj wrote: >> Hi, all >> >> The two patches can fix this problem. >> ext4: Fix fs corruption when make_indexed_dir() fails >> ext4: don't dereference null pointer when make_indexed_dir() fails > > Thanks, Zhujh for figuring this out. Those two patches weren't > taggled with cc: stable@vger.kernel.org, but they probably should have > been. Since they first appeared in v3.0, the two long-term stable > kernels that would benefit with these patches are v3.0.x and v3.2.x. > > Willy, Paul, would you consider cherry-picking the following commits > for your respective stable kernels? Both queued for 2.6.34.15 Thanks, Paul. -- > > git cherry-pick 7ad8e4e6ae2a7c95445ee1715b1714106fb95037 > git cherry-pick 6976a6f2acde2b0443cd64f1d08af90630e4ce81 > > Thanks!! > > - Ted > -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From 6976a6f2acde2b0443cd64f1d08af90630e4ce81 Mon Sep 17 00:00:00 2001 From: Allison Henderson <achender@linux.vnet.ibm.com> Date: Sun, 15 May 2011 00:19:41 -0400 Subject: [PATCH] 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> --- 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 3c7a06e..b754b77 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; } -- 1.7.12.rc0.22.gcdd159b