Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2364314imu; Thu, 24 Jan 2019 11:27:01 -0800 (PST) X-Google-Smtp-Source: ALg8bN7fI5Tx1sDkdHnPpVLnoZ7y9c/qAMYc0RZgtmqXC13glLWDcOHZJt6H8Af+T7r9vnSaPaFD X-Received: by 2002:a62:9419:: with SMTP id m25mr8134082pfe.147.1548358020965; Thu, 24 Jan 2019 11:27:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548358020; cv=none; d=google.com; s=arc-20160816; b=jpX1SCn3A7n7SDM5o+6eYAxyKwVcJutMH//6f/q3Vd7/NbrYhZoarnh81L/ymEQz+W WgQpF+T58WjHw5QMsbPxqHgMLlrWTFU+HWAH+50BI94K3nk7Kb8eQwHEaJq8VZiPO9o7 7kYp16pG6SBHP1/FtmDD4tHANG9UTTb3BG+BDhlb10EZ6P5v6Em1NImCRGJwt4Q0J2jm HACQbqFbUktzdLlLtgOxCS+T2+9aAnNNy+WTluNSchj+Cdkl62I1TdPxYDxY//Usu2Te imNbnryoofR55jmatfyD+iVcug3eGJOsyZsZGopws4f6S3VVqWnfWqWBFnyh1NPNjxB/ YDpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=wMwy7d5L5HemdUgdASTzJRWvkCVfqE4ae2O8C/gCa24=; b=CyNJ3dqwwAZpMpifI0X7DIbICrqtUM0NRwFGg/AuTLzJyitW0fSxD1VQv1iTRCnDsT 4dRvbsZPJ+x5uPbJSlvCKCofHXJr2xCzBWwY5Ha8qJu3Wh2M/wC8cjUzTt47en7cWIwI 7YT1c7D/r7OrbsahBKG/AcPTlvp76DlNqRotOndBs8X4XsNSaT7KnDhCsIF9dbMSHj43 rDXM9DzwUwbsfVrJhM/YryZgoyI4fCNPBSS+VEjoN4mm3r2+HeOEDIYuMljr5QdHAZa0 y9SNoevXAcPlhpReWv5eV8e26C7+D2DzOpLXy/oil4j7mGoqpvsZrnc+fRrLKWS8DS/7 axcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=C5drIixW; 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 c6si21722123plr.414.2019.01.24.11.26.45; Thu, 24 Jan 2019 11:27:00 -0800 (PST) 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; dkim=pass header.i=@kernel.org header.s=default header.b=C5drIixW; 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 S1729614AbfAXTYc (ORCPT + 99 others); Thu, 24 Jan 2019 14:24:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:49792 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729596AbfAXTYb (ORCPT ); Thu, 24 Jan 2019 14:24:31 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DC47721902; Thu, 24 Jan 2019 19:24:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548357870; bh=rt3Yfs4yYJxpHF6bXA5QWXgoY+2WXs7vRwzRIGzSlZg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C5drIixWC5tcB/NAzYIkfv69HFWwoKcbZhv8BEMQP97c3zwncPMUwQzzTHnd68GmR kBPe1XFQu5wayHsTjvtPLztsajAoEtqp+nz5Ovj/mP9s678+BZ5rdPpexUIOc7Kzm9 4VZxr1YlIIZPqm8pRvx71O4mWA+/Kf5u2YNFvLeA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jaegeuk Kim , Ben Hutchings , Eric Biggers Subject: [PATCH 4.4 018/104] f2fs: detect wrong layout Date: Thu, 24 Jan 2019 20:19:07 +0100 Message-Id: <20190124190156.882115643@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190124190154.968308875@linuxfoundation.org> References: <20190124190154.968308875@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jaegeuk Kim commit 2040fce83fe17763b07c97c1f691da2bb85e4135 upstream. Previous mkfs.f2fs allows small partition inappropriately, so f2fs should detect that as well. Refer this in f2fs-tools. mkfs.f2fs: detect small partition by overprovision ratio and # of segments Reported-and-Tested-by: Eric Biggers Signed-off-by: Jaegeuk Kim [bwh: Backported to 4.4: adjust context] Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman --- fs/f2fs/segment.h | 2 ++ fs/f2fs/super.c | 11 +++++++++++ 2 files changed, 13 insertions(+) --- a/fs/f2fs/segment.h +++ b/fs/f2fs/segment.h @@ -17,6 +17,8 @@ #define DEF_RECLAIM_PREFREE_SEGMENTS 5 /* 5% over total segments */ +#define F2FS_MIN_SEGMENTS 9 /* SB + 2 (CP + SIT + NAT) + SSA + MAIN */ + /* L: Logical segment # in volume, R: Relative segment # in main area */ #define GET_L2R_SEGNO(free_i, segno) (segno - free_i->start_segno) #define GET_R2L_SEGNO(free_i, segno) (segno + free_i->start_segno) --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1078,6 +1078,7 @@ int sanity_check_ckpt(struct f2fs_sb_inf unsigned int total, fsmeta; struct f2fs_super_block *raw_super = F2FS_RAW_SUPER(sbi); struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi); + unsigned int ovp_segments, reserved_segments; unsigned int main_segs, blocks_per_seg; unsigned int sit_segs, nat_segs; unsigned int sit_bitmap_size, nat_bitmap_size; @@ -1096,6 +1097,16 @@ int sanity_check_ckpt(struct f2fs_sb_inf if (unlikely(fsmeta >= total)) return 1; + ovp_segments = le32_to_cpu(ckpt->overprov_segment_count); + reserved_segments = le32_to_cpu(ckpt->rsvd_segment_count); + + if (unlikely(fsmeta < F2FS_MIN_SEGMENTS || + ovp_segments == 0 || reserved_segments == 0)) { + f2fs_msg(sbi->sb, KERN_ERR, + "Wrong layout: check mkfs.f2fs version"); + return 1; + } + main_segs = le32_to_cpu(raw_super->segment_count_main); blocks_per_seg = sbi->blocks_per_seg;