lkml.org 
[lkml]   [2021]   [May]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 114/289] f2fs: fix to avoid accessing invalid fio in f2fs_allocate_data_block()
    Date
    From: Chao Yu <yuchao0@huawei.com>

    [ Upstream commit 25ae837e61dee712b4b1df36602ebfe724b2a0b6 ]

    Callers may pass fio parameter with NULL value to f2fs_allocate_data_block(),
    so we should make sure accessing fio's field after fio's validation check.

    Fixes: f608c38c59c6 ("f2fs: clean up parameter of f2fs_allocate_data_block()")
    Signed-off-by: Chao Yu <yuchao0@huawei.com>
    Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/f2fs/segment.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
    index 1c264fd5a0dd..d04b449978aa 100644
    --- a/fs/f2fs/segment.c
    +++ b/fs/f2fs/segment.c
    @@ -3407,12 +3407,12 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,
    f2fs_inode_chksum_set(sbi, page);
    }

    - if (F2FS_IO_ALIGNED(sbi))
    - fio->retry = false;
    -
    if (fio) {
    struct f2fs_bio_info *io;

    + if (F2FS_IO_ALIGNED(sbi))
    + fio->retry = false;
    +
    INIT_LIST_HEAD(&fio->list);
    fio->in_list = true;
    io = sbi->write_io[fio->type] + fio->temp;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-05-17 17:46    [W:5.599 / U:0.504 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site