Skip to contentSkip to conversation

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

PATCH Superseded Tuo Li 2 participants 3 messages Jul 31, 2021 – Aug 11, 2021 OCFS2

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Tuo Li

author
#0 lore raw

PATCH 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.

---
 fs/ocfs2/quota_local.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ocfs2/quota_local.c +1 -1
index b1a8b046f4c2..4c1219e08b49 100644
@@ -693,7 +693,7 @@ static int ocfs2_local_read_info(struct super_block *sb, int type)
 
 	info->dqi_max_spc_limit = 0x7fffffffffffffffLL;
 	info->dqi_max_ino_limit = 0x7fffffffffffffffLL;
-	oinfo = kmalloc(sizeof(struct ocfs2_mem_dqinfo), GFP_NOFS);
+	oinfo = kzalloc(sizeof(struct ocfs2_mem_dqinfo), GFP_NOFS);
 	if (!oinfo) {
 		mlog(ML_ERROR, "failed to allocate memory for ocfs2 quota"
 			       " info.");
Signature · 1 line
2.25.1
maintainer
#1 lore raw

Thanks for the efforts.
For the issue you mentioned, I'd like just initialized oinfo->dqi_gqinode as NULL before calling ocfs2_global_read_info(). But it seems still have other issues here such as dqi_gqlock. We need take care all those initialized in ocfs2_global_read_info() carefully.

Thanks,
Joseph

Quoted 30 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.

---
 fs/ocfs2/quota_local.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ocfs2/quota_local.c +1 -1
index b1a8b046f4c2..4c1219e08b49 100644
@@ -693,7 +693,7 @@ static int ocfs2_local_read_info(struct super_block *sb, int type)
 
 	info->dqi_max_spc_limit = 0x7fffffffffffffffLL;
 	info->dqi_max_ino_limit = 0x7fffffffffffffffLL;
-	oinfo = kmalloc(sizeof(struct ocfs2_mem_dqinfo), GFP_NOFS);
+	oinfo = kzalloc(sizeof(struct ocfs2_mem_dqinfo), GFP_NOFS);
 	if (!oinfo) {
 		mlog(ML_ERROR, "failed to allocate memory for ocfs2 quota"
 			       " info.");
author
#2 lore raw

Thanks for your feedback. We will prepare a V2 patch according to your advice.

Best wishes,
Tuo Li

Quoted 33 lines · Joseph Qi

Thanks for the efforts.
For the issue you mentioned, I'd like just initialized oinfo->dqi_gqinode as NULL before calling ocfs2_global_read_info(). But it seems still have other issues here such as dqi_gqlock. We need take care all those initialized in ocfs2_global_read_info() carefully.

Thanks,
Joseph

Quoted 22 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.

---
  fs/ocfs2/quota_local.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
fs/ocfs2/quota_local.c +0 -0
index b1a8b046f4c2..4c1219e08b49 100644
@@ -693,7 +693,7 @@ static int ocfs2_local_read_info(struct super_block *sb, int type)
 
Quoted 8 lines

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

Quoted 8 lines
fs/ocfs2/quota_local.c +1 -1
  	info->dqi_max_spc_limit = 0x7fffffffffffffffLL;
  	info->dqi_max_ino_limit = 0x7fffffffffffffffLL;
-	oinfo = kmalloc(sizeof(struct ocfs2_mem_dqinfo), GFP_NOFS);
+	oinfo = kzalloc(sizeof(struct ocfs2_mem_dqinfo), GFP_NOFS);
  	if (!oinfo) {
  		mlog(ML_ERROR, "failed to allocate memory for ocfs2 quota"
  			       " info.");

_______________________________________________
Ocfs2-devel mailing list
[email protected]
https://oss.oracle.com/mailman/listinfo/ocfs2-devel