* [Ocfs2-devel] [PATCH v3] ocfs2: quota_local: fix possible uninitialized-variable access in ocfs2_local_read_info()
@ 2021-08-04 3:18 Tuo Li
2021-08-04 3:26 ` Joseph Qi
0 siblings, 1 reply; 3+ messages in thread
From: Tuo Li @ 2021-08-04 3:18 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. 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().
Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
Signed-off-by: Tuo Li <islituo@gmail.com>
---
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(-)
diff --git a/fs/ocfs2/quota_global.c b/fs/ocfs2/quota_global.c
index eda83487c9ec..f033de733adb 100644
--- a/fs/ocfs2/quota_global.c
+++ b/fs/ocfs2/quota_global.c
@@ -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;
diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c
index b1a8b046f4c2..0e4b16d4c037 100644
--- a/fs/ocfs2/quota_local.c
+++ b/fs/ocfs2/quota_local.c
@@ -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;
--
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 v3] ocfs2: quota_local: fix possible uninitialized-variable access in ocfs2_local_read_info()
2021-08-04 3:18 [Ocfs2-devel] [PATCH v3] ocfs2: quota_local: fix possible uninitialized-variable access in ocfs2_local_read_info() Tuo Li
@ 2021-08-04 3:26 ` Joseph Qi
2021-08-19 3:46 ` Joseph Qi
0 siblings, 1 reply; 3+ messages in thread
From: Joseph Qi @ 2021-08-04 3:26 UTC (permalink / raw)
To: Tuo Li, mark, jlbec; +Cc: TOTE Robot, baijiaju1990, linux-kernel, ocfs2-devel
On 8/4/21 11:18 AM, Tuo Li wrote:
> 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().
>
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()."
> Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
> Signed-off-by: Tuo Li <islituo@gmail.com>
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
> ---
> 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(-)
>
> diff --git a/fs/ocfs2/quota_global.c b/fs/ocfs2/quota_global.c
> index eda83487c9ec..f033de733adb 100644
> --- a/fs/ocfs2/quota_global.c
> +++ b/fs/ocfs2/quota_global.c
> @@ -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;
> diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c
> index b1a8b046f4c2..0e4b16d4c037 100644
> --- a/fs/ocfs2/quota_local.c
> +++ b/fs/ocfs2/quota_local.c
> @@ -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;
>
_______________________________________________
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 v3] ocfs2: quota_local: fix possible uninitialized-variable access in ocfs2_local_read_info()
2021-08-04 3:26 ` Joseph Qi
@ 2021-08-19 3:46 ` Joseph Qi
0 siblings, 0 replies; 3+ messages in thread
From: Joseph Qi @ 2021-08-19 3:46 UTC (permalink / raw)
To: Tuo Li, akpm; +Cc: linux-kernel, baijiaju1990, TOTE Robot, ocfs2-devel
Hi Andrew,
It seems you haven't picked this patch into -mm tree.
Should we resend it or it's fine now?
Thanks,
Joseph
On 8/4/21 11:26 AM, Joseph Qi wrote:
>
>
> On 8/4/21 11:18 AM, Tuo Li wrote:
>> 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().
>>
>
> 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()."
>
>> Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
>> Signed-off-by: Tuo Li <islituo@gmail.com>
>
> Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
>> ---
>> 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(-)
>>
>> diff --git a/fs/ocfs2/quota_global.c b/fs/ocfs2/quota_global.c
>> index eda83487c9ec..f033de733adb 100644
>> --- a/fs/ocfs2/quota_global.c
>> +++ b/fs/ocfs2/quota_global.c
>> @@ -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;
>> diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c
>> index b1a8b046f4c2..0e4b16d4c037 100644
>> --- a/fs/ocfs2/quota_local.c
>> +++ b/fs/ocfs2/quota_local.c
>> @@ -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;
>>
_______________________________________________
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-19 3:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-04 3:18 [Ocfs2-devel] [PATCH v3] ocfs2: quota_local: fix possible uninitialized-variable access in ocfs2_local_read_info() Tuo Li
2021-08-04 3:26 ` Joseph Qi
2021-08-19 3:46 ` Joseph Qi
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).