Skip to content

Commit c82bc1a

Browse files
Daejun7ParkJaegeuk Kim
authored andcommitted
f2fs: fix null reference error when checking end of zone
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: e067dc3 ("f2fs: maintain six open zones for zoned devices") Signed-off-by: Daejun Park <[email protected]> Reviewed-by: Chao Yu <[email protected]> Reviewed-by: Daeho Jeong <[email protected]> Signed-off-by: Jaegeuk Kim <[email protected]>
1 parent 8c40998 commit c82bc1a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

fs/f2fs/data.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -925,6 +925,7 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio)
925925
#ifdef CONFIG_BLK_DEV_ZONED
926926
static bool is_end_zone_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr)
927927
{
928+
struct block_device *bdev = sbi->sb->s_bdev;
928929
int devi = 0;
929930

930931
if (f2fs_is_multi_device(sbi)) {
@@ -935,8 +936,9 @@ static bool is_end_zone_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr)
935936
return false;
936937
}
937938
blkaddr -= FDEV(devi).start_blk;
939+
bdev = FDEV(devi).bdev;
938940
}
939-
return bdev_is_zoned(FDEV(devi).bdev) &&
941+
return bdev_is_zoned(bdev) &&
940942
f2fs_blkz_is_seq(sbi, devi, blkaddr) &&
941943
(blkaddr % sbi->blocks_per_blkz == sbi->blocks_per_blkz - 1);
942944
}

0 commit comments

Comments
 (0)