Unverified Commit b3a5ef8d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10018 ocfs2: fix NULL pointer dereference in ocfs2_journal_dirty() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Zhaolong <wangzhaolong1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/XUURHTWAMDSAIWZW2SPVM42IPYFTEEP5/ 
 
https://gitee.com/src-openeuler/kernel/issues/IACSVC 
 
Link:https://gitee.com/openeuler/kernel/pulls/10018

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 628759f2 755f9c54

fs/ocfs2/journal.c

+6 −4
Original line number Diff line number Diff line
@@ -798,13 +798,15 @@ void ocfs2_journal_dirty(handle_t *handle, struct buffer_head *bh) 
		if (!is_handle_aborted(handle)) {

			journal_t *journal = handle->h_transaction->t_journal;



			mlog(ML_ERROR, "jbd2_journal_dirty_metadata failed. "

					"Aborting transaction and journal.\n");

			mlog(ML_ERROR, "jbd2_journal_dirty_metadata failed: "

			     "handle type %u started at line %u, credits %u/%u "

			     "errcode %d. Aborting transaction and journal.\n",

			     handle->h_type, handle->h_line_no,

			     handle->h_requested_credits,

			     jbd2_handle_buffer_credits(handle), status);

			handle->h_err = status;

			jbd2_journal_abort_handle(handle);

			jbd2_journal_abort(journal, status);

			ocfs2_abort(bh->b_assoc_map->host->i_sb,

				    "Journal already aborted.\n");

		}

	}

}