Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1qCSU8-000085-49 for mharc-grub-devel@gnu.org; Thu, 22 Jun 2023 18:09:00 -0400 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 1qCSU5-00007q-R2 for grub-devel@gnu.org; Thu, 22 Jun 2023 18:08:58 -0400 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 1qCSU0-0001kH-2y for grub-devel@gnu.org; Thu, 22 Jun 2023 18:08:55 -0400 Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35MIIqVS005813; Thu, 22 Jun 2023 22:08:49 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : content-type : mime-version; s=corp-2023-03-30; bh=cPQgQJgY1oGXehvB8BJdswGS+q4ERS3JMG9RJI3YB48=; b=Bu749+sq/ZYNuQooDjQUDbIUIVPAtS9XGnKvJe5s5gVjVHoDAkLI4XkJARs+kPJr8xDN VBIVY2bxAzwUpDNIOS5n8x2auoE4YWFH58DcSZpq5GeiHhGOkwMdM6uvwptjlpCmpUhI OPN4ivsRgHw6oZFFCXZtEBInQLel/s7BlCNPgvzAql5w21rtmh1nmEuAutotk9JBKde2 y5JxloXoOhS9awiNloobeAzHsVRCg8H1VBLbvW37lWWMG/d9pIzQWu7yS5fNDeB0hGel nAHIWC25B8/vGQ26AaYxQM2XtM+jcjZHELYDj3GgcSQdg7dOwuE2H8D+bdc81HH1/v9F bw== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3r94vcu1ds-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Jun 2023 22:08:49 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 35MKACF4005864; Thu, 22 Jun 2023 22:08:48 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2107.outbound.protection.outlook.com [104.47.55.107]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3r9397yetn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Jun 2023 22:08:48 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RSlttBqLO3x11cvexgwuZ80jABb/dvMznk9HBvswFMiyPyWs5zvVmyf46e1aJNkC4rkieTObYDhlkp3yZsQa11VZlGC0vZbYaj2r/o1czPa+PUwmmrVzwwRYMyNnuBjKDhcS1Ef9KI0VFuk3SnMbbuUcBmXmvatOLso17/PKgDAYpNW8gdGx4FHxMsr7FC67C2Mi2h/cTL9YanCIEli93u5QnS5dbBeI+q9g0CA1fxxVwNDkajpreFWeFk4NTc9CHlMwlvdcErn/CD8uS3uXg0VnygF+8IoENwI94bY8/OsuaV5JWg5hxD5RcW2ven/9Uur5JILjRYODbayAi2igTQ== 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=cPQgQJgY1oGXehvB8BJdswGS+q4ERS3JMG9RJI3YB48=; b=QzXVP3ef5WQdkPOYCCVaMNdXcPW/YvalR45Dh0dSZ07nRU12RX/Rgbpr4uOXRp6e6IJOPPm4RNF6pAxlOv0ZD2Yh1m0IvG8iTDrICpXD2NgAxSuyAd3WhTiSWtDcd9Pqmzj/wx8OsvQNzY7LQG3JZw/t//CB8hW+cyoDTQv+ZZtu7yOKITyoRPA2LWktGYeoZOkKnypUJvicEddh2D+Pf5yU+6K26f6wi46+IFTpxLWKbM0dNDUbG48PuqkWCa5jbPlHxg+EX+iN5r/DN0AIs55CMPh3psdgJVvznUGiMr3abRui1YGVHfW+WjpYR0w9IAaZh3n1zN+n/K1aLeb/bg== 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=cPQgQJgY1oGXehvB8BJdswGS+q4ERS3JMG9RJI3YB48=; b=km5iMD78TE0iORXfMCoLooBjQyNbpc6U2d7SJaf/yarNplA6S5Nvc4Rbo5eO7mVCR8T8b6j5aOM/7lwxTmXLuhDV+7k5pBhID9o7rvAO1n1EgZk/MyRJT6UejloulhtqfwCeGz8nAJ+QcmsFWR/Fw3S3V9ckhEHizO7akgB5yo4= Received: from BN0PR10MB4822.namprd10.prod.outlook.com (2603:10b6:408:124::13) by CH3PR10MB6716.namprd10.prod.outlook.com (2603:10b6:610:146::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.23; Thu, 22 Jun 2023 22:08:45 +0000 Received: from BN0PR10MB4822.namprd10.prod.outlook.com ([fe80::86ed:de25:a973:cae6]) by BN0PR10MB4822.namprd10.prod.outlook.com ([fe80::86ed:de25:a973:cae6%2]) with mapi id 15.20.6521.026; Thu, 22 Jun 2023 22:08:45 +0000 From: Daniel Kiper To: grub-devel@gnu.org Cc: phcoder@gmail.com Subject: [PATCH] lib/relocator: Enforce GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT divisibility by 8 Date: Fri, 23 Jun 2023 00:08:41 +0200 Message-Id: <20230622220841.31123-1-daniel.kiper@oracle.com> X-Mailer: git-send-email 2.11.0 Content-Type: text/plain X-ClientProxiedBy: BE1P281CA0385.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:80::21) To BN0PR10MB4822.namprd10.prod.outlook.com (2603:10b6:408:124::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN0PR10MB4822:EE_|CH3PR10MB6716:EE_ X-MS-Office365-Filtering-Correlation-Id: 17387193-db41-4396-8190-08db736d3f8e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DoA3NjGh/JvYDBv8aAPSqnqAkpDsXm/60fjlB0ZdntH/nS8kGCixkFpfDwnpJ2evjISTbOz46dcNeighpdQZMTUKb2u3/rUrr52l51GOWLOmiNciMbdEuqTHgzs5WQNAUklROutcWAf3+hefg/hHwAyRKBROqy+4UhaSDzCQY+Bd4kN7S16/d9K81tHVlULAVJWkdMn35j9NpfXFQZ8eV2vx7viWKbPsd88ey39AfE1Nudxz48wQsamlxARMXjYHs4c1qg0gtt+9nA17C+UHDmoaT53GBzqvmgsn9xuq0UIDIyZn6e8INoDh7k2aKAH3UeuMJh1fyFV+AYPSBwE/Wc6rwIFLDF1ekRcov5wtzZZ6gonG3jlfQFvVwp/T1aOnFWJTxCZQUuccAHSzKfOjcWMB42SbVmgaLTKGq8AcU0YmRyX9HGDDZcEvpqrniUP5OzXgwlisvdcNr9Lp+LEGriXNvMdg+6uj1SL1LAV3lccxeEVbLObReqkRHhth8n1aOPyeeh91djmqJyLXQxH6TxndaByjipmKT1ZUtax6AgYbLTFGFhDiV4bo6Rt74syH X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN0PR10MB4822.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(136003)(376002)(396003)(39860400002)(346002)(366004)(451199021)(8676002)(4326008)(6486002)(66556008)(66946007)(478600001)(66476007)(6666004)(36756003)(6916009)(316002)(86362001)(83380400001)(6512007)(1076003)(26005)(6506007)(2616005)(186003)(38100700002)(5660300002)(2906002)(8936002)(41300700001)(4744005)(44832011); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?21DfYvmu2xnDKsSxCcry+ksNrxHElLVDBO8yTlz5ff8Eh92M9e6CNghr+5i0?= =?us-ascii?Q?ZdbvDx6ZXug3k2hnRem/VbGPkpuHvT2Ju+fr9rdRNS05HEX7BqAPFl4itUlb?= =?us-ascii?Q?j1P5mgDfeg+U03HUDqUtCsb2mp+vd8GsyddWZq8By0hJB3OkEdbCl7pK3y0Q?= =?us-ascii?Q?+PMUtyGjC7uQZvcvkWaqFr+ENpj+tfCielD898exheovqgXFco+yS9ml9hh5?= =?us-ascii?Q?fKLFwQH7x39ecsmtH6G/HhnNZZ7T+hiMvBNLtF0jXew57hBnBoOKlrfC4SN+?= =?us-ascii?Q?XejQ/iS6RwcDOqgBul4nUuSwO/dl9mouamHK1kFJW3Mo4qabAVa4e7xFpTPo?= =?us-ascii?Q?H19fwGWFvFG+sszEL+bKoJt7gXpSyhKeIVAkwm245S20qk5Szt6lBdu4Vdj1?= =?us-ascii?Q?wEsrzhENEcOUkz/Xu86Xr9i4T6Rb7NezfwDhTpM6zsvCNThQZ9sXpriWT6de?= =?us-ascii?Q?to65ATBynzPHX5hiS06u1ody9ZnpDiTU+VkZiE2JMLQS7rXMnY1wTBDrYWCj?= =?us-ascii?Q?QcTJ6uRIMa5QQCdKh2eBwRqhPl8sRtEeSpb8koYVgTlFg9fOQuW+XOQ1pjK+?= =?us-ascii?Q?jl0pA1rmEIWTWkgdllv02vpj1hvd/+sTuFsU4JbpJaEaW5AOqbhWiJA5g30p?= =?us-ascii?Q?fpoNKSMVPenfCmNn2r67F/s1P3uz+4MMtt533JjtCDMF8Wu0H2QS0z9VdB3w?= =?us-ascii?Q?UJG7NnrxZhAd/+j20uedw8AaeXHj+4oFdpl7o5lINFbtWfSQNtFtoGVUeHVE?= =?us-ascii?Q?VF6Ikch9vOibaduYXGMBpUmTqqzirtdgMg7cufpbcm4Ub1X1vItbqpUXLjwF?= =?us-ascii?Q?6x+oIoYUKEbVg3hhHe1jWRSJkqgorHJzTT6KFziNwMJsG2tVpRF6uyUc4Y44?= =?us-ascii?Q?E/gICPhCIofXQeWBKMHzf2q/0ja8gxt5Q71IXUhyXDXO3sNup6RCikuv38Wg?= =?us-ascii?Q?kUQm1kl+U9uYco/hRg6HGSVJnGmXXtSBLfQdNXwmI9sIDYAhA9RHqswfOsj8?= =?us-ascii?Q?MTWBHEiSpacipFFlriUogFNWdeyhfgjcOBq47zPxSREVHgUcoZqZK790Qa1x?= =?us-ascii?Q?pyGxCO/G+qbXgtkppBqMep/9miO6TFfFD7vxRSL93iyj23G6/i2nO6Rx2TES?= =?us-ascii?Q?NFYE3CY2Ijl/FajMHGLBTjemDJ0qIrdzUDYpgcSVLiCOlm93zX5q1QStZQep?= =?us-ascii?Q?rSWe8BUXWNxp0oxULSY0am3P+z/p3ndk/tvaTIGPlbgCenifN+TD+ncsl3qn?= =?us-ascii?Q?nG5IOwOn9MvkmPHrhkj3GkteyrvwmZHV0Q6nS0yEXiYk8FU/XFxIYMd7jHt4?= =?us-ascii?Q?RKvGz6yd8szqW+jUojCZQfISYEqGfJN4no/QkjNBMnEM+RrYSxrMpXob1GET?= =?us-ascii?Q?axkzAgfFn6ZCv3EHrVQdEU09qFO5Te/91KL6r58eb2ZgaKW0l9COhoOkHI/Y?= =?us-ascii?Q?KzX/Uqv8opTMrOVh7V/JWWzQ1HXHK1WKpw46QzKCjwW+P09G9gg4Fs3BBP79?= =?us-ascii?Q?tJF7zZoKFv31NTNco+luB+eoXgBrAVw22Aq+3VTcaEt2mlqaQRZyQtdaeRGT?= =?us-ascii?Q?S/c5mL1HIC7hfmna4EAeIXs0juTvUajg9qlJKNd9?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: e7dr2QGmj7gn9TaVk9XUUrnLvUJMMF7dfKjTK6s6bwSWzmHDi/Kslvz6lo5xMkbg/swnnQDEgdDa8LwCmOi2uFseRUB/2keEBxSR2b1PBUpZOJDFR/oeGVtVOip9O+CYCzpZ3X1bBIpdB0p8BaaYOoJvKtQBUvpvkxCHI6YKqqVG5VyIVFIxYZ0SZHbsbXQfGjSUoMPV2Jzxd2sXCNn3XJ4Xmv7mIdtt0SgUZhpqG1qd+zX9v8YYCCJh7yWYbaTWfwA6WcmNVBa8PCnGLrQXGoy6wvi9gThYu2+zfFxCsuN8HWFrfDFTfyOjmKwl8gPcvJq5bz6gzv5aSxg9ZtOjfAFsBJXEnfTXmyxLggIEkvQ8v5DJgOwpLIom7DooN+LIfWNOlTfsfuk/SFkaiTW+fjWR+VJTIfBpMAup6LKCuakm+c3Ko6fzT6mlPBKgNsiPlh8JNrzMpih60hoo2ZOTZeh+lhJ81yvJG55o32KEhwJBpV9VbrNwHbfvr5SEFsMxmKXUdoYAVUj5IHpO78JfpooriLkaJjty/m+UdQcPGzEnU06rg6hCNqF5lj+zJ6tyjOdqzNXpc8JMoD9I83ppRjxqS6zXwKUi6J0LGcfNfDwDgSLwfIVAEwxJSxAm+QqPCzbe7964wXSSY0mLsUfFKAXuR3QTVm32vHGuurcAXjOS96XmfvN2rVfl/w0iSU5gtpPdbjzmsD9WBP1VgumKvM7JDF6AQvKcJ38RS8ImDAhZ+MKiKf5HBbaf0Z9crCb+zhNnZEph4KFPbycgGvjVyQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 17387193-db41-4396-8190-08db736d3f8e X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB4822.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2023 22:08:45.8912 (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: pzfTXcH3/i6teh0FlsrbX6jizLneXGZ0Nkn0sbfKyXjSVD8UJrg3QazLkp83MCR4/ER+gpNPRfYhiDZN/Qecaw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB6716 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-06-22_16,2023-06-22_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 spamscore=0 bulkscore=0 malwarescore=0 phishscore=0 mlxscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306220189 X-Proofpoint-GUID: N_Drge1Otq3t_syf5YypxR0n1gctsdzO X-Proofpoint-ORIG-GUID: N_Drge1Otq3t_syf5YypxR0n1gctsdzO Received-SPF: pass client-ip=205.220.177.32; envelope-from=daniel.kiper@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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: Thu, 22 Jun 2023 22:08:58 -0000 Most of leftover code blindly assumes GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT divisibility by 8. So, enforce this at compile time. Signed-off-by: Daniel Kiper --- grub-core/lib/relocator.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c index 725bca7c3..568fc0b8f 100644 --- a/grub-core/lib/relocator.c +++ b/grub-core/lib/relocator.c @@ -478,6 +478,8 @@ malloc_in_range (struct grub_relocator *rel, #if GRUB_RELOCATOR_HAVE_LEFTOVERS { + COMPILE_TIME_ASSERT (GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT % 8 == 0); + struct grub_relocator_fw_leftover *cur; for (cur = leftovers; cur; cur = cur->next) { -- 2.11.0