| Message ID | 1502191120-32023-3-git-send-email-amit.pundir@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
On 8 August 2017 at 16:48, Amit Pundir <amit.pundir@linaro.org> wrote: > From: Jin Qian <jinqian@android.com> Cherry picked the patch from android common tree initially (because it applied cleanly) and commit log from upstream, that's why it picked Jin's android email-ID. Sorry for the confusion. Regards, Amit Pundir > > commit 15d3042a937c13f5d9244241c7a9c8416ff6e82a upstream. > > 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> > [AmitP: Found in Android Security bulletin for Aug'17, fixes CVE-2017-10663] > Signed-off-by: Amit Pundir <amit.pundir@linaro.org> > --- > fs/f2fs/super.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c > index 7e0c002c12e9..eb20b8767f3c 100644 > --- a/fs/f2fs/super.c > +++ b/fs/f2fs/super.c > @@ -1424,6 +1424,8 @@ int sanity_check_ckpt(struct f2fs_sb_info *sbi) > unsigned int total, fsmeta; > struct f2fs_super_block *raw_super = F2FS_RAW_SUPER(sbi); > struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi); > + 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); > @@ -1435,6 +1437,20 @@ int sanity_check_ckpt(struct f2fs_sb_info *sbi) > if (unlikely(fsmeta >= total)) > 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; > -- > 2.7.4 >
On Tue, Aug 08, 2017 at 04:54:10PM +0530, Amit Pundir wrote: > On 8 August 2017 at 16:48, Amit Pundir <amit.pundir@linaro.org> wrote: > > From: Jin Qian <jinqian@android.com> > > Cherry picked the patch from android common tree initially (because it > applied cleanly) and commit log from upstream, that's why it picked > Jin's android email-ID. Sorry for the confusion. Ok, thanks, I've fixed that up and queued all of these up, thanks. greg k-h
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 7e0c002c12e9..eb20b8767f3c 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1424,6 +1424,8 @@ int sanity_check_ckpt(struct f2fs_sb_info *sbi) unsigned int total, fsmeta; struct f2fs_super_block *raw_super = F2FS_RAW_SUPER(sbi); struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi); + 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); @@ -1435,6 +1437,20 @@ int sanity_check_ckpt(struct f2fs_sb_info *sbi) if (unlikely(fsmeta >= total)) 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;