From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753279AbeAaCCH (ORCPT ); Tue, 30 Jan 2018 21:02:07 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:40952 "EHLO huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753014AbeAaCCC (ORCPT ); Tue, 30 Jan 2018 21:02:02 -0500 Subject: Re: [PATCH] f2fs: add sanity check for quota sysfile ino To: Jaegeuk Kim CC: , , References: <20180129082933.64556-1-yuchao0@huawei.com> <20180131013556.GE65489@jaegeuk-macbookpro.roam.corp.google.com> From: Chao Yu Message-ID: Date: Wed, 31 Jan 2018 10:01:45 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <20180131013556.GE65489@jaegeuk-macbookpro.roam.corp.google.com> Content-Type: text/plain; charset="windows-1252" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.134.22.195] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2018/1/31 9:35, Jaegeuk Kim wrote: > On 01/29, Chao Yu wrote: >> Add missing sanity check for quota sysfile ino. > > We don't need to limit the specific inode numbers for quota files, since > we may be able to set any inode numbers later. How about checkint the > numbers are allocated as quota? Do you mean: if (raw_super->feature & cpu_to_le32(F2FS_FEATURE_QUOTA_INO)) { if (!le32_to_cpu(raw_super->qf_ino[0]) || !le32_to_cpu(raw_super->qf_ino[1])) { f2fs_msg(sb, KERN_INFO, "Invalid Quota Ino: user_ino(%u), grp_ino(%u)", le32_to_cpu(raw_super->qf_ino[0]), le32_to_cpu(raw_super->qf_ino[1])); return 1; } if (raw_super->feature & cpu_to_le32(F2FS_FEATURE_PRJQUOTA) && !le32_to_cpu(raw_super->qf_ino[2])) { f2fs_msg(sb, KERN_INFO, "Invalid Quota Ino: prj_ino(%u)", le32_to_cpu(raw_super->qf_ino[2])); return 1; } } I think it's equal to: if (raw_super->feature & cpu_to_le32(F2FS_FEATURE_QUOTA_INO)) { unsigned int qf_cnt = 0; if (qf_ino[0]) qf_cnt++; if (qf_ino[1]) qf_cnt++; if (qf_cnt != 2) { f2fs_msg(); return 1; } if (raw_super->feature & cpu_to_le32(F2FS_FEATURE_PRJQUOTA)) { if (qf_ino[2]) qf_cnt++; if (qf_cnt != 3) { f2fs_msg(); return 1; } } } Thanks, > >> >> Signed-off-by: Chao Yu >> --- >> fs/f2fs/super.c | 19 +++++++++++++++++++ >> 1 file changed, 19 insertions(+) >> >> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c >> index 368f63d7bad2..6011071688ca 100644 >> --- a/fs/f2fs/super.c >> +++ b/fs/f2fs/super.c >> @@ -2116,6 +2116,25 @@ static int sanity_check_raw_super(struct f2fs_sb_info *sbi, >> return 1; >> } >> >> + /* check quota sysfile ino info */ >> + if (raw_super->feature & cpu_to_le32(F2FS_FEATURE_QUOTA_INO)) { >> + if (le32_to_cpu(raw_super->qf_ino[0]) != 4 || >> + le32_to_cpu(raw_super->qf_ino[1]) != 5) { >> + f2fs_msg(sb, KERN_INFO, >> + "Invalid Quota Ino: user_ino(%u), grp_ino(%u)", >> + le32_to_cpu(raw_super->qf_ino[0]), >> + le32_to_cpu(raw_super->qf_ino[1])); >> + return 1; >> + } >> + if (raw_super->feature & cpu_to_le32(F2FS_FEATURE_PRJQUOTA) && >> + le32_to_cpu(raw_super->qf_ino[2]) != 6) { >> + f2fs_msg(sb, KERN_INFO, >> + "Invalid Quota Ino: prj_ino(%u)", >> + le32_to_cpu(raw_super->qf_ino[2])); >> + return 1; >> + } >> + } >> + >> if (le32_to_cpu(raw_super->segment_count) > F2FS_MAX_SEGMENT) { >> f2fs_msg(sb, KERN_INFO, >> "Invalid segment count (%u)", >> -- >> 2.15.0.55.gc2ece9dc4de6 > > . >