Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kxfpB-0005Pf-6N for mharc-grub-devel@gnu.org; Thu, 07 Jan 2021 19:40:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxfp8-0005PQ-Jp for grub-devel@gnu.org; Thu, 07 Jan 2021 19:40:14 -0500 Received: from mail-dm6nam10on2061.outbound.protection.outlook.com ([40.107.93.61]:47594 helo=NAM10-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 1kxfp5-0002Ic-O4 for grub-devel@gnu.org; Thu, 07 Jan 2021 19:40:13 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nrjNITFdTATufBgjOLksfRO1QCSw8eAW872fEWtBM1HF4ooRBaPRv0D6RW6Hk0oy43Z4wL999UMzhG+PW8owAf13zGJjTNkEVKtQyksrbPXX1yUo6V2ZB7GBbHC0Dv3bXekvRAT4z4/9zYp61G65J0IwlDn8SF41S7cMMX1hCtj0RRt9lS23PnIBiO4SqKMfaCazIdHNQFBCggllduSLdkdE6sgq9LgZcG/20vYn3iz0eMMI5H+7z5mTr/y/d+dz/trnru4+2oa24Ftag8tyv2WFoxQ+Nd8XSp9FiGNB1bQUF3B5LBI4Y28gmJHdC/MDz2Xo4Bq+LHJYYABt7/G3fg== 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=oaELzRylDOyHJvb8Vm2E4qUFPl6UmQSV1qTujez21mA=; b=AVwfzIln242VNilVU6QZeQRYRnUoMTFtROkaiB4wEFnbd3EBtdT5IuvJbvc+OMYo4HhJVDo9pYodxC6FtSHGQIxNtE+ohjt15+yMc/sSWcm+Bo3uzO3cSdj55oxxLe+wIxfM5JexUN+Vy7HQsQb5Z4ZmJE6TqxISOpKjjFK90Oor+q8V2TbsZFLU8eT1251sKFarUNnrqi8OC5KpMiEZlz4Jkm4iUoyCN/Q44wi2gCAcwv1fgsiHvtE11j87D41Nk6rDb6lpdzWd6f2FtyME4bGaTbcPa3DmpDIa9HPSHeDXQ+AkwUuOI0Wq6Zm6XhohlCFW9NTqYcF8+BhvM8stTQ== 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=oaELzRylDOyHJvb8Vm2E4qUFPl6UmQSV1qTujez21mA=; b=cnnXIp7KUEAzXMoqsciOJhBJmnFO1Xyf0QUE+1YcdLFS92fkljx9Z+KX0JWsVKMUk7X0zC9jeJskvlJynpFczcgAHLptq7Iac1gWsim3e1iC8E7R7tZ1DFFX3772oNZ1YjlHumevCSlG9JhQtgd85IM8Ui9s5Sx5M1F1HY5slCk= Authentication-Results: gnu.org; dkim=none (message not signed) header.d=none;gnu.org; dmarc=none action=none header.from=windriver.com; Received: from SA2PR11MB4875.namprd11.prod.outlook.com (2603:10b6:806:11a::6) by SN6PR11MB3166.namprd11.prod.outlook.com (2603:10b6:805:c5::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3721.20; Fri, 8 Jan 2021 00:40:01 +0000 Received: from SA2PR11MB4875.namprd11.prod.outlook.com ([fe80::f5a6:5d68:aeaa:6c19]) by SA2PR11MB4875.namprd11.prod.outlook.com ([fe80::f5a6:5d68:aeaa:6c19%6]) with mapi id 15.20.3721.024; Fri, 8 Jan 2021 00:40:01 +0000 From: Yi Zhao To: grub-devel@gnu.org Subject: [PATCH V2] fs/ext2: fix the file not found error when symlink filesize is 60 Date: Fri, 8 Jan 2021 08:39:47 +0800 Message-Id: <20210108003947.78950-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: HK2PR03CA0056.apcprd03.prod.outlook.com (2603:1096:202:17::26) To SA2PR11MB4875.namprd11.prod.outlook.com (2603:10b6:806:11a::6) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pek-yzhao1-d1.wrs.com (60.247.85.82) by HK2PR03CA0056.apcprd03.prod.outlook.com (2603:1096:202:17::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.2 via Frontend Transport; Fri, 8 Jan 2021 00:40:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 00fcab4e-0122-4b3c-043c-08d8b36def2a X-MS-TrafficTypeDiagnostic: SN6PR11MB3166: 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: 999X2slNW8KaWdmEiCC4gsp6aRXWxeoCZFHzA6RrMjqjQra3G/AM47xJAW7T87jIJwCZqvyWbGeRf//zpVIa7gk/xjTgnoWoOl7/qnyK982I4M8jKnt7o1dEqQtxhXReuBEDql10ekMkdadUFxTBHvuBxTEBZw5WaBOG4OkeAYTZKCZk2x5bO2upGehMKQSQPTi6GhlBdOSmvjSvADXYHDAE7U4F6zVC/6rcFYQI5GvJZLb4MMTsiz1NE2XPdXhBwC8s5H0NYKfg5vYjBLXnk9ZINzLPMiPVvW1UMwyJSoEWNc/uwNi38vI/Nse+Oj715Q6go6PWBFv0qqEOhUbLjd8MO4CzfYQMOb1MoemeNQYxYFd/yJXxYPMadTocD9pRV/30Qm4HvBfkLzKbuEY34A== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SA2PR11MB4875.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(346002)(39850400004)(376002)(136003)(366004)(6512007)(66476007)(8676002)(66946007)(316002)(44832011)(86362001)(66556008)(8936002)(478600001)(6486002)(6916009)(36756003)(2616005)(2906002)(956004)(186003)(83380400001)(26005)(16526019)(5660300002)(6666004)(1076003)(6506007)(52116002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?RtRCPjYFOE98n7LAJEi3XsQOcWaacidNVi6yUIzTTXwjas8WvZwaNN8Yeidl?= =?us-ascii?Q?Z1LKAdfP963Ix0waXLqI4v0TcB2nTm0XOiYIyyleSEyVK7zjCDejnzL6bSsI?= =?us-ascii?Q?yNcQhLfzBsm4S4Qts0xEZbPpV4b4L4iLUFORh24agSsV3ooD1YcyYA2z5G3z?= =?us-ascii?Q?sOP6TiM/yioYrYuKtNcXGpZUJdyTK8O8s8bTv1T5dfXJoEvY5mzDTkHng15L?= =?us-ascii?Q?tFqkUgiLNcjJ1Wcsc2P6WWiScCW3Rm+TL0kArID7IYUMm2pBA6wzcCv5y+19?= =?us-ascii?Q?BOM2N/3ofRcodPloBqB81W2wHC+KzbYUoQ0LUc66mZN1PRt/9p3o0gJHLkhw?= =?us-ascii?Q?xKFYk6GTbZg4RAoheUJXOST+BARG0MaJMBANDLjC3Puwv/9CjT0O+zqM+IFP?= =?us-ascii?Q?QOEzkF/jhyI1DQBH/SbJDaYIWjKJNQ2WvKwdNs0NscyBenI/OX4UGM2owIMz?= =?us-ascii?Q?26zTwB9bnkicld3+P6Q5gV+I4keg5gtLv0VZQHw92eVeyimxYqUCbOhvtOm/?= =?us-ascii?Q?6cwOV70wrWmaam+l4w3jugP4EoXFSXSNv/B9XfUYL4G1LaXrcryFTd9qyppf?= =?us-ascii?Q?yamWW7Emcxs+J01ymq2mamf7CfD3/HUwbZaoznCWCpQDKN7KvzJoNbyQmO6C?= =?us-ascii?Q?OsVq0EQRf2X5Vn6o2fwuVL7hOHcvdThZC0CF4ornn7dSsuDLvwmX+yEZx24R?= =?us-ascii?Q?0b/Yaz2UM+G1ztLc111ebgIaLoAFK48i5y8yqP8RTJDLSRwQKoYKAaUmqwIF?= =?us-ascii?Q?QgMT/Md8uYmrPBS9JoJPZ0X9OZ+w1RNGiPKZQeIYWx5fffT2H9a6SrTlPKVC?= =?us-ascii?Q?rQ1rbHZJdADF8FvbCYfciUZ6+NAjtrG6vBOxFWNe9e4+2ZyRPhkJACjvu409?= =?us-ascii?Q?HSV/IHe00fAXV3f0AXiscoudXK9Nj8MbF8ALFtanuKFG4O+XYc02xnE3EblS?= =?us-ascii?Q?zdh6ZOfHhsDuYdKRaUMrJeK+pp3F9tLhCV2HePpYBQCJbbOXJmMbcPe8dI2V?= =?us-ascii?Q?udqT?= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-AuthSource: SA2PR11MB4875.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2021 00:40:01.7354 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-Network-Message-Id: 00fcab4e-0122-4b3c-043c-08d8b36def2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: fhQTPHkG8B5QLKyP0yIVT1FYuwh3DVU9uTJQFpb7lPvg3CjGcdFxGBji2Oj/jwK+ZJTSZgf1zqc1p5mQBkxD1Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB3166 Received-SPF: pass client-ip=40.107.93.61; envelope-from=Yi.Zhao@windriver.com; helo=NAM10-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: Fri, 08 Jan 2021 00:40:15 -0000 We encountered a file not found error when the symlink filesize is 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 rather than in the inode. 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