Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1qCSUH-00009C-JN for mharc-grub-devel@gnu.org; Thu, 22 Jun 2023 18:09:09 -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 1qCSUF-00008s-UI for grub-devel@gnu.org; Thu, 22 Jun 2023 18:09:08 -0400 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCSUC-0001ma-HD for grub-devel@gnu.org; Thu, 22 Jun 2023 18:09:07 -0400 Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35ML4MvE003417; Thu, 22 Jun 2023 22:09:01 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=uiR4btggv0y547Om1lONBI39XnfABroTBBUrI2FLs68=; b=u0YMeLrRJs1sN6uYmLyDthVbVTXQIAp+QkYMTAxfbvrO/ykU/kHHjq7Zq+4gltAtMEHP x7jDt6ecqc6VU91P+Yg4b4c7qYSrwg46GjbuCJFLOd/BiiZsJUxoQqJrs0W7vJukdQJe MFNhnHOSAz8+v3KM0m/SrWaA2z5U1CjKS3QtFOUFXyC29mokERWxbePvSUnluG6EaThu lWu5///nh7R804xteutNu1Z3gFZY+58454MviifkqoGYSc04AESoEUdao2ksVatsmAGp bLD71GjZo2GhFcIApOObTM89Hyx/JHgsNHFrRtbJB+KW0LASXjYkocV+HysthfTvXqu6 Yg== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3r94qaapm5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Jun 2023 22:09:01 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 35MKRuP2008336; Thu, 22 Jun 2023 22:09:00 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2169.outbound.protection.outlook.com [104.47.59.169]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3r9398faq9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Jun 2023 22:09:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nbA5j1gIT6+komGSVDh7q9Bly1AMKuS+TZvpch6mqfRSOBEh8HKqPNFYrvjemiSQ6VoUoHvJL6kquwuF8qFOz3QKx6V3Ee00fTP8zi3S0NQxkFMbgGX1pBwZnQXbD4kVVM9tP/VMqXt0G6173X3BfKuChnYVGWX6Trm+BNCuyxV99QC1JeUP/tudNDuKjinILX1U7E0WiHkdLBAombk/XNA/6QxnvXM+admszAv7cOB0K8pLJEQmP5Z36zKzEtSUowjNY7GaIbaw28+nInLgLjCoBteAw3cif1h3rSEPxLB2yKEgqcvNtQkBnofVYRZ+1mKreanThmYxrDQTh4p5yw== 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=uiR4btggv0y547Om1lONBI39XnfABroTBBUrI2FLs68=; b=OacuvcQehu4kqt1+FicDpJuC9Y/oVMt89BLI6SsGQwvrQ/lGpTmFrZvOD9IVc5oAlDPNHaHSEqq/lh6HWDcSkqcLeIWTC9oAozq8wlHvGprY6odOWZOaQcLBgUYBv/J1GOCpqAu1fojY+lldkBpxmPawm4dUJalu87kORukaliCjKtE5V/h5bnLWpEaqQhOfnTWfrw8ortoF6x7JvzNwSdGa5AkVFLLsbcwt/UadNakidAf/poj+c/gWzAjBEN27uRGJ2KxXt2MJao29idVHQYaKR7ozn+cH7lgFi/2rFl2u65eEGjJBXqNKvEuLeBR2WuStXG4xT9Q6LXTZaAqTpA== 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=uiR4btggv0y547Om1lONBI39XnfABroTBBUrI2FLs68=; b=b54igFEkrkK4XlN0IF/3q7bmn+p+RamIbD7n9H+2hnvVDbmbt0lExPQol3d5rv0qjlaUQE0WjwGDQkmOR9BBZOcLwilDPXz6j2aQCCLMDVXYvpo0CpuaYeZ5MYYAkiOJb7Jl+BFTLZxB9Giml63UuyhPKlTK3FN9SsWDrGExCvE= 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:58 +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:58 +0000 From: Daniel Kiper To: grub-devel@gnu.org Cc: phcoder@gmail.com Subject: [PATCH] lib/relocator: Fix OOB write when initializing lo->freebytes[] Date: Fri, 23 Jun 2023 00:08:54 +0200 Message-Id: <20230622220854.31173-1-daniel.kiper@oracle.com> X-Mailer: git-send-email 2.11.0 Content-Type: text/plain X-ClientProxiedBy: BE1P281CA0269.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:86::8) 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: e7302dfc-7cb2-4a8e-1e1b-08db736d473d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nPkvdVNKKojxWm4pvB36ffROV+u/eUb4SpFU2pZu1DNhFjP1caSQxk8CCh8Tn5za/E2FfB+l/v8DQSOocP/BFT8cw13AodMyDURnlJfeiBjtzkwT5JwXevXUKltXcsz8rZ4K1ixVFh6pxaYGuGc12iP8OiHIWf7RxlWtruz35XP5O2JCLizH2uITEFTsEO5D6Y1FX77BCXMBO7XFwHgy12npBbg0u550SvPJUgYym/TKLnjS4QLhJIsuUNE9aY/f2yd9eMEgWfbFmcucdegAl9dGpHp11s3Ghuw8ifvY+8ieElcIbG05i55ecoNij65ZzvN8n3vh6O0dAKcizuozi2pa74cyBfMy72L/B3ADPvFMOofcXGId/dY9mTAezVxN8UsSVqm42cAswHSe3WwPZ+AIB7aCH+Gp/+bE4NesiVcjNv+tNdG7II2f/pF4KXB60PNndZOOWgTY8AFsP7dQ5NIjUPQrip512ctC/w7AoZkS77Q5NxqKB7yMZwtIOSQThZsc8179KpylS8LGPMJbqmPXBlaS6kQ9vvmm9lV6Zq0g+7nC9INDQ3LJS2GBtUSG 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?31j0bEuwVah7MKXsCoD7wYqWT7zWdEQJngG8qYAHspwhWtTJSI2Ce6OcHIcY?= =?us-ascii?Q?xzr/DWS1lBZ5rkK5DD41DenCsXJu1lLE7VXv0qu0X5N3FPaTlz+XScbqKiTZ?= =?us-ascii?Q?mv/eS3JKlffllx1TKTag0WDFN+FFkklm8p0zz3wcvtTqPiVXPUhINPCBpgjA?= =?us-ascii?Q?eCD0QRK1bB3dDeOkwvKOs3STzJvUWcpTtz/3rIWSwJQzpdtW7CDtlU88iwL4?= =?us-ascii?Q?24357Fd11Rbk1Vx57gT7OeDg0bndPNIpRKioJH/8rzkQi9W258MBgwq15xWj?= =?us-ascii?Q?lZO7x4/E1AH77KFaG0Dswyu94q8jawtyRRLN8lPeMmsBRRHQ5/oCpS7p7fB5?= =?us-ascii?Q?qMdMMHM2Qw7shbOVWo6mkS4LbdgLz8Rc1DaLGp3G/81sbqb2SyEkPv0/SyrX?= =?us-ascii?Q?FlFPkymPgaYJgUS55sFtzFcwuldNdMvR8gHZEciUIKJUllWOmmDsluWqdxFl?= =?us-ascii?Q?InHQsRs/Uy0vSlmgu1HsUB5PBs5yDExhIwkGhQ6qT7s6VxMJzz9IHEqZ/NpJ?= =?us-ascii?Q?8EquS1qld6pZE9Rw4kSAOER1Yg1b4VPK8e7UH81DydQ3+t8022NtVzFH+/9x?= =?us-ascii?Q?gozQtR/KOEGFCjNlm0JGgV5zXCJQK8bpv2PlrHrjmiXYDXsAP8gDE+soMVrA?= =?us-ascii?Q?9HWlnJSakYDwnzGPulTc0RLgDTUgzPJlMIQoExJ8ZCPzw+E/3s0jfQOdibCZ?= =?us-ascii?Q?E4hpwb0o/SgHp0Nx6sWvfGwzg5QAY5UhcP0i6pvGnQGjVTGTWzOxbzZQvgTf?= =?us-ascii?Q?OLK4iHd2ksvMtuJXyRyRaSJAV72sRtBqHFhL/L+rgsvvvFDjj7eKXcH36qrm?= =?us-ascii?Q?a2Bwn38fjaCpR4v9dgGNBndeC+kepWYomv2s3DhRmvryueQSkxigc+sO/zWX?= =?us-ascii?Q?LE//r4i4KLfZ4LGYJ9lORTDScEbGEaAGOmgNroCidjlDGSEUlI42lUCCeMVF?= =?us-ascii?Q?uTsTVvMX6z76qK6XqYoq7k695K8z7nh/VgqrkDs8bejpN79AMraN283OnCon?= =?us-ascii?Q?4Hg0BZOubdO6YyiIVgZMVcmzMKsHnVQ6J8w8Hmtk5U3X/uZ6pqIe634kwKfS?= =?us-ascii?Q?IOwFy85b5uq2Z3fu4CTQL5mDTs9jdXuBPlYiK3l7AOfC/NvGr46J9D6WlGJm?= =?us-ascii?Q?NyaHxmEWiqs+UUC5pJrp2O39HhGXjuAcWydr6G2miTRye5Ui3+jUjBXHj1Qn?= =?us-ascii?Q?H4BbjHEvXd72BVTZhIY9i5Ye/v+0GK1J7mkyWFB4EGfpoz3gVaSGKNvYrc5u?= =?us-ascii?Q?XGNS6oU++ByiO4+v3N72QOTFrff3YKEtc8hQIfRp5/CTb3iMsZGduyxpzWc5?= =?us-ascii?Q?Jr/wZaJF4t3RCGywe0v2HX+QoNu03/GmsXrFDzNz2BcT/m0vo/Nc57TpbW3R?= =?us-ascii?Q?xicYMLZUTcS5v2zi4ZNK0BE7G+z0NPMpTN35clismc0RrU+kTFH/il+bMwgN?= =?us-ascii?Q?5L1FT75FoM3FJn2f0xb4tVX1apej8yTyCzgEYcqziowS6xobh8nhJ8Lnvja7?= =?us-ascii?Q?Rxi+IVUtycALuH+G/aZWL4Ef5olhBYPRwaWCbLKLNV8hgX3Y3gOI3HQyrXJ5?= =?us-ascii?Q?BFt8clQqDJ8XyYBLfO7t5lYEtVY/Q7EHIn2bLRTJ?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: tX4tu7h9FzxQ282g9DS9Kf+MU21euCT8B72DxSgOkwEo9hgZEV8kmNrY1cJ4X7ZxYFM4ojV971oNpCOHTtVF0V/vDqdJAKfUgug9TCNQs8nXxmtmn40kcHt3cmNmjcB9FLskiysVYY+CgtDzp0WOCGWLQe84K3/lLK/BKpf8Q1WYnYEMzBV64yIIaI3wRAc7NvftOzA9rweRZB597ZrZAW7kJ2KMZd6Ix3Tv2niUWIWUmzgdgbAOVdYdc8o+su9gfCWIhXg7y2i4IwS3iuYJTRejxlfq3NtMXW9N/vT8CcHgt0bGDCKNTIoL2mEsNngLe6YvRIyHc96S713EcpsucZfxPg4KWNu+i6TnRkXXro5DdNdVozd10vjp+eJCifbpPEGuAonc3SBRf8PMy72HpNix7LkeqSgGTottcY7yQ2twe62kMDdUelh5K8H/D6RA40VISgBj2EABdiSMmCmV4B0KPi1Uq5v+76FNypC6OC/S4tcvsfUFcq8KomL2eZafJNJzCfhHNiZenkgew4CKy9AScwQPScAv9UnATt1qkLT8QY1hHrsKXrB31UI5rt1vCzVa5xBvanoqLKTxoCKjjWxC+b8AV2wb6VmQpCDjLkDLkhOi+MJtyartuz+1ReXhDWWVTFGT9zglrNofc/pi9M0HrfsoRa1DuhKcuajrkk4cQEXndOqGAtyVy9OAPRX/pSKp5ZNyvM3qpLRqBAh+GuBr3Gj+Dhzj4lUEzLX0f1fgMT61xp+6loXXsfacSx+mEAwWWWUGKTjc38+pssh4wA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e7302dfc-7cb2-4a8e-1e1b-08db736d473d 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:58.7490 (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: G6yzslBiO+oImPOLEwxK/MM/1o1TyvJ3nHq5+9XwGJwia10xQBq3dB2csTYiB4BMgRMznfrWVQDhy87PgY0VeA== 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 phishscore=0 suspectscore=0 malwarescore=0 bulkscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306220189 X-Proofpoint-GUID: rX3RAs-NF6uK0Ftgw5Gmxnlv8NnIb2J9 X-Proofpoint-ORIG-GUID: rX3RAs-NF6uK0Ftgw5Gmxnlv8NnIb2J9 Received-SPF: pass client-ip=205.220.165.32; envelope-from=daniel.kiper@oracle.com; helo=mx0a-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:09:08 -0000 Fixes: CID 96636 Signed-off-by: Daniel Kiper --- grub-core/lib/relocator.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c index 568fc0b8f..e0478ae5b 100644 --- a/grub-core/lib/relocator.c +++ b/grub-core/lib/relocator.c @@ -881,9 +881,11 @@ malloc_in_range (struct grub_relocator *rel, offend = GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT; lo->freebytes[offstart / 8] &= ((1 << (8 - (start % 8))) - 1); - grub_memset (lo->freebytes + (offstart + 7) / 8, 0, - offend / 8 - (offstart + 7) / 8); - lo->freebytes[offend / 8] &= ~((1 << (offend % 8)) - 1); + if (offend / 8 > (offstart + 7) / 8) + grub_memset (lo->freebytes + (offstart + 7) / 8, 0, + offend / 8 - (offstart + 7) / 8); + if (offend < GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT) + lo->freebytes[offend / 8] &= ~((1 << (offend % 8)) - 1); } break; #endif -- 2.11.0