The patch titled
ext4: fix NULL pointer deref in journal_wait_on_commit_record()
has been removed from the -mm tree. Its filename was
ext4-fix-null-pointer-deref-in-journal_wait_on_commit_record.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: ext4: fix NULL pointer deref in journal_wait_on_commit_record()
From: Mingming Cao <cmm@xxxxxxxxxx>
Fix http://bugzilla.kernel.org/show_bug.cgi?id=9849
The buffer head pointer passed to journal_wait_on_commit_record() could be
NULL if the previous journal_submit_commit_record() failed or journal has
already aborted.
We need to check the error returns from journal_submit_commit_record() and
avoid calling journal_wait_on_commit_record() in the failure case.
Signed-off-by: Mingming Cao <cmm@xxxxxxxxxx>
Cc: Eric Sandeen <sandeen@xxxxxxx>
Cc: Girish Shilamkar <girish@xxxxxxxxxxxxx>
Cc: <snakebyte@xxxxxx>
Cc: Theodore Ts'o <tytso@xxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/jbd2/commit.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN fs/jbd2/commit.c~ext4-fix-null-pointer-deref-in-journal_wait_on_commit_record fs/jbd2/commit.c
--- a/fs/jbd2/commit.c~ext4-fix-null-pointer-deref-in-journal_wait_on_commit_record
+++ a/fs/jbd2/commit.c
@@ -872,7 +872,8 @@ wait_for_iobuf:
if (err)
__jbd2_journal_abort_hard(journal);
}
- err = journal_wait_on_commit_record(cbh);
+ if (!err && !is_journal_aborted(journal))
+ err = journal_wait_on_commit_record(cbh);
if (err)
jbd2_journal_abort(journal, err);
_
Patches currently in -mm which might be from cmm@xxxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
