ocfs2: quota_local: fix possible uninitialized-variable access in ocfs2_local_read_info()
PATCH v3 1/1 ocfs2: quota_local: fix possible uninitialized-variable access in ocfs2_local_read_info()
A memory block is allocated through kmalloc(), and its return value is assigned to the pointer oinfo. However, oinfo->dqi_gqinode is not initialized but it is accessed in:
iput(oinfo->dqi_gqinode);
To fix this possible uninitialized-variable access, assign NULL to oinfo->dqi_gqinode, and add ocfs2_qinfo_lock_res_init() behind the assignment in ocfs2_local_read_info(). Remove ocfs2_qinfo_lock_res_init() in ocfs2_global_read_info().
---
v3:
* Update description.
* Assign NULL to oinfo->dqi_gqinode, and add ocfs2_qinfo_lock_res_init() behind the assignment in ocfs2_local_read_info(). Remove ocfs2_qinfo_lock_res_init() in ocfs2_global_read_info() Thank Joseph Qi for helpful advice.
v2:
* Replace kzalloc() with NULL assignment to oinfo->dqi_gqinode. Thank Joseph Qi for helpful advice.
--- fs/ocfs2/quota_global.c | 1 - fs/ocfs2/quota_local.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-)
fs/ocfs2/quota_global.c +0 -1
@@ -357,7 +357,6 @@ int ocfs2_global_read_info(struct super_block *sb, int type) } oinfo->dqi_gi.dqi_sb = sb; oinfo->dqi_gi.dqi_type = type; -ocfs2_qinfo_lock_res_init (&oinfo->dqi_gqlock, oinfo); oinfo->dqi_gi.dqi_entry_size =sizeof (struct ocfs2_global_disk_dqblk ); oinfo->dqi_gi.dqi_ops = &ocfs2_global_ops; oinfo->dqi_gqi_bh =NULL ;
fs/ocfs2/quota_local.c +2 -0
@@ -702,6 +702,8 @@ static int ocfs2_local_read_info(struct super_block *sb, int type) info->dqi_priv = oinfo; oinfo->dqi_type = type;INIT_LIST_HEAD (&oinfo->dqi_chunk); + oinfo->dqi_gqinode =NULL ; +ocfs2_qinfo_lock_res_init (&oinfo->dqi_gqlock, oinfo); oinfo->dqi_rec =NULL ; oinfo->dqi_lqi_bh =NULL ; oinfo->dqi_libh =NULL ;
Signature · 1 line
2.25.1
Quoted 10 lines · Tuo Li
A memory block is allocated through
kmalloc(), and its return value is assigned to the pointer oinfo. However,oinfo->dqi_gqinodeis not initialized but it is accessed in:
iput(oinfo->dqi_gqinode);To fix this possible uninitialized-variable access, assign NULL to
oinfo->dqi_gqinode, and addocfs2_qinfo_lock_res_init()behind the assignment inocfs2_local_read_info(). Removeocfs2_qinfo_lock_res_init()inocfs2_global_read_info().
Or we can simplify the above description to:
"To fix the possible uninitialized-variable access, initialize dqi_gqinode and dqi_gqlock first before calling ocfs2_global_read_info()."
Quoted 2 lines
Reported-by TOTE Robot <[email protected]>Signed-off-by Tuo Li <[email protected]>
Quoted 41 lines
---
v3:
* Update description.
* Assign NULL tooinfo->dqi_gqinode, and addocfs2_qinfo_lock_res_init()behind the assignment inocfs2_local_read_info(). Removeocfs2_qinfo_lock_res_init()inocfs2_global_read_info()Thank Joseph Qi for helpful advice.
v2:
* Replacekzalloc()with NULL assignment tooinfo->dqi_gqinode. Thank Joseph Qi for helpful advice.--- fs/ocfs2/quota_global.c | 1 - fs/ocfs2/quota_local.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-)fs/ocfs2/quota_global.c +0
-1@@ -357,7 +357,6 @@ int ocfs2_global_read_info(struct super_block *sb, int type) } oinfo->dqi_gi.dqi_sb = sb; oinfo->dqi_gi.dqi_type = type; -ocfs2_qinfo_lock_res_init (&oinfo->dqi_gqlock, oinfo); oinfo->dqi_gi.dqi_entry_size =sizeof (struct ocfs2_global_disk_dqblk ); oinfo->dqi_gi.dqi_ops = &ocfs2_global_ops; oinfo->dqi_gqi_bh =NULL ;fs/ocfs2/quota_local.c +2
-0@@ -702,6 +702,8 @@ static int ocfs2_local_read_info(struct super_block *sb, int type) info->dqi_priv = oinfo; oinfo->dqi_type = type;INIT_LIST_HEAD (&oinfo->dqi_chunk); + oinfo->dqi_gqinode =NULL ; +ocfs2_qinfo_lock_res_init (&oinfo->dqi_gqlock, oinfo); oinfo->dqi_rec =NULL ; oinfo->dqi_lqi_bh =NULL ; oinfo->dqi_libh =NULL ;
Joseph Qi
maintainerHi Andrew,
It seems you haven't picked this patch into -mm tree. Should we resend it or it's fine now?
Thanks,
Joseph
Quoted 64 lines · Joseph Qi
Quoted 10 lines · Tuo Li
A memory block is allocated through
kmalloc(), and its return value is assigned to the pointer oinfo. However,oinfo->dqi_gqinodeis not initialized but it is accessed in:
iput(oinfo->dqi_gqinode);To fix this possible uninitialized-variable access, assign NULL to
oinfo->dqi_gqinode, and addocfs2_qinfo_lock_res_init()behind the assignment inocfs2_local_read_info(). Removeocfs2_qinfo_lock_res_init()inocfs2_global_read_info().Or we can simplify the above description to:
"To fix the possible uninitialized-variable access, initializedqi_gqinodeanddqi_gqlockfirst before callingocfs2_global_read_info()."Quoted 2 lines
Reported-by TOTE Robot <[email protected]>Signed-off-by Tuo Li <[email protected]>Reviewed-by Joseph Qi <[email protected]>Quoted 41 lines
---
v3:
* Update description.
* Assign NULL tooinfo->dqi_gqinode, and addocfs2_qinfo_lock_res_init()behind the assignment inocfs2_local_read_info(). Removeocfs2_qinfo_lock_res_init()inocfs2_global_read_info()Thank Joseph Qi for helpful advice.
v2:
* Replacekzalloc()with NULL assignment tooinfo->dqi_gqinode. Thank Joseph Qi for helpful advice.--- fs/ocfs2/quota_global.c | 1 - fs/ocfs2/quota_local.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-)fs/ocfs2/quota_global.c +0
-1@@ -357,7 +357,6 @@ int ocfs2_global_read_info(struct super_block *sb, int type) } oinfo->dqi_gi.dqi_sb = sb; oinfo->dqi_gi.dqi_type = type; -ocfs2_qinfo_lock_res_init (&oinfo->dqi_gqlock, oinfo); oinfo->dqi_gi.dqi_entry_size =sizeof (struct ocfs2_global_disk_dqblk ); oinfo->dqi_gi.dqi_ops = &ocfs2_global_ops; oinfo->dqi_gqi_bh =NULL ;fs/ocfs2/quota_local.c +2
-0@@ -702,6 +702,8 @@ static int ocfs2_local_read_info(struct super_block *sb, int type) info->dqi_priv = oinfo; oinfo->dqi_type = type;INIT_LIST_HEAD (&oinfo->dqi_chunk); + oinfo->dqi_gqinode =NULL ; +ocfs2_qinfo_lock_res_init (&oinfo->dqi_gqlock, oinfo); oinfo->dqi_rec =NULL ; oinfo->dqi_lqi_bh =NULL ; oinfo->dqi_libh =NULL ;