From nobody Wed Feb 11 16:13:37 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5831DC77B75 for ; Mon, 8 May 2023 12:37:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234225AbjEHMhJ (ORCPT ); Mon, 8 May 2023 08:37:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234236AbjEHMhE (ORCPT ); Mon, 8 May 2023 08:37:04 -0400 Received: from relayaws-01.paragon-software.com (relayaws-01.paragon-software.com [35.157.23.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B9C83702A; Mon, 8 May 2023 05:37:02 -0700 (PDT) Received: from dlg2.mail.paragon-software.com (vdlg-exch-02.paragon-software.com [172.30.1.105]) by relayaws-01.paragon-software.com (Postfix) with ESMTPS id 9754021C3; Mon, 8 May 2023 12:32:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paragon-software.com; s=mail; t=1683549133; bh=Sg0UiYsarTe92ydsTCL9y6XxwHeH2AmXLAFXljDEI6s=; h=Date:Subject:From:To:CC:References:In-Reply-To; b=tPo/NAlD9PThmgQqltZ6Hqx/EHFIp4JWKcj24vVACX2ClRtdQbjzGRHtj/ryuV0HL LvA3Q1en1sRJ20sJJyniCi8J3Hg6rAJYLqagxiMMmU1y0KR7pJOLJpMf4paZEvzMfI rYk/6uFsdXQFzfAF4V5qo0WLfJ2oxezIFRaKxC8I= Received: from [192.168.211.146] (192.168.211.146) 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.2375.7; Mon, 8 May 2023 15:36:59 +0300 Message-ID: Date: Mon, 8 May 2023 16:36:59 +0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Subject: [PATCH 03/10] fs/ntfs3: Mark ntfs dirty when on-disk struct is corrupted Content-Language: en-US From: Konstantin Komarov To: CC: Linux Kernel Mailing List , References: In-Reply-To: Content-Type: text/plain; charset="utf-8"; format="flowed" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [192.168.211.146] X-ClientProxiedBy: vobn-exch-01.paragon-software.com (172.30.72.13) To vdlg-exch-02.paragon-software.com (172.30.1.105) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Konstantin Komarov --- =C2=A0fs/ntfs3/fsntfs.c=C2=A0 | 2 +- =C2=A0fs/ntfs3/index.c=C2=A0=C2=A0 | 6 ++++++ =C2=A0fs/ntfs3/ntfs_fs.h | 2 ++ =C2=A0fs/ntfs3/record.c=C2=A0 | 6 ++++++ =C2=A04 files changed, 15 insertions(+), 1 deletion(-) diff --git a/fs/ntfs3/fsntfs.c b/fs/ntfs3/fsntfs.c index 28cc421102e5..21567e58265c 100644 --- a/fs/ntfs3/fsntfs.c +++ b/fs/ntfs3/fsntfs.c @@ -178,7 +178,7 @@ int ntfs_fix_post_read(struct NTFS_RECORD_HEADER=20 *rhdr, size_t bytes, =C2=A0=C2=A0=C2=A0 =C2=A0/* Check errors. */ =C2=A0=C2=A0=C2=A0 =C2=A0if ((fo & 1) || fo + fn * sizeof(short) > SECTOR_= SIZE || !fn-- || =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0 fn * SECTOR_SIZE > bytes) { -=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0return -EINVAL; /* Native chkntfs re= turns ok! */ +=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0return -E_NTFS_CORRUPT; =C2=A0=C2=A0=C2=A0 =C2=A0} =C2=A0=C2=A0=C2=A0 =C2=A0/* Get fixup pointer. */ diff --git a/fs/ntfs3/index.c b/fs/ntfs3/index.c index 0a48d2d67219..b40da258e684 100644 --- a/fs/ntfs3/index.c +++ b/fs/ntfs3/index.c @@ -1113,6 +1113,12 @@ int indx_read(struct ntfs_index *indx, struct=20 ntfs_inode *ni, CLST vbn, =C2=A0=C2=A0=C2=A0 =C2=A0*node =3D in; =C2=A0out: +=C2=A0=C2=A0 =C2=A0if (err =3D=3D -E_NTFS_CORRUPT) { +=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0ntfs_inode_err(&ni->vfs_inode, "dire= ctory corrupted"); +=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0ntfs_set_state(ni->mi.sbi, NTFS_DIRT= Y_ERROR); +=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0err =3D -EINVAL; +=C2=A0=C2=A0 =C2=A0} + =C2=A0=C2=A0=C2=A0 =C2=A0if (ib !=3D in->index) =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0kfree(ib); diff --git a/fs/ntfs3/ntfs_fs.h b/fs/ntfs3/ntfs_fs.h index eb01f7e76479..2e4be773728d 100644 --- a/fs/ntfs3/ntfs_fs.h +++ b/fs/ntfs3/ntfs_fs.h @@ -53,6 +53,8 @@ enum utf16_endian; =C2=A0#define E_NTFS_NONRESIDENT=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0556 =C2=A0/* NTFS specific error code about punch hole. */ =C2=A0#define E_NTFS_NOTALIGNED=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0557 +/* NTFS specific error code when on-disk struct is corrupted. */ +#define E_NTFS_CORRUPT=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 = =C2=A0558 =C2=A0/* sbi->flags */ diff --git a/fs/ntfs3/record.c b/fs/ntfs3/record.c index 7060f784c2d7..7974ca35a15c 100644 --- a/fs/ntfs3/record.c +++ b/fs/ntfs3/record.c @@ -180,6 +180,12 @@ int mi_read(struct mft_inode *mi, bool is_mft) =C2=A0=C2=A0=C2=A0 =C2=A0return 0; =C2=A0out: +=C2=A0=C2=A0 =C2=A0if (err =3D=3D -E_NTFS_CORRUPT) { +=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0ntfs_err(sbi->sb, "mft corrupted"); +=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0ntfs_set_state(sbi, NTFS_DIRTY_ERROR= ); +=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0err =3D -EINVAL; +=C2=A0=C2=A0 =C2=A0} + =C2=A0=C2=A0=C2=A0 =C2=A0return err; =C2=A0} --=20 2.34.1