* [Ocfs2-devel] [PATCH] ocfs2: quota_local: fix possible uninitialized-variable access in ocfs2_local_read_info()
@ 2021-07-31 7:56 Tuo Li
2021-07-31 13:57 ` Joseph Qi
0 siblings, 1 reply; 3+ messages in thread
From: Tuo Li @ 2021-07-31 7:56 UTC (permalink / raw)
To: mark, jlbec, joseph.qi
Cc: TOTE Robot, baijiaju1990, linux-kernel, ocfs2-devel, 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.
Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
Signed-off-by: Tuo Li <islituo@gmail.com>
---
fs/ocfs2/quota_local.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c
index b1a8b046f4c2..4c1219e08b49 100644
--- a/fs/ocfs2/quota_local.c
+++ b/fs/ocfs2/quota_local.c
@@ -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.");
--
2.25.1
_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Ocfs2-devel] [PATCH] ocfs2: quota_local: fix possible uninitialized-variable access in ocfs2_local_read_info()
2021-07-31 7:56 [Ocfs2-devel] [PATCH] ocfs2: quota_local: fix possible uninitialized-variable access in ocfs2_local_read_info() Tuo Li
@ 2021-07-31 13:57 ` Joseph Qi
2021-08-01 8:19 ` Li Tuo
0 siblings, 1 reply; 3+ messages in thread
From: Joseph Qi @ 2021-07-31 13:57 UTC (permalink / raw)
To: Tuo Li, mark, jlbec; +Cc: TOTE Robot, baijiaju1990, linux-kernel, ocfs2-devel
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
On 7/31/21 3:56 PM, Tuo Li wrote:
> 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.
>
> Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
> Signed-off-by: Tuo Li <islituo@gmail.com>
> ---
> fs/ocfs2/quota_local.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c
> index b1a8b046f4c2..4c1219e08b49 100644
> --- a/fs/ocfs2/quota_local.c
> +++ b/fs/ocfs2/quota_local.c
> @@ -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.");
>
_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Ocfs2-devel] [PATCH] ocfs2: quota_local: fix possible uninitialized-variable access in ocfs2_local_read_info()
2021-07-31 13:57 ` Joseph Qi
@ 2021-08-01 8:19 ` Li Tuo
0 siblings, 0 replies; 3+ messages in thread
From: Li Tuo @ 2021-08-01 8:19 UTC (permalink / raw)
To: Joseph Qi; +Cc: linux-kernel, baijiaju1990, TOTE Robot, ocfs2-devel
[-- Attachment #1.1: Type: text/plain, Size: 1749 bytes --]
Thanks for your feedback. We will prepare a V2 patch according to your advice.
Best wishes,
Tuo Li
On 2021/7/31 21:57, Joseph Qi wrote:
> 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
>
> On 7/31/21 3:56 PM, Tuo Li wrote:
>> 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.
>>
>> Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
>> Signed-off-by: Tuo Li <islituo@gmail.com>
>> ---
>> fs/ocfs2/quota_local.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c
>> index b1a8b046f4c2..4c1219e08b49 100644
>> --- a/fs/ocfs2/quota_local.c
>> +++ b/fs/ocfs2/quota_local.c
>> @@ -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.");
>>
[-- Attachment #1.2: Type: text/html, Size: 2269 bytes --]
[-- Attachment #2: Type: text/plain, Size: 151 bytes --]
_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-08-11 5:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-31 7:56 [Ocfs2-devel] [PATCH] ocfs2: quota_local: fix possible uninitialized-variable access in ocfs2_local_read_info() Tuo Li
2021-07-31 13:57 ` Joseph Qi
2021-08-01 8:19 ` Li Tuo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).