ext4: ext4_mb_initialize_context() forgets to initialize some fields
PATCH 1/1 ext4: ext4_mb_initialize_context() forgets to initialize some fields
kmemcheck indicates that ext4_mb_store_histroy() accesses uninitialized values of ac->ac_tail and ac->ac_buddy.
--- fs/ext4/mballoc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
fs/ext4/mballoc.c +2 -0
@@ -4223,6 +4223,8 @@ ext4_mb_initialize_context(struct ext4_allocation_context *ac, ac->ac_groups_scanned =0 ; ac->ac_ex_scanned =0 ; ac->ac_found =0 ; + ac->ac_tail =0 ; + ac->ac_buddy =0 ; ac->ac_sb = sb; ac->ac_inode = ar->inode; ac->ac_o_ex.fe_logical = ar->logical;
Quoted 13 lines · Pavel Roskin
kmemcheck indicates that
ext4_mb_store_histroy()accesses uninitialized values ofac->ac_tailandac->ac_buddy.Signed-off-by Pavel Roskin <[email protected]>--- fs/ext4/mballoc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)fs/ext4/mballoc.c +0
-0
fs/ext4/mballoc.c ext4_mb_initialize_context(struct ext4_allocation_context *ac, · line 4230
Quoted 8 lines
fs/ext4/mballoc.c +2
-0@@ -4223,6 +4223,8 @@ ext4_mb_initialize_context(struct ext4_allocation_context *ac, ac->ac_groups_scanned =0 ; ac->ac_ex_scanned =0 ; ac->ac_found =0 ; + ac->ac_tail =0 ; + ac->ac_buddy =0 ; ac->ac_sb = sb; ac->ac_inode = ar->inode; ac->ac_o_ex.fe_logical = ar->logical;
Looks good to me; I think it's harmless in the end because we just wind up w/ garbage in the history if anyone looks, but much better to not have garbage! :)
At this point I think we are initializing almost all of the 22 allocation context members and 16 of those are 0/NULL; perhaps it'd be simpler and/or more efficient to just start with a memset(0), but either way.
(side note, looks like ac_repeats is completely unused...)
Thanks,
-Eric
Theodore Tso
maintainerQuoted 5 lines · Eric Sandeen
At this point I think we are initializing almost all of the 22 allocation context members and 16 of those are 0/NULL; perhaps it'd be simpler and/or more efficient to just start with a memset(0), but either way.
Agreed, it should be more efficient. This is the patch which I just added to the ext4 patch queue.
- Ted
commit 848a5523c872ae84fbdbce6a3df933a4b7f63e0a
Author: Theodore Ts'o <[email protected]> Date: Mon Jul 13 09:45:52 2009 -0400
ext4: Fix ext4_mb_initialize_context() to initialize all fields
Pavel Roskin pointed out that kmemcheck indicated that ext4_mb_store_history() was accessing uninitialized values of ac->ac_tail and ac->ac_buddy leading to garbage in the mballoc history. Fix this by initializing the entire structure to all zeros first.
Also, two fields were getting doubly initialized by the caller of ext4_mb_initialize_context, so remove them for efficiency's sake.
fs/ext4/mballoc.c +2 -18
@@ -4227,14 +4227,9 @@ ext4_mb_initialize_context(struct ext4_allocation_context *ac,ext4_get_group_no_and_offset (sb, goal, &group, &block);/* set up allocation goals */ +memset (ac,0 ,sizeof (struct ext4_allocation_context )); ac->ac_b_ex.fe_logical = ar->logical; - ac->ac_b_ex.fe_group =0 ; - ac->ac_b_ex.fe_start =0 ; - ac->ac_b_ex.fe_len =0 ; ac->ac_status =AC_STATUS_CONTINUE ; - ac->ac_groups_scanned =0 ; - ac->ac_ex_scanned =0 ; - ac->ac_found =0 ; ac->ac_sb = sb; ac->ac_inode = ar->inode; ac->ac_o_ex.fe_logical = ar->logical;
@@ -4245,15 +4240,7 @@ ext4_mb_initialize_context(struct ext4_allocation_context *ac, ac->ac_g_ex.fe_group = group; ac->ac_g_ex.fe_start = block; ac->ac_g_ex.fe_len = len; - ac->ac_f_ex.fe_len =0 ; ac->ac_flags = ar->flags; - ac->ac_2order =0 ; - ac->ac_criteria =0 ; - ac->ac_pa =NULL ; - ac->ac_bitmap_page =NULL ; - ac->ac_buddy_page =NULL ; - ac->alloc_semp =NULL ; - ac->ac_lg =NULL ;/* we have to define context: we'll we work with a file or * locality group. this is a policy, actually */
@@ -4521,10 +4508,7 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle, } ac =kmem_cache_alloc (ext4_ac_cachep,GFP_NOFS ); -if (ac) { - ac->ac_sb = sb; - ac->ac_inode = ar->inode; - }else { +if (!ac) { ar->len =0 ; *errp = -ENOMEM ; goto out1;
Quoted 9 lines · Theodore Tso
Quoted 5 lines · Eric Sandeen
At this point I think we are initializing almost all of the 22 allocation context members and 16 of those are 0/NULL; perhaps it'd be simpler and/or more efficient to just start with a memset(0), but either way.
Agreed, it should be more efficient. This is the patch which I just added to the ext4 patch queue.
Thanks! I confirm that kmemcheck is silent about ext4 after this patch is applied.
Signature · 2 lines
Regards, Pavel Roskin