Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1p7BKK-0001nS-Vd for mharc-grub-devel@gnu.org; Mon, 19 Dec 2022 03:16:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p7BKH-0001n8-G9 for grub-devel@gnu.org; Mon, 19 Dec 2022 03:16:45 -0500 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p7BKF-0002kT-4W for grub-devel@gnu.org; Mon, 19 Dec 2022 03:16:44 -0500 Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2BILixaG001232; Mon, 19 Dec 2022 08:16:38 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-id : content-transfer-encoding : mime-version; s=corp-2022-7-12; bh=bk6woiG8NTwVIHU8h2Z0lMobIhZUsWNqIzt6DPYh2N8=; b=bKF6uNJ47bU8sAtrb1AZZUg08HL5iYi4w9WUFKNQMw8IlrEy/5kIZX9Jm0CznV2Pn2Zd W7c4Q8hLEgv/GmdtwCxODFynGQu/g0T8eQlehjPOUvj7iQW1Lu721Q6+S2f2HpBK6KdL EPs5Cp0bnyI0ndGjTpODVGVSdChWqmwy8+telzQYQ3rmhhEy5P32cqP7k6NOhrcj7ue2 WBbkF5I4d+cCyH5FNytUotuwiDAUUj2dafxHxmqt4xzGib8bYyDn6J7n9/y+aCOU0NTe 6S54wk6sExDkqLHf8/+ceNFmXW8GwYQgYMziHFTxJBcZipXPEQWK7DuI2dmueGyAiq7K aw== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3mh6tn2900-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 19 Dec 2022 08:16:38 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2BJ8F9GN007458; Mon, 19 Dec 2022 08:16:37 GMT Received: from nam04-dm6-obe.outbound.protection.outlook.com (mail-dm6nam04lp2041.outbound.protection.outlook.com [104.47.73.41]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3mh47a703b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 19 Dec 2022 08:16:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IvMHMKEtViHQZP5yQXqMq7EmDRiyqEIbhzzr0CagyndlT6HLU0qcbuCjjoFrBCzs4LMlhSlquPGhZF+k3gfSFFK84MoZ/zDFkAMVwIlMulm9AzwUv435lJiI4TiwL4VqDJFVJPrLYTY2Dnsq0KFLg562Qj0R+Ry7kiBfVXDi0+jjaGKD8y8YQudCaqx9YfbpZu/h6snQoZajehDLvK0GBmOAiELi9sbEiamFUMOK7C8nvOiz6q/ew2CLpvEPnalAyyy+HSNvCN5p4mbIKeG8PdAnW1Ro4YzDccmIkLqu/B2RNtr6//bEZRDwpArjrWHshmljFEdPPnsbg8y0yRz9ow== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=bk6woiG8NTwVIHU8h2Z0lMobIhZUsWNqIzt6DPYh2N8=; b=jbCziUexBhurKbY673YmM3reoy3qPMMBJSoB/B1oJwJP4I720qwvEr9OK5+seSIR26OV7dln/lJPzyLIjQgB3vcB2TZQv2xulJMM4a9ZB39EkFoRUeyLEw2CPyzGDin1Er57jmRw9Q6IOs/2ZuPkeL0T8anuWVpYYrhY0wd/SyMeyt0Mr95BlZ46y3yPkCYSk1UvjWKIFebgfzb5tqY+qcZhh2AAVC5qtX2ohLxR3KHRAiZT1DGI5CjCygePvWS34rJNaRvNurRLNoo+8TIrOC0xjPK8MF7YtX4OEY9pciDF5UhAnci+wDRZcGfYU4GwmTT2JqA4ThQ2XsOySNjMDQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bk6woiG8NTwVIHU8h2Z0lMobIhZUsWNqIzt6DPYh2N8=; b=jz01oPA6KF35hJNH7t9bt5u067pDNE3QyRj/xMEhN4GrGX39W+ZPznkw9MWn0VrL4Fl7Cgl0F1tWaNx+lOBx61+DkWAFLz4sdP7YbfdRjs12oTfcUuwSFFgk7dsKW/BCGNvM7OQsVjbN0kS2Xk8K7sx78DXHeYCdC1s2MGWerpg= Received: from DM6PR10MB2860.namprd10.prod.outlook.com (2603:10b6:5:66::32) by SJ0PR10MB6399.namprd10.prod.outlook.com (2603:10b6:a03:44b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Mon, 19 Dec 2022 08:16:35 +0000 Received: from DM6PR10MB2860.namprd10.prod.outlook.com ([fe80::7a47:7bf2:e578:dce8]) by DM6PR10MB2860.namprd10.prod.outlook.com ([fe80::7a47:7bf2:e578:dce8%5]) with mapi id 15.20.5924.015; Mon, 19 Dec 2022 08:16:35 +0000 From: Lidong Chen To: Thomas Schmitt CC: "grub-devel@gnu.org" , "fengtao40@huawei.com" , "yanan@huawei.com" , Daniel Kiper , "lichenca2005@gmail.com" Subject: Re: [PATCH 1/4] fs/iso9660: Add check to prevent infinite loop Thread-Topic: [PATCH 1/4] fs/iso9660: Add check to prevent infinite loop Thread-Index: AQHZD+0rDArWAz3Y+kqto0by2vpYMq5vPAaAgAWoiQA= Date: Mon, 19 Dec 2022 08:16:35 +0000 Message-ID: <2C72150C-2AB5-4CFD-87AE-8EC1F2F88852@ORACLE.COM> References: <051b96eed3414ebdc2efd8a6913ec40a769b3bd4.1671042887.git.lidong.chen@oracle.com> <27083389969407111378@scdbackup.webframe.org> In-Reply-To: <27083389969407111378@scdbackup.webframe.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: Apple Mail (2.3696.120.41.1.1) x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM6PR10MB2860:EE_|SJ0PR10MB6399:EE_ x-ms-office365-filtering-correlation-id: 032e2976-6b7c-4eec-e768-08dae1995868 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 9zH52MJYx3tBClCXlKzxo7mp+Eccj13X4HHKCf+hpae7vg+J9Z3GyuhkOqetmUcQH0AXjQWeEproq1c4njjactREW+l0EpTWYHHOOtTKFMuE3TR212/7uXFpmfDHEs8iXxzvaZ31rvsuBtwoBS9TCLvCOdx6/ZT+2w1u4kap5u44Np/tVxYBqsMX5uidlmdnN9zZaEipT0o/sYpMkmXxbGtXxOSLQQcaW4FIgWxFuSU+gPHTy1clHJfzgH9T4Y871SO3njaImon3DEBuMq8U9RRPB2aYfcDc11LF7wIDeZvwXNzfjhllFUcJYVwy6dzbprdSw4mvr7Y1Toul6HZEGLMT3WhqFQpUWgmYqhpcanN8p40RqZVAvTG0ZkeNGYMTsxekE/YGw+wIIjImf9xh8qX5EWr5BvyO7fvAr346YJA9kkhHWoS7didGzigJbJYZSR4RZj8khA3VYYA6GpIFGfKNQ5NZwEX3O3yW1R2kNvMV1Ek3DJIqap0x2Io0VRmr2Pkuy1zrRQesIMJzTC4C2cVN/bmleFDUqbyMmJSKv/jxNmaAz54pEP+owoVpPR+lrg4wDjP4x+8UOWmC6N9TdzW/blCb4OlpzIDvEizODhG7RUM3IZFmo6247BCvftQ7l9FeDEN/dZh0RB+v4679v81VxPPIID+wY/UzemiwuH+A4LEvk6Nq7Vc+uP2ZX0aSLluXJ1IM6XWLnt+p78Wih8mXJlKQOyfIS2R9Lh5Yqo8= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR10MB2860.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(396003)(346002)(376002)(366004)(39860400002)(136003)(451199015)(41300700001)(5660300002)(4326008)(8936002)(64756008)(66446008)(8676002)(66476007)(54906003)(6916009)(2906002)(66946007)(38070700005)(44832011)(76116006)(91956017)(66556008)(316002)(86362001)(33656002)(122000001)(38100700002)(71200400001)(2616005)(83380400001)(186003)(26005)(6512007)(6506007)(36756003)(478600001)(53546011)(6486002)(45980500001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?M8eqG77FCuwdr0rlDNJDsR6PeekDUTTFC+m4nBI2NfiubzS13eroDXPRy0T1?= =?us-ascii?Q?LfyOjvLyKX8XuL2C7z1RMMiq2DLaOo+8dM7JosN3dRYurbenV2LZ8W45Svtk?= =?us-ascii?Q?fXe9dQWKqBNqHYoHVwoDsDXgfhLsm5xdjkprDENdtLuQfYIHClNPagxWrLD6?= =?us-ascii?Q?rwKcKI5EpK+OgrzSHAwd9aKIuyV6WdSJQQEKIzn33StovIlrSgd7GFKj5eG2?= =?us-ascii?Q?CoY5n9hN2vKpkumTwMdnyrUFEUE+LPSVr2bxUAtQ25u+gLsXxvJ/dcSdePBh?= =?us-ascii?Q?ICbewVlwDgNY+5QOkKyP9+B/v6n11eueXyaF3af//4gzdE3aBMwSvz39zR8d?= =?us-ascii?Q?BiV8dZmvNwaKyUQrymLip9NnIJTJyPMT6Zu44pk2aG4L0gb0WnrjdmanT48F?= =?us-ascii?Q?CSXGinJiQXaaMwJJZZUabuT9uDmms3eKJZeDa4dW0+b9BuGjK7ApoTB9WfEU?= =?us-ascii?Q?2ond+Jyy6nBKE2JcwqHEoZSiZVoA8DIw11FM6r9swg7mN7AVevAeTwFpF74d?= =?us-ascii?Q?R41j+iFMwHwxfGkR8CsjxJ4c43F6Gv38geC4sBifAaQYevfEerHtYtgWgctd?= =?us-ascii?Q?zh9a/z578s5qXObUiTJJSquH1F2ocg+0qUC05zTL2aI53QVkjoJsEklqrElk?= =?us-ascii?Q?V9zYJrqblm9Vj1Dh4784Z8SzYC+j2OFe01VLd3mLtVqC95s8zbEPjaxwlAb4?= =?us-ascii?Q?/A/EtKU3fP1FDZDjOgzVrB+GycSQ/eDqHC3JuKKg2BJGedOdd3KInWXvPU7E?= =?us-ascii?Q?7KUnwIyOBSQCiilLwik22aw19NWAJE4zLEIgY8qqgKqayAhiJoK/+7tbLw0P?= =?us-ascii?Q?znG5C3p06V1Owb/nuqr86h9q76wqjacVge6cMWJoM03X7qzTx46PRzJ06Nqj?= =?us-ascii?Q?WXlaxj1EQQ1QOv3fpV+eQWaxgPPfH3f5V/doJre30eURVUDVsRGswfayzDTQ?= =?us-ascii?Q?lmX5h+SPe3mxH8w8HZ6OjJQOl4zotprRiee1idNFSHrTzXNWG306/fiGaD3w?= =?us-ascii?Q?LtmX2mq60gjJG+eIEhFVguuzRXz1I2JQKvNFBUSqtkYwXFLT+m3mycMjFL6v?= =?us-ascii?Q?99e4QyPIVXWViNo/hB8LWNu+X00Fr4xSwzBXIxBbKHouJqr6pHgKqSXPgYSz?= =?us-ascii?Q?s7Hvm4hwKEH2B5z31AzHgG7iAkloewY1w72KpQr0scxrJ2sfQbYKda1LwlG1?= =?us-ascii?Q?YdD+f3ypgI2mq3QlPuYehefLMWT32WBobXrIBybti0TVHtK93CkYKm/C3Sk6?= =?us-ascii?Q?bfVEibU4t/+JUO7YEeFaQMiNA1NXisYERn8DLJT8B5xDfDB9CIkcnsn99sxF?= =?us-ascii?Q?AKNtcfiES+x7asKSbK2TM6o194zTNmxWaJyFZcWEn4Gn06IUYOSnNeAiOswp?= =?us-ascii?Q?tNG7e8uewnMM7wekIh96F4YTm/rV1R94pZ7xE4efSqxDn6EziZV+q67aFUn9?= =?us-ascii?Q?tGqvvIoT2SvSIFhHcruFp0UtNzFznlDpLxvX1ckCF6RxgN9laY4hiKyfQ8tY?= =?us-ascii?Q?hwf4/e1GuWZhj2c705G8qp8XAzt4pOLDCmeKHa0TFPMzlRa9OKPDV4Uvs2L7?= =?us-ascii?Q?Sxu71ujWve81LbrhheHOMbxPuZxhbL/Sc+jkDFejyJdYqX4T0jfheDtcxrj/?= =?us-ascii?Q?zw=3D=3D?= Content-Type: text/plain; charset="us-ascii" Content-ID: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB2860.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 032e2976-6b7c-4eec-e768-08dae1995868 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Dec 2022 08:16:35.5393 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 2+6IizuoGzmHt3vjUc7GdSEOURtVhi1AWNswnDpaKZ1/27k67Ct+IcFyLbjRxpGa2g8d3oVFc7N+dymWak/kTg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB6399 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-12-18_13,2022-12-15_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0 phishscore=0 suspectscore=0 spamscore=0 bulkscore=0 mlxscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2212190071 X-Proofpoint-ORIG-GUID: O6qqZ-7VxbG3DWGLaNVvhDqxnNI-97io X-Proofpoint-GUID: O6qqZ-7VxbG3DWGLaNVvhDqxnNI-97io Received-SPF: pass client-ip=205.220.177.32; envelope-from=lidong.chen@oracle.com; helo=mx0b-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=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.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Dec 2022 08:16:45 -0000 > On Dec 15, 2022, at 9:52 AM, Thomas Schmitt wrote: >=20 > Hi, >=20 > On Wed, 14 Dec 2022 18:55:02 +0000 Lidong Chen w= rote: >> There is no check for the end of block When reading >=20 > s/When/when/ >=20 >> directory extents. It resulted in read_node() always >> read from the same offset in the while loop, thus >> caused infinite loop. The fix added a check for the >> end of the block and ensure the read is within directory >> boundary. >>=20 >> Signed-off-by: Lidong Chen >> --- >> grub-core/fs/iso9660.c | 21 +++++++++++++++++++++ >> 1 file changed, 21 insertions(+) >>=20 >> diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c >> index 91817ec1f..4f4cd6165 100644 >> --- a/grub-core/fs/iso9660.c >> +++ b/grub-core/fs/iso9660.c >> @@ -795,6 +795,15 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir, >> while (dirent.flags & FLAG_MORE_EXTENTS) >> { >> offset +=3D dirent.len; >> + >> + /* offset should within the dir's len. */ >> + if (offset > len) >> + { >> + if (ctx.filename_alloc) >> + grub_free (ctx.filename); >> + return 0; >> + } >> + >> if (read_node (dir, offset, sizeof (dirent), (char *) &dirent)) >> { >> if (ctx.filename_alloc) >> @@ -802,6 +811,18 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir, >> grub_free (node); >> return 0; >> } >> + >> + /* >> + * It is either the end of block or zero-padded sector, >> + * skip to the next block. >> + */ >> + if (!dirent.len) >> + { >> + offset =3D (offset / GRUB_ISO9660_BLKSZ + 1) * GRUB_ISO9660_BLKSZ; >> + dirent.flags |=3D FLAG_MORE_EXTENTS; >> + continue; >> + } >> + >> if (node->have_dirents >=3D node->alloc_dirents) >> { >> struct grub_fshelp_node *new_node; >> -- >> 2.35.1 >>=20 >=20 > Reviewed-by: Thomas Schmitt >=20 > The second hunk will become very necessary when more initrds >=3D 4 GiB w= ill > be around. Then GRUB might more probably encounter directory records of a > large file which are not stored in the same block. >=20 > (Are we aware of the file size limit of 32 GiB - 14 KiB - 1 imposed by > struct grub_fshelp_node { ... struct grub_iso9660_dir dirents[8]; ... } > ? ) >=20 I am not familiar with this file size limit. Do we need to add a check some= where? Thanks, Lidong >=20 > Have a nice day :) >=20 > Thomas >=20