Commit b048d846 authored Feb 05, 2008 by Mingming Cao Committed by Theodore Ts'o Feb 05, 2008

jbd2: Add error check to journal_wait_on_commit_record to avoid oops



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.

Looking at the jbd2 debug messages, before the oops happened, the jbd2
is aborted due to trying to access the next log block beyond the end
of device. This might be caused by using a corrupted image.

We need to check the error returns from journal_submit_commit_record()
and avoid calling journal_wait_on_commit_record() in the failure case.

This addresses Kernel Bugzilla #9849

Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

parent 531021f2

fs/jbd2/commit.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -872,6 +872,7 @@ wait_for_iobuf:
		if (err)
		__jbd2_journal_abort_hard(journal);
		}
		if (!err && !is_journal_aborted(journal))
		err = journal_wait_on_commit_record(cbh);

		if (err)

Admin message