f2fs: fix false alarm on invalid block address
authorJaegeuk Kim <jaegeuk@kernel.org>
Tue, 9 Apr 2024 20:34:11 +0000 (20:34 +0000)
committerJaegeuk Kim <jaegeuk@kernel.org>
Thu, 25 Apr 2024 15:33:09 +0000 (15:33 +0000)
f2fs_ra_meta_pages can try to read ahead on invalid block address which is
not the corruption case.

Cc: <stable@kernel.org> # v6.9+
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=218770
Fixes: 31f85ccc84b8 ("f2fs: unify the error handling of f2fs_is_valid_blkaddr")
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/checkpoint.c

index 5d05a413f4510d61cd59e7f8e8d5ac4f2a338273..55d444bec5c06e136ab5a3c2fba17211c691fd05 100644 (file)
@@ -179,22 +179,22 @@ static bool __f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,
                break;
        case META_SIT:
                if (unlikely(blkaddr >= SIT_BLK_CNT(sbi)))
-                       goto err;
+                       goto check_only;
                break;
        case META_SSA:
                if (unlikely(blkaddr >= MAIN_BLKADDR(sbi) ||
                        blkaddr < SM_I(sbi)->ssa_blkaddr))
-                       goto err;
+                       goto check_only;
                break;
        case META_CP:
                if (unlikely(blkaddr >= SIT_I(sbi)->sit_base_addr ||
                        blkaddr < __start_cp_addr(sbi)))
-                       goto err;
+                       goto check_only;
                break;
        case META_POR:
                if (unlikely(blkaddr >= MAX_BLKADDR(sbi) ||
                        blkaddr < MAIN_BLKADDR(sbi)))
-                       goto err;
+                       goto check_only;
                break;
        case DATA_GENERIC:
        case DATA_GENERIC_ENHANCE:
@@ -228,6 +228,7 @@ static bool __f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,
        return true;
 err:
        f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);
+check_only:
        return false;
 }