Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1549072pxb; Thu, 16 Sep 2021 09:42:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMK9pKJrKLGd/sWdSFq2jyWMa5f4OddyFoSveCAvJVXIzGL8GV7pqG3YfFL4Rqb3MKnWwl X-Received: by 2002:a92:de41:: with SMTP id e1mr4748685ilr.85.1631810523125; Thu, 16 Sep 2021 09:42:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631810523; cv=none; d=google.com; s=arc-20160816; b=xmFJUTMkMqk5PBfIPoTS+4l/2Dw/neigU3QxBm97837am9quKygKIRe/oczem5+H0R Wia3+hVN2v0mWapElLRp/uZXKTEVA3Cnd85Av4sPYJqbWgq1Bc6Zq5smxML3pS+ImCpo T0JoHrmTbrIpVD8YEcR/YPVoQ0xf+If41M/HfPpzzO6YyS9TkonadzMtMG4bumc9T94V oPfWEub8nnhxtdZacowmnHZ8RB6lsO0ZEN3NODisNOJkI/0ml7TQxVDTPE7gr9TP1yRa TWlOj/ONW/rS12lWbRXr/dYN0D+hwCCtusz8PVo8RlxQNREnz3IOJ9vOjjBMH8j+GFZ1 uhwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=XUTPgdk6HKIiSh6NezXkUOLU6uUYmaiPMUAHmsB9IKY=; b=P76ygH6U6GkguV+8PoVQc27z4fWe+s+UdaaQZOYSO35+AMVAaOJFocgE7BF4zLEkcw SIVACcJJoKORr7PuBdfm/Z3NVG8anQF6ukyqz11faHI070FDK/4UsCnLWtBMXRIefkEp 4K79A/RAOpo8M1C3OijfOYi4LufAEyPqm1r7BeILc8OGx6XqcJHAMdHeb59D7dr+pIl7 Nyq4hNvxIwbGPXHZMcGE1K6+a6nKkJOwgnKgcCokUjx7zdvszLF9ubiqxgNtZ4ijBP7k aUA7RKQ8WlYkRYe55QbTY/I3SXrI2wyNNt7yC/IqfmWZSbvq9nTrhTHE5ticG1hbXEkf xbdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=GoczdCn8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m12si3106671ioj.96.2021.09.16.09.41.50; Thu, 16 Sep 2021 09:42:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=GoczdCn8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244546AbhIPQjR (ORCPT + 99 others); Thu, 16 Sep 2021 12:39:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:44916 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241827AbhIPQbp (ORCPT ); Thu, 16 Sep 2021 12:31:45 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6E4D3617E5; Thu, 16 Sep 2021 16:19:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631809179; bh=mfpxUUgB3seM6CGdC6opDqjYemAWFVac4NvJ2HLR6yQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GoczdCn8zPk4kG2I9Wrg+6hP9E/1rIRX/pGPrjdWX8bDVTsKCLWhTbFHgdSxnSBdZ jE78JizR7BnnDO3zcRbU555T/HlefqIuLZxJf7PA8xHvQJ2sMqX6KzZ/H+N5UNREgQ xzASyfFXsySsAnHhFCZ8Z06qVBn/vky9scelG59U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, stable@kernel.org, Chao Yu , Jaegeuk Kim Subject: [PATCH 5.13 059/380] f2fs: fix to do sanity check for sb/cp fields correctly Date: Thu, 16 Sep 2021 17:56:56 +0200 Message-Id: <20210916155806.000389543@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155803.966362085@linuxfoundation.org> References: <20210916155803.966362085@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chao Yu commit 65ddf6564843890a58ee3b18bb46ce67d96333fb upstream. This patch fixes below problems of sb/cp sanity check: - in sanity_check_raw_superi(), it missed to consider log header blocks while cp_payload check. - in f2fs_sanity_check_ckpt(), it missed to check nat_bits_blocks. Cc: Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Greg Kroah-Hartman --- fs/f2fs/super.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -3089,11 +3089,13 @@ static int sanity_check_raw_super(struct return -EFSCORRUPTED; } - if (le32_to_cpu(raw_super->cp_payload) > - (blocks_per_seg - F2FS_CP_PACKS)) { - f2fs_info(sbi, "Insane cp_payload (%u > %u)", + if (le32_to_cpu(raw_super->cp_payload) >= + (blocks_per_seg - F2FS_CP_PACKS - + NR_CURSEG_PERSIST_TYPE)) { + f2fs_info(sbi, "Insane cp_payload (%u >= %u)", le32_to_cpu(raw_super->cp_payload), - blocks_per_seg - F2FS_CP_PACKS); + blocks_per_seg - F2FS_CP_PACKS - + NR_CURSEG_PERSIST_TYPE); return -EFSCORRUPTED; } @@ -3129,6 +3131,7 @@ int f2fs_sanity_check_ckpt(struct f2fs_s unsigned int cp_pack_start_sum, cp_payload; block_t user_block_count, valid_user_blocks; block_t avail_node_count, valid_node_count; + unsigned int nat_blocks, nat_bits_bytes, nat_bits_blocks; int i, j; total = le32_to_cpu(raw_super->segment_count); @@ -3249,6 +3252,17 @@ int f2fs_sanity_check_ckpt(struct f2fs_s return 1; } + nat_blocks = nat_segs << log_blocks_per_seg; + nat_bits_bytes = nat_blocks / BITS_PER_BYTE; + nat_bits_blocks = F2FS_BLK_ALIGN((nat_bits_bytes << 1) + 8); + if (__is_set_ckpt_flags(ckpt, CP_NAT_BITS_FLAG) && + (cp_payload + F2FS_CP_PACKS + + NR_CURSEG_PERSIST_TYPE + nat_bits_blocks >= blocks_per_seg)) { + f2fs_warn(sbi, "Insane cp_payload: %u, nat_bits_blocks: %u)", + cp_payload, nat_bits_blocks); + return -EFSCORRUPTED; + } + if (unlikely(f2fs_cp_error(sbi))) { f2fs_err(sbi, "A bug case: need to run fsck"); return 1;