Skip to contentSkip to conversation

ocfs2: quota_local: fix possible uninitialized-variable access in ocfs2_local_read_info()

PATCH Superseded Tuo Li 2 participants 2 messages Aug 4, 2021 OCFS2

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Tuo Li

author
#0 lore raw

PATCH v2 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. If the return value of ocfs2_global_read_info() at line 709 is less than zero, oinfo->dqi_gqinode may be not initialized. However, it is accessed at line 775:
iput(oinfo->dqi_gqinode);

To fix this possible uninitialized-variable access, replace kmalloc() with kzalloc() when allocating memory for oinfo.

---
v2:
* Replace kzalloc() with NULL assignment to oinfo->dqi_gqinode. Thank Joseph Qi for helpful advice.

---
 fs/ocfs2/quota_local.c | 1 +
 1 file changed, 1 insertion(+)
fs/ocfs2/quota_local.c +1 -0
index b1a8b046f4c2..de5aae584d5d 100644
@@ -703,6 +703,7 @@ static int ocfs2_local_read_info(struct super_block *sb, int type)
 	oinfo->dqi_type = type;
 	INIT_LIST_HEAD(&oinfo->dqi_chunk);
 	oinfo->dqi_rec = NULL;
+	oinfo->dqi_gqinode = NULL;
 	oinfo->dqi_lqi_bh = NULL;
 	oinfo->dqi_libh = NULL;
 
Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 10 lines · Tuo Li

A memory block is allocated through kmalloc(), and its return value is assigned to the pointer oinfo. If the return value of ocfs2_global_read_info() at line 709 is less than zero, oinfo->dqi_gqinode may be not initialized. However, it is accessed at line 775:
iput(oinfo->dqi_gqinode);

To fix this possible uninitialized-variable access, replace kmalloc() with kzalloc() when allocating memory for oinfo.

Update description as well.

Quoted 15 lines

---
v2:
* Replace kzalloc() with NULL assignment to oinfo->dqi_gqinode. Thank Joseph Qi for helpful advice.

---
 fs/ocfs2/quota_local.c | 1 +
 1 file changed, 1 insertion(+)
fs/ocfs2/quota_local.c +0 -0
index b1a8b046f4c2..de5aae584d5d 100644

fs/ocfs2/quota_local.c static int ocfs2_local_read_info(struct super_block *sb, int type) · line 709

Quoted 7 lines
fs/ocfs2/quota_local.c +1 -0
@@ -703,6 +703,7 @@ static int ocfs2_local_read_info(struct super_block *sb, int type)
 	oinfo->dqi_type = type;
 	INIT_LIST_HEAD(&oinfo->dqi_chunk);
 	oinfo->dqi_rec = NULL;
+	oinfo->dqi_gqinode = NULL;
 	oinfo->dqi_lqi_bh = NULL;
 	oinfo->dqi_libh = NULL;
 

We need take care oinfo->dqi_gqlock as well. How about the following way?

fs/ocfs2/quota_global.c +0 -1
index eda8348..f033de7 100644
@@ -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
index b1a8b04..0e4b16d 100644
@@ -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;