From patchwork Tue Jul 30 09:14:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ravi Minnikanti X-Patchwork-Id: 1966410 X-Patchwork-Delegate: hs@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=marvell.com header.i=@marvell.com header.a=rsa-sha256 header.s=selector1 header.b=Do/2hi73; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WY8hV6QVQz1ybX for ; Tue, 30 Jul 2024 19:15:22 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8EF10883A9; Tue, 30 Jul 2024 11:15:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=marvell.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=marvell.com header.i=@marvell.com header.b="Do/2hi73"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0F44A88570; Tue, 30 Jul 2024 11:15:19 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DFA5C88009 for ; Tue, 30 Jul 2024 11:15:16 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=marvell.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rminnikanti@marvell.com Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46U0TE8t001910; Tue, 30 Jul 2024 02:15:03 -0700 Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2041.outbound.protection.outlook.com [104.47.55.41]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 40pnp5hhx9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 30 Jul 2024 02:15:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BjBbAQWaHMCDGs7Mx9zunO0WW0yhwOGkDRtXrcfTPc9sS5YvA3OK1jkOX6juQYGwgOefiM2J9bNQ4viq/uVbCCIzJsyQDl/xQAZiCJ3/wYT7b8aGqU01LGOAlgkIwBXSKNsy3Ed/BN0nOPva6n+3KtuCE0oIXqpGtLIz73MXRJ6m3Cp66toh/vnesxoUj9fsLhW+H2mEXYHFWDv69b/6PzrApmkBrIsZci++sQSrLHQMZDtGbeB/EmcaPhQuFBazg2T8TyunfAZiurrQorsZD2I6VcAIk0j3BzKbm2TfMDLKh8idZMZwFGVKe/NxGYM8Ty1qOSkj2hE5Bq9h6LWtfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=h+pPQIxJR393+l9Lwrb6OSLyLyjn/XlA/WDQpZGMC14=; b=GgTx0LT3UfEjVAR/Zx7v5dtewj9pKmVgpxdQSmf1rVU3X0iXoHijrnmO+rT+8WpOWEVorSa1rvPskZWdndZObYgO2w/knGlmWaAAPXyt0e8WIpzIV0WtRrnv6BHnWTuc2VSNyWzzj46mbOm1m6wurEUJh96EII7i6b2TE7nje4NBFs0lR678KeI7P3SXBwZa1FLRatUiKYUiBa3YChSgYLc6+JX7vRDNWmz7HPdq3g/cEgiTIsWG+GIgYo0Mf/3dgEprIaUlz/AbdYODH3XVL6kQIsEYpb3Sa8A4d+0NHRYZCTKdnAkgdwLKewTezvcV2gPCCpmAhkrQqSj76mg8cw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=marvell.com; dmarc=pass action=none header.from=marvell.com; dkim=pass header.d=marvell.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=h+pPQIxJR393+l9Lwrb6OSLyLyjn/XlA/WDQpZGMC14=; b=Do/2hi73VM7WtKMbeEBgpuAVGlj7nJOkIgBYUcoVtHl883FGnniCj7krYV0QGCZTKscAM4vonAmkyLd5iHdJm6XrLeo6z26pBwk2XybCxQm7iXG+RzllhHypdPsjozXBUWe6YPxDy+EWJYD7g67owjIKMjNaVh7l+JT3LMTwnNU= Received: from CO6PR18MB4451.namprd18.prod.outlook.com (2603:10b6:303:138::12) by BY3PR18MB4707.namprd18.prod.outlook.com (2603:10b6:a03:3ca::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7807.28; Tue, 30 Jul 2024 09:14:59 +0000 Received: from CO6PR18MB4451.namprd18.prod.outlook.com ([fe80::4c2b:70d5:95ac:1d6c]) by CO6PR18MB4451.namprd18.prod.outlook.com ([fe80::4c2b:70d5:95ac:1d6c%6]) with mapi id 15.20.7807.026; Tue, 30 Jul 2024 09:14:59 +0000 Message-ID: Date: Tue, 30 Jul 2024 02:14:57 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 To: U-Boot-Denx , Tom Rini , Heiko Schocher , kmpark@infradead.org From: Ravi Minnikanti Subject: [PATCH] ubifs: mount fails after power cycle Content-Language: en-US X-ClientProxiedBy: BYAPR08CA0053.namprd08.prod.outlook.com (2603:10b6:a03:117::30) To CO6PR18MB4451.namprd18.prod.outlook.com (2603:10b6:303:138::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR18MB4451:EE_|BY3PR18MB4707:EE_ X-MS-Office365-Filtering-Correlation-Id: 7d74fb7b-c8cb-49ac-3103-08dcb07815dd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?utf-8?q?jIeluEkmNNWkIu12qqrKUME61s9Y3xX?= =?utf-8?q?+vNpoDJK/0+q3Z0EZ5i+li3rlRyXjtOitFSJpE2uZjkBcVJ5aNtK7SoLsIOlDNIEL?= =?utf-8?q?I6aNoiVfPmaO/ehbXcOG2hk2zNPZQoBr+wuopNTcjMsCfORVAk3uA6ie3PvGb/+zI?= =?utf-8?q?D488nTNIP4aceQQC4uDxCdEhJ6Sak4aXe53hdaqmmgt+XqMJnpWG+X8I0teMPYrjo?= =?utf-8?q?J7HsgEKi+LisldqBxGLSAEPkUaK4A7Q4D56Ltw7mX6r8qPaE3C9qIVmzdy4sFRx4/?= =?utf-8?q?nw0KKLzBTZGTo4EjeOAkvDqKOELDiMZlOg15XOzv+hqI/A2gUh8e5cr4absTB0nGl?= =?utf-8?q?xI3uVtf0u8K57WUvs8jhVhomZBFYG40pExkJiyl8hZvCdEFTWxoDLqANe/GS7CxTI?= =?utf-8?q?4IP9c8Ibxv3+TJqT4s+dQNp7laaE7WzfGBnXicvxVuGQJKxYHblUrtpZ0+cxCQaw2?= =?utf-8?q?hBtoNH6NRxUtvG1GCKZaY8nfnQia8F4PKJlA5qoj/VnxUwvsC9nR0Sd5l+IrRFvKz?= =?utf-8?q?IjiVDSrX9TVYmW61GS9GlhBD5OYa63N63D6kuaKYdcAoc6XG5Z4HGtxDgEWshz15M?= =?utf-8?q?/awnUbqEiwOWnAj0UWt/yvye/6MZoillivtDu7N2yJoa1eYRfw9CmIb85Ay/HXpqT?= =?utf-8?q?2BQ6HyEJ7GN2DxyJBV5oYDyvknqxbadEUt+0qo8KH1x4skTF8zw8vocMPI8RkPVUN?= =?utf-8?q?KMo7Q/FBEKPTLgzp+06Ib2pz8e2A15Co623CVrM1WDkBcq6zovBX67F2xzdm62UjJ?= =?utf-8?q?66OyYQ+5WJBbKWGglld2trOqK23Ya9MvwrJcabHW0BR1/BG3ukZskSre+2Ue9ALCS?= =?utf-8?q?I+BVV8jRDAhyONXb39ynHQpkraG+q761zLGsKORnWHJEff3YV03rLUFcGguTggt9Y?= =?utf-8?q?+XgfVAT9qlyuwQ4b0OHnngBV2MV2SbUIC2wdZlu9coaoxJM1LTLIfM1H4Lbx2iZEn?= =?utf-8?q?TQJR1aOjW9JP4aUPYN7FgUbboP8oceoJ9tb0VT3absYd1KH7Lp1MakGrWO0bDBbd4?= =?utf-8?q?90p+x5s7RfDXZOLQyXTxI5seHvyCnwrEFc4hjhy/S27nj8QzhsD/DpX69f8b4S6/N?= =?utf-8?q?BovyxnRFKeEJ9PCeeJpvvlb54bUDggcHjtSZVKMu7jo5nJp4hf/P3cv+/0fHCxmZZ?= =?utf-8?q?jqagFw9YJSZ13zvXqT5Ie+uaiQTyiYCi+Qmo6OqdzCM1ZUs++HeiZwqBjkkIvGwSG?= =?utf-8?q?p2KgMI06TjuzZtC70NkVh//yzx/AiWjCJnUtx+4Y0usTYfx0fvohrsckQU0H+Kmht?= =?utf-8?q?UEpvM+5ma6moeFGTOuFsQNkWYvUL3cSEuWA=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CO6PR18MB4451.namprd18.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(366016)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?3o3w4w0Qk67aP03rR3X5iO9UVuav?= =?utf-8?q?rTiinZtMB9DVz+XBNhEGA3aJ1ja6QSALZ9JOVpL2+dmFr+XRDqLE+gedN63qy3hlZ?= =?utf-8?q?OQgCJbcUy363q4u7N2oJCq3ZMHSItOevty0koZmXxxm1pl9rCLqpSI9wVc/TrOBSU?= =?utf-8?q?HbDEmwOlTdmDlpqYEZFe1HL5pSsOlD0se27ONp8Y0YZOAkWnc1rhtShuP4z2ckz7W?= =?utf-8?q?0g5E0Yi4C9xPpUeOuDciG5IvL8UHhuuSLtSxRqtW13JPb3BVugWl7v8QbhaqXvLhD?= =?utf-8?q?i5PC8RGwjHR0rBoBJJT7KSGkoIRJ8gzuzCben2MfLvdTU9WTCXIuBVwHVrAzI9tSg?= =?utf-8?q?nGZQ7Fq6Y2ugICDhiQ4uMfRGVas8Zp5HF54C6SfXWqOXZSaQJLZUieNuAyfYBE+TG?= =?utf-8?q?H4EZ4wOwrrQ9ZCrkHhfYK0Rxr7WNBTsTKuCl7rkqZgUuxFe5PctbeDCL8TtapZ8nP?= =?utf-8?q?YiNN1DqZjXjocsCc/jW80Xppl3vZ2Q+rmGuEV06TM+tIUDbSUXChlB5JeW/zGw4w+?= =?utf-8?q?NKvUt9bXqzeF5xJlQYjBHGyaBWJEmI5dAlolChVCQyLQnQVUoBat3XVRMkJ31/jNA?= =?utf-8?q?u5bQo/51qVmYzSCQ0aYX0k8bh4lm1Y8E+BAOtx8bbyIcISidz1upiS2Vpjuw0xN9H?= =?utf-8?q?Zi1/XR8Anlrl3VnMVulsnQkIJq/DMM1KWxA3QMMdHTPe+On1q7pfdXsMbv9jz3FXu?= =?utf-8?q?7RmWU3c8teo4CGJhCnub28FpR7IQZDeHqGGgmSi3C5q+BaTZA3boyWwAHZC6/hIAt?= =?utf-8?q?OiSZwLyz6cZqAGyHa7InJSerZFmgvjuUDKB6Z6za/tbeCjh5I6ZXgQKFQ6tXYwc0a?= =?utf-8?q?Rj1AO2ihmI+QH4fWMb1Kr1s5+qPDJZaqUVkxa1kwx4ndUmI1LIH7ebML+0DXSUDoj?= =?utf-8?q?dDfojFFQ3xWvg29+lycjgMBgotQ3CbvOel92NpQkMJDHd26i1imcWepSYQEcPp9Bz?= =?utf-8?q?6AU2YTDz105lszSwC30lgIluG+pVMMqWBHv2Gufmx5bWPeZwb5kbkOi88MHTMW/O+?= =?utf-8?q?T4y9IPpxnBwoyBUqPVQMhyDlFQjFBoi4RqB6r/eCZXm/l7coGGVEfRZBChYA7JoU3?= =?utf-8?q?hroTLBWzkqg0GNJ3aJgZtRB2UEzyN/fX6ccupRlsCE69tYI6wMElQ3vjv5odqXqo0?= =?utf-8?q?MRwBIYp46CDtuPeFP/MzYM9I4oJlA64I77womiIoWf2jQETX98E2rRstVfnb295qj?= =?utf-8?q?h7Tg9bU6zRxXmayEMVLghH2jL+7IpIC0ozOXYwdXyXWavLO2dOUcxYTpLuw1yDtUb?= =?utf-8?q?68EuYEOw4faTmthH1fTY0274uPR7Y6qqkXlHRey5CIV/mR1RONv5HHK3nv9/UqxEt?= =?utf-8?q?xfy7XHHZSql9JSwlrDghhKzLkXQcunaSRziszf3mrq3sXfDYVkePDWXNTCAM+gxJM?= =?utf-8?q?ij0hNv3Qnii9khkdCmaCGxw951ETgo9PLpoz4ga7s1DzXR3mJh9BOOIiX5+E7CbAC?= =?utf-8?q?fDENPV3e4vfksl2Ai7VxTtlj+IOTzQlL0DWlevuC/Jh8K/6PcPrY5tblg43RIBTxi?= =?utf-8?q?vgUtXkCtWtCMy+DBItQENXs8CWc/dvaG/Q=3D=3D?= X-OriginatorOrg: marvell.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7d74fb7b-c8cb-49ac-3103-08dcb07815dd X-MS-Exchange-CrossTenant-AuthSource: CO6PR18MB4451.namprd18.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2024 09:14:59.0181 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 70e1fb47-1155-421d-87fc-2e58f638b6e0 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: FTix8Oyg6UvktfZc+SXvNbWLsQN89kAIWHGMDCTs1M6PdMVBkBxdfu1g4SgTJJqisFx0blnwFXxzImsOsQc8YA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY3PR18MB4707 X-Proofpoint-GUID: 0PYUXA277lohK4M0910g2dHIxUYoz4sv X-Proofpoint-ORIG-GUID: 0PYUXA277lohK4M0910g2dHIxUYoz4sv X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-30_09,2024-07-26_01,2024-05-17_01 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean When kernel uses file system encryption, fscrypt on UBIFS v5, after a hard power cycle UBIFS journal replay fails which results in mount failure. Failure logs: UBIFS: recovery needed UBIFS error (pid 0): ubifs_validate_entry: bad directory entry node UBIFS error (pid 0): replay_bud: bad node is at LEB 890:24576 UBIFS error (pid 0): ubifs_mount: Error reading superblock on volume 'ubi0:rootfs' errno=-22! This change is ported from kernel: commit id: 304790c038bc4af4f19774705409db27eafb09fc Kernel commit description: Kernel commit description: ubifs: Relax checks in ubifs_validate_entry() With encrypted filenames we store raw binary data, doing string tests is no longer possible. ~ Change-Id: I487ae4d172e228e72ac31d158d668f209142bce0 Signed-off-by: rminnikanti Reviewed-by: Heiko Schocher --- fs/ubifs/replay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ubifs/replay.c b/fs/ubifs/replay.c index aa7f281ef6..b6e03b76d4 100644 --- a/fs/ubifs/replay.c +++ b/fs/ubifs/replay.c @@ -451,7 +451,7 @@ int ubifs_validate_entry(struct ubifs_info *c, if (le32_to_cpu(dent->ch.len) != nlen + UBIFS_DENT_NODE_SZ + 1 || dent->type >= UBIFS_ITYPES_CNT || nlen > UBIFS_MAX_NLEN || dent->name[nlen] != 0 || - strnlen(dent->name, nlen) != nlen || + (key_type == UBIFS_XENT_KEY && strnlen(dent->name, nlen) != nlen) || le64_to_cpu(dent->inum) > MAX_INUM) { ubifs_err(c, "bad %s node", key_type == UBIFS_DENT_KEY ? "directory entry" : "extended attribute entry");