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 92A8AECAAA1 for ; Tue, 30 Aug 2022 10:36:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229596AbiH3Kgj (ORCPT ); Tue, 30 Aug 2022 06:36:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229558AbiH3Kgh (ORCPT ); Tue, 30 Aug 2022 06:36:37 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16D9EA220B for ; Tue, 30 Aug 2022 03:36:35 -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 77A7AB816B3 for ; Tue, 30 Aug 2022 10:36:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA552C433D6; Tue, 30 Aug 2022 10:36:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1661855793; bh=qMxTTqR/dvJqVgbe2yPKA71cHreZYwt3vwlAgjXYGnU=; h=From:To:Cc:Subject:Date:From; b=cqF+UG+12ZAeOzOfz4Z+24tIYfifvohzAdEvG1r60pvvToyo79BCQOctrx/Ygc7v4 OEfy86rp2tj7nQ268x6curSzOOHoHNLd3uZAgY2rp8hhva+TQHwgOEPRqevvvz0U2W UJ8Hwv7Y9tuxFtvWDoTHvKA7vlYh4+B8UEh0CfdTwHkhT1BZ9WO3u9Y5KYwFLChg8w hZOjTs8j2wyT2cmsTsw3JFNjh54+j7Aw2bl87e7vo15HUNYR9DVUN4dkM7TZsKRO3l UFMk3HdeITdLnhLHG9xnNvbcIaC2S5GeC95VyuVtvklbjMQCXYoEln2pcnV9z+cboC 70FV0B5ZTjUkQ== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH] f2fs: fix to disallow getting inner inode via f2fs_iget() Date: Tue, 30 Aug 2022 18:36:25 +0800 Message-Id: <20220830103625.79034-1-chao@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Signed-off-by: Chao Yu --- fs/f2fs/compress.c | 2 +- fs/f2fs/f2fs.h | 1 + fs/f2fs/inode.c | 10 +++++++++- fs/f2fs/super.c | 4 ++-- 4 files changed, 13 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..0ab3ae9b2110 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,14 @@ 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) +{ + if (f2fs_check_nid_range(F2FS_SB(sb), ino)) + return -EINVAL; + + 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