From d0980c12bbb794fdfef4fb0f82e08e2e94905daf Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Fri, 14 May 2004 20:22:51 -0700 Subject: [PATCH] [PATCH] Fix reiserfs oom crash From: Oleg Drokin Thanks to Standford guys, a case where reiserfs can dereference NULL pointer if memory allocation fail during mount was identified. --- fs/reiserfs/journal.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index e1f1f3bf153ac..52e637f8b1429 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c @@ -2260,8 +2260,10 @@ int journal_init(struct super_block *p_s_sb, const char * j_dev_name, int old_fo INIT_LIST_HEAD (&SB_JOURNAL(p_s_sb)->j_prealloc_list); INIT_LIST_HEAD(&SB_JOURNAL(p_s_sb)->j_working_list); INIT_LIST_HEAD(&SB_JOURNAL(p_s_sb)->j_journal_list); - reiserfs_allocate_list_bitmaps(p_s_sb, SB_JOURNAL(p_s_sb)->j_list_bitmap, - SB_BMAP_NR(p_s_sb)) ; + if (reiserfs_allocate_list_bitmaps(p_s_sb, + SB_JOURNAL(p_s_sb)->j_list_bitmap, + SB_BMAP_NR(p_s_sb))) + goto free_and_return ; allocate_bitmap_nodes(p_s_sb) ; /* reserved for journal area support */ -- 2.53.0