Skip to contentSkip to conversation

[2.4] Make reiserfs not to crash on oom during mount

PATCH New Oleg Drokin 1 participant 1 message May 12, 2004

lore
Share & tools
lore

Oleg Drokin

author
#0 lore raw

PATCH 1/1 [2.4] Make reiserfs not to crash on oom during mount

Hello!

Thanks to Stanford guys, a case where reiserfs would try to dereference NULL pointer if memory allocation fail during mount process was identified.

The patch is below.

Bye,
Oleg

===== fs/reiserfs/journal.c 1.31 vs edited =====

fs/reiserfs/journal.c +8 -2
@@ -198,6 +198,9 @@
 static void cleanup_bitmap_list(struct super_block *p_s_sb,
                                 struct reiserfs_list_bitmap *jb) {
   int i;
+  if (jb->bitmaps == NULL)
+	return ;
+
   for (i = 0 ; i < SB_BMAP_NR(p_s_sb) ; i++) {
     if (jb->bitmaps[i]) {
       free_bitmap_node(p_s_sb, jb->bitmaps[i]) ;

@@ -2064,8 +2067,11 @@
     INIT_LIST_HEAD(&SB_JOURNAL(p_s_sb)->j_bitmap_nodes) ;
     INIT_LIST_HEAD (&SB_JOURNAL(p_s_sb)->j_prealloc_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 */