Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756161AbdLOKIY (ORCPT ); Fri, 15 Dec 2017 05:08:24 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:12003 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755291AbdLOKIS (ORCPT ); Fri, 15 Dec 2017 05:08:18 -0500 Subject: Re: [PATCH] fsck.f2fs: check nid range before use to avoid segmentation fault To: Yunlong Song , , , , CC: , , , , , References: <1513319174-114303-1-git-send-email-yunlong.song@huawei.com> From: Sheng Yong Message-ID: <50f9c7a6-1438-e136-271d-2b9427b9da00@huawei.com> Date: Fri, 15 Dec 2017 18:06:58 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.2.0 MIME-Version: 1.0 In-Reply-To: <1513319174-114303-1-git-send-email-yunlong.song@huawei.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.111.221.165] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090203.5A339F09.01F3,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 90847346553561c886d39d0496af0951 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1241 Lines: 44 On 2017/12/15 14:26, Yunlong Song wrote: > Signed-off-by: Yunlong Song > --- > fsck/fsck.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/fsck/fsck.c b/fsck/fsck.c > index 11b8b0b..2212aa3 100644 > --- a/fsck/fsck.c > +++ b/fsck/fsck.c > @@ -14,6 +14,15 @@ > char *tree_mark; > uint32_t tree_mark_size = 256; > > +static inline int check_nid_range(struct f2fs_sb_info *sbi, nid_t nid) > +{ > + if (nid < F2FS_ROOT_INO(sbi)) > + return -EINVAL; > + if (nid >= NM_I(sbi)->max_nid) > + return -EINVAL; > + return 0; > +} > + Hi Yunlong, I think you could use IS_VALID_NID() instead of check_nid_range. Maybe we could add the check 'if (nid < F2FS_ROOT_INO(sbi))' to IS_VALID_NID(). thanks, Sheng > int f2fs_set_main_bitmap(struct f2fs_sb_info *sbi, u32 blk, int type) > { > struct f2fs_fsck *fsck = F2FS_FSCK(sbi); > @@ -740,7 +749,7 @@ void fsck_chk_inode_blk(struct f2fs_sb_info *sbi, u32 nid, > for (idx = 0; idx < 5; idx++) { > u32 nid = le32_to_cpu(node_blk->i.i_nid[idx]); > > - if (nid != 0) { > + if (nid != 0 && !check_nid_range(sbi, nid)) { > struct node_info ni; > > get_node_info(sbi, nid, &ni); >