mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-12 01:14:22 -05:00
53 lines
1.7 KiB
Diff
53 lines
1.7 KiB
Diff
|
From deaeed5b8acdd10c388616bbc57416cf3db213ff Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jin Qian <jinqian@google.com>
|
||
|
|
Date: Mon, 15 May 2017 10:45:08 -0700
|
||
|
|
Subject: f2fs: sanity check checkpoint segno and blkoff
|
||
|
|
|
||
|
|
Make sure segno and blkoff read from raw image are valid.
|
||
|
|
|
||
|
|
Cc: stable@vger.kernel.org
|
||
|
|
Signed-off-by: Jin Qian <jinqian@google.com>
|
||
|
|
[Jaegeuk Kim: adjust minor coding style]
|
||
|
|
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
|
||
|
|
---
|
||
|
|
fs/f2fs/super.c | 16 ++++++++++++++++
|
||
|
|
1 file changed, 16 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
|
||
|
|
index 375dfab..e04be72 100644
|
||
|
|
--- a/fs/f2fs/super.c
|
||
|
|
+++ b/fs/f2fs/super.c
|
||
|
|
@@ -1509,6 +1509,8 @@ int sanity_check_ckpt(struct f2fs_sb_info *sbi)
|
||
|
|
struct f2fs_super_block *raw_super = F2FS_RAW_SUPER(sbi);
|
||
|
|
struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi);
|
||
|
|
unsigned int ovp_segments, reserved_segments;
|
||
|
|
+ unsigned int main_segs, blocks_per_seg;
|
||
|
|
+ int i;
|
||
|
|
|
||
|
|
total = le32_to_cpu(raw_super->segment_count);
|
||
|
|
fsmeta = le32_to_cpu(raw_super->segment_count_ckpt);
|
||
|
|
@@ -1530,6 +1532,20 @@ int sanity_check_ckpt(struct f2fs_sb_info *sbi)
|
||
|
|
return 1;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ main_segs = le32_to_cpu(raw_super->segment_count_main);
|
||
|
|
+ blocks_per_seg = sbi->blocks_per_seg;
|
||
|
|
+
|
||
|
|
+ for (i = 0; i < NR_CURSEG_NODE_TYPE; i++) {
|
||
|
|
+ if (le32_to_cpu(ckpt->cur_node_segno[i]) >= main_segs ||
|
||
|
|
+ le16_to_cpu(ckpt->cur_node_blkoff[i]) >= blocks_per_seg)
|
||
|
|
+ return 1;
|
||
|
|
+ }
|
||
|
|
+ for (i = 0; i < NR_CURSEG_DATA_TYPE; i++) {
|
||
|
|
+ if (le32_to_cpu(ckpt->cur_data_segno[i]) >= main_segs ||
|
||
|
|
+ le16_to_cpu(ckpt->cur_data_blkoff[i]) >= blocks_per_seg)
|
||
|
|
+ return 1;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
if (unlikely(f2fs_cp_error(sbi))) {
|
||
|
|
f2fs_msg(sbi->sb, KERN_ERR, "A bug case: need to run fsck");
|
||
|
|
return 1;
|
||
|
|
--
|
||
|
|
cgit v1.1
|
||
|
|
|