Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp376808yba; Wed, 24 Apr 2019 02:51:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqyQdyr061XmkRNf1QUarKBYkhLYbeTNEUcYD2MmU/XmqvXUtBo1WyK7QBDdQvk3WTsKFIy9 X-Received: by 2002:a65:648f:: with SMTP id e15mr29961163pgv.414.1556099512406; Wed, 24 Apr 2019 02:51:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556099512; cv=none; d=google.com; s=arc-20160816; b=xsF+B/+PSfL1yek4s1vSaY80dihX0xhtPJdZITEyboKA20CgUP6E4z4OL7KF99mWJY Cyfu3fjJURm8C+5JMSuIZcy1AZLdfJcN1akjtdY4myQi57ZVtmrpkS2oe622E19M2Hab +iY9ptzgXRxMufSZl/Kiu19DeaiF7C2nDcg4JIYbLvF6G6A1US1kZ8rdgeKcj/0rWjRN uRRQelsEP8pRBnjvTpXF5MHszBF06KCRRBZ5psMrI8vb097axYnmD7F66BKxDbz6i31m z2sv6AOJnS2qZ00egZkCwntj8J+A73ZJTDue+MCEhX2bncpr3nIZJevMZj51pnFRaMNM f8jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from; bh=aEL/S75mFbpgSOZlisKvXQWjWWyw36i294lKGTBVXN4=; b=U0YmvXIjzBYoflfTi21sdJUqi9ub8GjipPJj1WJZVTDtFwGoAYNLTDGD4fyjySbayq 6tPz7H+6X7i5So8a2h1fuYa7W+E2fNwFjT+H0EgdZYTIWbivpgaLsR19HLrsKj87CAxz ILoIsw+TJ1k7cyGtZ7S0G7l7XFYtpzdrAk4d1YILiEdqqFJB96yP/TowaNRNcSnzdhG2 xjd7wADVwnmsruiW19Gh2ZXgcwZ5ePIln/VorrbIAIf+a5VUvwFluVRmQ3BuZmM/jrAg nTmnbXY3K0vOOwDvWgDJyVgpl21NugN4yPAiyQkXsPgzt9HfcfWeqL2uKuSGun6z+jWi /AcQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f7si806358plr.365.2019.04.24.02.51.36; Wed, 24 Apr 2019 02:51:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728360AbfDXJtE (ORCPT + 99 others); Wed, 24 Apr 2019 05:49:04 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:2994 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726274AbfDXJtE (ORCPT ); Wed, 24 Apr 2019 05:49:04 -0400 Received: from DGGEMM406-HUB.china.huawei.com (unknown [172.30.72.57]) by Forcepoint Email with ESMTP id 3A0831C229B203AFC7A9; Wed, 24 Apr 2019 17:49:01 +0800 (CST) Received: from dggeme763-chm.china.huawei.com (10.3.19.109) by DGGEMM406-HUB.china.huawei.com (10.3.20.214) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 24 Apr 2019 17:48:58 +0800 Received: from szvp000201624.huawei.com (10.120.216.130) by dggeme763-chm.china.huawei.com (10.3.19.109) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Wed, 24 Apr 2019 17:48:57 +0800 From: Chao Yu To: CC: , , , Chao Yu Subject: [PATCH] f2fs: fix to do sanity with enabled features in image Date: Wed, 24 Apr 2019 17:48:50 +0800 Message-ID: <20190424094850.118323-1-yuchao0@huawei.com> X-Mailer: git-send-email 2.18.0.rc1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.120.216.130] X-ClientProxiedBy: dggeme711-chm.china.huawei.com (10.1.199.107) To dggeme763-chm.china.huawei.com (10.3.19.109) X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch fixes to do sanity with enabled features in image, if there are features kernel can not recognize, just fail the mount. Signed-off-by: Chao Yu --- fs/f2fs/f2fs.h | 13 +++++++++++++ fs/f2fs/super.c | 9 +++++++++ 2 files changed, 22 insertions(+) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index f5ffc09705eb..15b640967e12 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -151,6 +151,19 @@ struct f2fs_mount_info { #define F2FS_FEATURE_VERITY 0x0400 /* reserved */ #define F2FS_FEATURE_SB_CHKSUM 0x0800 +#define F2FS_ALL_FEATURES (F2FS_FEATURE_ENCRYPT | \ + F2FS_FEATURE_BLKZONED | \ + F2FS_FEATURE_ATOMIC_WRITE | \ + F2FS_FEATURE_EXTRA_ATTR | \ + F2FS_FEATURE_PRJQUOTA | \ + F2FS_FEATURE_INODE_CHKSUM | \ + F2FS_FEATURE_FLEXIBLE_INLINE_XATTR | \ + F2FS_FEATURE_QUOTA_INO | \ + F2FS_FEATURE_INODE_CRTIME | \ + F2FS_FEATURE_LOST_FOUND | \ + F2FS_FEATURE_VERITY | \ + F2FS_FEATURE_SB_CHKSUM) + #define __F2FS_HAS_FEATURE(raw_super, mask) \ ((raw_super->feature & cpu_to_le32(mask)) != 0) #define F2FS_HAS_FEATURE(sbi, mask) __F2FS_HAS_FEATURE(sbi->raw_super, mask) diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 4f8e9ab48b26..57f2fc6d14ba 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2573,6 +2573,15 @@ static int sanity_check_raw_super(struct f2fs_sb_info *sbi, return 1; } + /* check whether kernel supports all features */ + if (le32_to_cpu(raw_super->feature) & (~F2FS_ALL_FEATURES)) { + f2fs_msg(sb, KERN_INFO, + "Unsupported feature:%u: supported:%u", + le32_to_cpu(raw_super->feature), + F2FS_ALL_FEATURES); + return 1; + } + /* check CP/SIT/NAT/SSA/MAIN_AREA area boundary */ if (sanity_check_area_boundary(sbi, bh)) return 1; -- 2.18.0.rc1