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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2646FC433EF for ; Mon, 27 Sep 2021 15:48:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0357760F6C for ; Mon, 27 Sep 2021 15:48:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235289AbhI0Ptp (ORCPT ); Mon, 27 Sep 2021 11:49:45 -0400 Received: from relayfre-01.paragon-software.com ([176.12.100.13]:44072 "EHLO relayfre-01.paragon-software.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235168AbhI0Ptl (ORCPT ); Mon, 27 Sep 2021 11:49:41 -0400 Received: from dlg2.mail.paragon-software.com (vdlg-exch-02.paragon-software.com [172.30.1.105]) by relayfre-01.paragon-software.com (Postfix) with ESMTPS id 00113120; Mon, 27 Sep 2021 18:48:00 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paragon-software.com; s=mail; t=1632757681; bh=Y0JHdIH45Xa9ZCUoh5TKDqkYQ3fHtemZz6rs2gmTyBg=; h=Date:Subject:From:To:CC:References:In-Reply-To; b=pM/9bFBVv4P9BQNLjaHj7HHcF2EQ2PXoEv6R5DngqlW6VvoQ3mv3ThX3Wchk5bpwZ Vdnm5gAMBdMM88gUW24SdwahrdMefUotcNqPMODHhSEawxCDuLq7E7jkudj2jA8BEW 3eSz3BeRlmT95kfmWHSC1yWNZFgEnt7OnvFJnrj8= Received: from [192.168.211.27] (192.168.211.27) by vdlg-exch-02.paragon-software.com (172.30.1.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 27 Sep 2021 18:48:00 +0300 Message-ID: <6036b141-56e2-0d08-b9ff-641c3451f45a@paragon-software.com> Date: Mon, 27 Sep 2021 18:48:00 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.1.1 Subject: [PATCH 2/3] fs/ntfs3: Reject mount if boot's cluster size < media sector size Content-Language: en-US From: Konstantin Komarov To: CC: , References: <16cbff75-f705-37cb-ad3f-43d433352f6b@paragon-software.com> In-Reply-To: <16cbff75-f705-37cb-ad3f-43d433352f6b@paragon-software.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [192.168.211.27] X-ClientProxiedBy: vdlg-exch-02.paragon-software.com (172.30.1.105) To vdlg-exch-02.paragon-software.com (172.30.1.105) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If we continue to work in this case, then we can corrupt fs. Signed-off-by: Konstantin Komarov --- fs/ntfs3/super.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c index 7099d9b1f3aa..193f9a98f6ab 100644 --- a/fs/ntfs3/super.c +++ b/fs/ntfs3/super.c @@ -763,9 +763,14 @@ static int ntfs_init_from_boot(struct super_block *sb, u32 sector_size, sbi->mft.lbo = mlcn << sbi->cluster_bits; sbi->mft.lbo2 = mlcn2 << sbi->cluster_bits; + /* Compare boot's cluster and sector. */ if (sbi->cluster_size < sbi->sector_size) goto out; + /* Compare boot's cluster and media sector. */ + if (sbi->cluster_size < sector_size) + goto out; /* No way to use ntfs_get_block in this case. */ + sbi->cluster_mask = sbi->cluster_size - 1; sbi->cluster_mask_inv = ~(u64)sbi->cluster_mask; sbi->record_size = record_size = boot->record_size < 0 -- 2.33.0