lkml.org 
[lkml]   [2021]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.14 90/99] ocfs2: quota_local: fix possible uninitialized-variable access in ocfs2_local_read_info()
    Date
    From: Tuo Li <islituo@gmail.com>

    [ Upstream commit 6c85c2c728193d19d6a908ae9fb312d0325e65ca ]

    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().

    Link: https://lkml.kernel.org/r/20210804031832.57154-1-islituo@gmail.com
    Signed-off-by: Tuo Li <islituo@gmail.com>
    Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
    Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
    Cc: Mark Fasheh <mark@fasheh.com>
    Cc: Joel Becker <jlbec@evilplan.org>
    Cc: Junxiao Bi <junxiao.bi@oracle.com>
    Cc: Changwei Ge <gechangwei@live.cn>
    Cc: Gang He <ghe@suse.com>
    Cc: Jun Piao <piaojun@huawei.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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.30.2
    \
     
     \ /
      Last update: 2021-09-10 02:46    [W:3.272 / U:0.696 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site