Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kxRvW-0006CS-0s for mharc-grub-devel@gnu.org; Thu, 07 Jan 2021 04:49:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60498) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxRvU-0006CG-36 for grub-devel@gnu.org; Thu, 07 Jan 2021 04:49:52 -0500 Received: from mail-dm6nam11on2087.outbound.protection.outlook.com ([40.107.223.87]:63905 helo=NAM11-DM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxRvR-0007n4-6U for grub-devel@gnu.org; Thu, 07 Jan 2021 04:49:51 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k/DT9at4xWLZ9qxnYFqCI+pHHp6a8XUCCUG2F/TA+y9aOMCIP5u8J8abCgdiW6ew8fgKdg8dc+zhT69yzWNhulqYsIBDPxdegACaegei2CYM+PliN7LpGKPw3+9nCgJ3beRyWgmA4hlHos3RanEl9gwNXSOcagJCItLW0xMFvyWXV5+YHGgSaAfvkxRAYOXT83mjuUVCdUQHUcu/HB6QTxsTogi+e78JhRKOscFTye/8ADh0ofVXEqryHtvXbfsiac9XnL/odsiTjeKZhZMASCoonMlzJHB3qNccXiBdxCz4ZUJkHWyb5TOyfBRWVz+Xv5sOE5PHoojHqcxTUnw4lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WZHuA4w7sQw/nosRtzXq4qJ2xSGZdf8qGtRB18GMnos=; b=VmUR6apVYh4HX4MrT0Kc3kd8b2VYfpXRXGFDPdTcg1OGSxt+jJtPrdjlgyOYTOIzS1ELvvrWljuv+v2RwdJgEhr+m3vKXqKrCK5NOcKzEfmHKkaKyTYDjVuM57OODSM1/XafmIwbrLoOtL+EVNEO5xWCFhGwDyYZHqF8uNYgrJqhC8xETYx9iT8/vq3yPNnDY+iRr0iL8HC84B8pGByzAoh2IMxv1qL1P7Jw4Zwp7/lSSPhz8wRBhjwOkTJJMm3ThE34TmbZR/MlIYtTwkjvXTVOwwTs6F48W02gTPNkIOI92yfjtuMadfrZjvYG0vanyk1h1hVrRfXIwgLwlSQorQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriversystems.onmicrosoft.com; s=selector2-windriversystems-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WZHuA4w7sQw/nosRtzXq4qJ2xSGZdf8qGtRB18GMnos=; b=lK7Lbp1IllQN+u5riouTO6qZ+SdrV43H8npyQP6JIkCO7oaDmbKnA1RQ7/R+FoeHjVOvVFVn60ucOEOLRf2V4qJmYkMM9m4FUGpg3AnOxDFjg138Y4DwWt9fqXjBP1ha3/cCK+h+BMTIo+k7vqCS0WGThOlbKzT7oqIzEq7OJMU= Authentication-Results: gnu.org; dkim=none (message not signed) header.d=none;gnu.org; dmarc=none action=none header.from=windriver.com; Received: from CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by CO1PR11MB4898.namprd11.prod.outlook.com (2603:10b6:303:92::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.6; Thu, 7 Jan 2021 09:34:44 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::21b9:29b6:fd3:bca5]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::21b9:29b6:fd3:bca5%7]) with mapi id 15.20.3721.024; Thu, 7 Jan 2021 09:34:44 +0000 From: Yi Zhao To: grub-devel@gnu.org Subject: [PATCH] fs/ext2: fix the file not found error when symlink filesize == 60 Date: Thu, 7 Jan 2021 17:34:31 +0800 Message-Id: <20210107093431.63992-1-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [60.247.85.82] X-ClientProxiedBy: HK0PR01CA0066.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::30) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pek-yzhao1-d1.wrs.com (60.247.85.82) by HK0PR01CA0066.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.6 via Frontend Transport; Thu, 7 Jan 2021 09:34:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bcfb7175-166f-49ac-a25d-08d8b2ef773d X-MS-TrafficTypeDiagnostic: CO1PR11MB4898: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZaVW2gtfF8Rsmpuy8K3xyN899qgxDGZ+cpzUudvTfYUJWBvGLshE6M9EJUSa+YpLFhFU3FJ+uWSnH4wSHLzpB0/2IEZoGJaYKKdg6z+u8qxD0CC1QsFyLz/kBhpfFnUQoZWNJYowSkqgyxPEK6ByGxBbOB2Pk0ig7ctjv42HEtr1g8d/Uw/goYD1mPOHKuZ7jLuCupz+eqRNVHBkOX+BwkXiK/ZEnwh7EzbW0zsBxuH1RCQHUDGkimm5p4cZZNBHSyi3Rty+XqvwjBykISy/VlgIY/+cj3wmDm3VrQEl9frH69uHwaT/jPJvMwCrEhvjWD1pEOPgWrUVHvzWzAJVafQxbZVeRLE5kr7HYpJ2atWFb72uGuOS7WzkgTVXHg4UH8gyTh/4S6wQQcT2WHB0vA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CO1PR11MB4867.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(136003)(39850400004)(396003)(346002)(376002)(66556008)(66476007)(66946007)(6916009)(26005)(5660300002)(8936002)(6506007)(1076003)(52116002)(36756003)(186003)(44832011)(2616005)(8676002)(956004)(316002)(6486002)(478600001)(83380400001)(2906002)(6666004)(86362001)(6512007)(16526019); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?OT2BfGE0xg5h3LRIhPdQg7pYZITMskolKQSWuVafhZVLJPvn3grLibr+44IJ?= =?us-ascii?Q?nQYLAerQmc8Ka4IvhwD2oENuZDFbyukyRlQJnhNb2KM3J6WZQaBa3wIy8EeW?= =?us-ascii?Q?OyrlCZaj7SKoJif5VZ4isHzmoh0jzbIKZfRihehKDdzCrN9Fd3Q+j5QDMCBr?= =?us-ascii?Q?K9pqF/FVPOaIzf/2kdVIde9S3a9LOa2BkAIxVQqWE6HqRCV8PeDn9dHmyS0G?= =?us-ascii?Q?GaXvs/HiIqDNpM1DwC1vb3dIc7fLRUEwTP7ylsusZGjMKiCI1DhhMKxvjXc7?= =?us-ascii?Q?rob1YSEr18niibvUclY4um5CFaMeXHRawBVoKou6gLmM0EkJUbdDKOTLdUZU?= =?us-ascii?Q?rgBz+mQlMKXHjNaTcdIuVIT1XJtkXxIocp9NIsB1oZw6WXLCHUjWf2ND9mao?= =?us-ascii?Q?H19P+yRgMF/fn8xATgQBiMBtzeRJ2/ZcNxbzBJnfp7fT3tefM1quOt7R1cNs?= =?us-ascii?Q?JcA1hi1DIoAvdMThbWYD6FzkUocOdcL/pb68JKHIl9QJmFuqNcjgpGAmjEGN?= =?us-ascii?Q?eaUeKQTrFCq6i38fClGz300+DY/HsdxlbfC22tgrApfCWAXikWsVXSUhL1kA?= =?us-ascii?Q?vE2AJ9VFumsXHd6szgOfKqlhRJafcRjJOY6bMxawfdvKRJDrEREtsyYxTl0D?= =?us-ascii?Q?5tuwbE0tjdQNGNA97upo6tZ0Bs20CFa98EE6sSCeiFPYhte5iV5xFEyWOTp9?= =?us-ascii?Q?JER90ICsNsdNWrdDVtKoeJqfkMoF96cHCUG0HdFv+ACBnxS4avxWC79x+X/j?= =?us-ascii?Q?DoP3HERtfclAIoE45Op6+hRHmEKyb1Y3mwE52GjYFoETFCk7XpG+7tAL10Dd?= =?us-ascii?Q?E4C8AE57AmF11bJPkEXBoigdldPUR9kb8PDiGn5dw3XFX4AtF1UYinHSfiUO?= =?us-ascii?Q?UjIyr6jAS57a4Lz15D4cX9qebHVc94TnNCW5o+yDjDZGB9TcHf6Jcab/2Fgm?= =?us-ascii?Q?mW39wQtt3gd620iMaFihBD9NIE3wxtC3Gp43qewGBioctd8BKm1xzbKVvljz?= =?us-ascii?Q?/yD5?= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2021 09:34:43.9136 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-Network-Message-Id: bcfb7175-166f-49ac-a25d-08d8b2ef773d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: d4nwGxfr7EktPuJhfINKlKo6Cb88ao+dmjyfbZUf/JowA3HCNljIPY+FZd4EuBR7mGzdjSMLdlA2V251SLyqCQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4898 Received-SPF: pass client-ip=40.107.223.87; envelope-from=Yi.Zhao@windriver.com; helo=NAM11-DM6-obe.outbound.protection.outlook.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jan 2021 09:49:52 -0000 We encountered a file not found error when the symlink filesize is equal to 60: $ ls -l initrd lrwxrwxrwx 1 root root 60 Jan 6 16:37 initrd -> secure-core-image-initramfs-5.10.2-yoctodev-standard.cpio.gz When booting, we got the following error in grub: error: file `/initrd' not found The root cause is although the size of diro->inode.symlink is 60, it includes the trailing '\0'. So if the symlink filesize is exactly 60, it is also stored in a separate block. Signed-off-by: Yi Zhao --- grub-core/fs/ext2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c index ac33bcd68..cb5058e8b 100644 --- a/grub-core/fs/ext2.c +++ b/grub-core/fs/ext2.c @@ -732,7 +732,7 @@ grub_ext2_read_symlink (grub_fshelp_node_t node) /* If the filesize of the symlink is bigger than 60 the symlink is stored in a separate block, otherwise it is stored in the inode. */ - if (grub_le_to_cpu32 (diro->inode.size) <= sizeof (diro->inode.symlink)) + if (grub_le_to_cpu32 (diro->inode.size) < sizeof (diro->inode.symlink)) grub_memcpy (symlink, diro->inode.symlink, grub_le_to_cpu32 (diro->inode.size)); -- 2.25.1