mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
ocfs2: fix NULL pointer dereference in function ocfs2_abort_trigger()
ocfs2_abort_trigger() use bh->b_assoc_map to get sb. But there's no function to set bh->b_assoc_map in ocfs2, it will trigger NULL pointer dereference while calling this function. We can get sb from bh->b_bdev->bd_super instead of b_assoc_map. [akpm@linux-foundation.org: update comment, per Joseph] Signed-off-by: joyce.xue <xuejiufei@huawei.com> Cc: Joseph Qi <joseph.qi@huawei.com> Cc: Mark Fasheh <mfasheh@suse.com> Cc: Joel Becker <jlbec@evilplan.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
fce56d841e
commit
74e364ad1b
1 changed files with 1 additions and 3 deletions
|
@ -571,9 +571,7 @@ static void ocfs2_abort_trigger(struct jbd2_buffer_trigger_type *triggers,
|
||||||
(unsigned long)bh,
|
(unsigned long)bh,
|
||||||
(unsigned long long)bh->b_blocknr);
|
(unsigned long long)bh->b_blocknr);
|
||||||
|
|
||||||
/* We aren't guaranteed to have the superblock here - but if we
|
ocfs2_error(bh->b_bdev->bd_super,
|
||||||
* don't, it'll just crash. */
|
|
||||||
ocfs2_error(bh->b_assoc_map->host->i_sb,
|
|
||||||
"JBD2 has aborted our journal, ocfs2 cannot continue\n");
|
"JBD2 has aborted our journal, ocfs2 cannot continue\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue