aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChao Yu <yuchao0@huawei.com>2021-04-02 15:12:43 +0800
committerJaegeuk Kim <jaegeuk@kernel.org>2021-04-12 11:20:56 -0700
commit159752dd3c97290bd10fe6433d8c7731f04a82dc (patch)
tree45f04863805c16759edd5a9dca19948cb8ee05bd
parent98e64635bdb43b9684b6afe77d01f8d841b0a72a (diff)
downloadf2fs-tools-159752dd3c97290bd10fe6433d8c7731f04a82dc.tar.gz
resize.f2fs: fix wrong sit/nat bitmap during rebuild_checkpoint()
As beroal <me@beroal.in.ua> reported: f2fs image can be corrupted after below testcase: 1. truncate -s $((256*1024*1024)) img 2. mkfs.f2fs -f img 3. mount -t f2fs -o loop img /mnt 4. xfs_io -f /mnt/file -c "pwrite 0 2M" -c "fsync" 5. umount /mnt 6. resize.f2fs -s -t 262144 img 7. fsck.f2fs img The root cause is we forgot to copy original sit/nat bitmap to new checkpoint during rebuild_checkpoint(), fix it. Reported-and-testd-by: beroal <me@beroal.in.ua> Signed-off-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-rw-r--r--fsck/resize.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fsck/resize.c b/fsck/resize.c
index 0425498..a083f68 100644
--- a/fsck/resize.c
+++ b/fsck/resize.c
@@ -526,6 +526,11 @@ static void rebuild_checkpoint(struct f2fs_sb_info *sbi,
memcpy(new_cp, cp, (unsigned char *)cp->sit_nat_version_bitmap -
(unsigned char *)cp);
+ if (c.safe_resize)
+ memcpy((void *)new_cp + CP_BITMAP_OFFSET,
+ (void *)cp + CP_BITMAP_OFFSET,
+ F2FS_BLKSIZE - CP_BITMAP_OFFSET);
+
new_cp->checkpoint_ver = cpu_to_le64(cp_ver + 1);
crc = f2fs_checkpoint_chksum(new_cp);