From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1520FC38145 for ; Thu, 8 Sep 2022 02:19:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229494AbiIHCTi (ORCPT ); Wed, 7 Sep 2022 22:19:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229552AbiIHCTg (ORCPT ); Wed, 7 Sep 2022 22:19:36 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED55ADEEF for ; Wed, 7 Sep 2022 19:19:33 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 3F2D2B81F74 for ; Thu, 8 Sep 2022 02:19:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C764DC433C1; Thu, 8 Sep 2022 02:19:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1662603570; bh=ZBwM0mEwQaz0h5QIi1KTl30dxYFls2TBzdKQD+f6Yn4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=sjF0M7lBOFTgnQ3d6AYWjOtRC5afZxR4mWKHQHF/B9wqpes9tiIppNfLHDDL7MDTJ g6WihaeVUW1bs9v3M812lttzimQiFKIJWkgwNKqrbmsUSjgJEr1hpEQd21yh6ehfOy g4+5o0LvWCt5IIsCW9Eqh4X0Hg7nGEr30Hgs5LHxyu/vV78M2OdOIbNQFfm+RQYaw7 dxNs6EZpRx7ZilZI5CHOOq2W6zhcx6KszkXdgdWRuReGJ/bkrQqdRwtaaupmsV+dqb YC6hgIwG11ES67kaex8DgaHXiqM/+QyDYnxZGN0tdaGTj8l0AHJb75clHBi7NEV2gQ theHHVLZIwJjw== Date: Wed, 7 Sep 2022 19:19:29 -0700 From: Jaegeuk Kim To: Chao Yu Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: Re: [PATCH v2] f2fs: fix to disallow getting inner inode via f2fs_iget() Message-ID: References: <20220830225358.300027-1-chao@kernel.org> <0af788ed-8797-22a2-ae0c-433fdd6a2188@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <0af788ed-8797-22a2-ae0c-433fdd6a2188@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/08, Chao Yu wrote: > On 2022/9/8 10:02, Jaegeuk Kim wrote: > > On 08/31, Chao Yu wrote: > > > From: Chao Yu > > > > > > Introduce f2fs_iget_inner() for f2fs_fill_super() to get inner inode: > > > meta inode, node inode or compressed inode, and add f2fs_check_nid_range() > > > in f2fs_iget() to avoid getting inner inode from external interfaces. > > > > So, we don't want to check the range of inner inode numbers? What'd be the > > way to check it's okay? > > For node_ino, meta_ino, root_ino, we have checked them in sanity_check_raw_super() > as below: > > /* check reserved ino info */ > if (le32_to_cpu(raw_super->node_ino) != 1 || > le32_to_cpu(raw_super->meta_ino) != 2 || > le32_to_cpu(raw_super->root_ino) != 3) { > f2fs_info(sbi, "Invalid Fs Meta Ino: node(%u) meta(%u) root(%u)", > le32_to_cpu(raw_super->node_ino), > le32_to_cpu(raw_super->meta_ino), > le32_to_cpu(raw_super->root_ino)); > return -EFSCORRUPTED; > } > > compressed_ino should always be NM_I(sbi)->max_nid, it can be checked in > f2fs_init_compress_inode()? Hmm, I'm not sure whether we really need this patch, since it'd look better to handle all the iget with single f2fs_iget? > > Thanks, > > > > > > > > > Signed-off-by: Chao Yu > > > --- > > > v2: > > > - don't override errno from f2fs_check_nid_range() > > > - fix compile error > > > fs/f2fs/compress.c | 2 +- > > > fs/f2fs/f2fs.h | 1 + > > > fs/f2fs/inode.c | 13 ++++++++++++- > > > fs/f2fs/super.c | 4 ++-- > > > 4 files changed, 16 insertions(+), 4 deletions(-) > > > > > > diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c > > > index 730256732a9e..c38b22bb6432 100644 > > > --- a/fs/f2fs/compress.c > > > +++ b/fs/f2fs/compress.c > > > @@ -1947,7 +1947,7 @@ int f2fs_init_compress_inode(struct f2fs_sb_info *sbi) > > > if (!test_opt(sbi, COMPRESS_CACHE)) > > > return 0; > > > - inode = f2fs_iget(sbi->sb, F2FS_COMPRESS_INO(sbi)); > > > + inode = f2fs_iget_inner(sbi->sb, F2FS_COMPRESS_INO(sbi)); > > > if (IS_ERR(inode)) > > > return PTR_ERR(inode); > > > sbi->compress_inode = inode; > > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > > > index 408d8034ed74..35f9e1a6a1bf 100644 > > > --- a/fs/f2fs/f2fs.h > > > +++ b/fs/f2fs/f2fs.h > > > @@ -3467,6 +3467,7 @@ int f2fs_pin_file_control(struct inode *inode, bool inc); > > > void f2fs_set_inode_flags(struct inode *inode); > > > bool f2fs_inode_chksum_verify(struct f2fs_sb_info *sbi, struct page *page); > > > void f2fs_inode_chksum_set(struct f2fs_sb_info *sbi, struct page *page); > > > +struct inode *f2fs_iget_inner(struct super_block *sb, unsigned long ino); > > > struct inode *f2fs_iget(struct super_block *sb, unsigned long ino); > > > struct inode *f2fs_iget_retry(struct super_block *sb, unsigned long ino); > > > int f2fs_try_to_free_nats(struct f2fs_sb_info *sbi, int nr_shrink); > > > diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c > > > index 6d11c365d7b4..965f87c1dd63 100644 > > > --- a/fs/f2fs/inode.c > > > +++ b/fs/f2fs/inode.c > > > @@ -480,7 +480,7 @@ static int do_read_inode(struct inode *inode) > > > return 0; > > > } > > > -struct inode *f2fs_iget(struct super_block *sb, unsigned long ino) > > > +struct inode *f2fs_iget_inner(struct super_block *sb, unsigned long ino) > > > { > > > struct f2fs_sb_info *sbi = F2FS_SB(sb); > > > struct inode *inode; > > > @@ -568,6 +568,17 @@ struct inode *f2fs_iget(struct super_block *sb, unsigned long ino) > > > return ERR_PTR(ret); > > > } > > > +struct inode *f2fs_iget(struct super_block *sb, unsigned long ino) > > > +{ > > > + int ret; > > > + > > > + ret = f2fs_check_nid_range(F2FS_SB(sb), ino); > > > + if (ret) > > > + return ERR_PTR(ret); > > > + > > > + return f2fs_iget_inner(sb, ino); > > > +} > > > + > > > struct inode *f2fs_iget_retry(struct super_block *sb, unsigned long ino) > > > { > > > struct inode *inode; > > > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c > > > index b8e5fe244596..a5f5e7483791 100644 > > > --- a/fs/f2fs/super.c > > > +++ b/fs/f2fs/super.c > > > @@ -4157,7 +4157,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) > > > goto free_xattr_cache; > > > /* get an inode for meta space */ > > > - sbi->meta_inode = f2fs_iget(sb, F2FS_META_INO(sbi)); > > > + sbi->meta_inode = f2fs_iget_inner(sb, F2FS_META_INO(sbi)); > > > if (IS_ERR(sbi->meta_inode)) { > > > f2fs_err(sbi, "Failed to read F2FS meta data inode"); > > > err = PTR_ERR(sbi->meta_inode); > > > @@ -4265,7 +4265,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) > > > goto free_nm; > > > /* get an inode for node space */ > > > - sbi->node_inode = f2fs_iget(sb, F2FS_NODE_INO(sbi)); > > > + sbi->node_inode = f2fs_iget_inner(sb, F2FS_NODE_INO(sbi)); > > > if (IS_ERR(sbi->node_inode)) { > > > f2fs_err(sbi, "Failed to read node inode"); > > > err = PTR_ERR(sbi->node_inode); > > > -- > > > 2.25.1