UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

f2fs: fix null reference error when checking end of zone 

commit c82bc1ab2a8a5e73d9728e80c4c2ed87e8921a38 upstream.

This patch fixes a potentially null pointer being accessed by
is_end_zone_blkaddr() that checks the last block of a zone
when f2fs is mounted as a single device.

Fixes: e067dc3c6b ("f2fs: maintain six open zones for zoned devices")
Signed-off-by: Daejun Park <daejun7.park@samsung.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Reviewed-by: Daeho Jeong <daehojeong@google.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
[ Resolve minor conflicts ]
Signed-off-by: Bin Lan <bin.lan.cn@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Daejun Park 2024-07-04 10:01:21 +09:00 committed by Greg Kroah-Hartman
parent 475d99e611
commit b987773097
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/f2fs/data.c
View File

@ -924,6 +924,7 @@ alloc_new:
#ifdef CONFIG_BLK_DEV_ZONED #ifdef CONFIG_BLK_DEV_ZONED
static bool is_end_zone_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr) static bool is_end_zone_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr)
{ {
struct block_device *bdev = sbi->sb->s_bdev;
int devi = 0; int devi = 0;
if (f2fs_is_multi_device(sbi)) { if (f2fs_is_multi_device(sbi)) {
@ -934,8 +935,9 @@ static bool is_end_zone_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr)
return false; return false;
} }
blkaddr -= FDEV(devi).start_blk; blkaddr -= FDEV(devi).start_blk;
bdev = FDEV(devi).bdev;
} }
return bdev_zoned_model(FDEV(devi).bdev) == BLK_ZONED_HM && return bdev_is_zoned(bdev) &&
f2fs_blkz_is_seq(sbi, devi, blkaddr) && f2fs_blkz_is_seq(sbi, devi, blkaddr) &&
(blkaddr % sbi->blocks_per_blkz == sbi->blocks_per_blkz - 1); (blkaddr % sbi->blocks_per_blkz == sbi->blocks_per_blkz - 1);
} }