From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 75E822F5491; Tue, 31 Mar 2026 17:03:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774976590; cv=none; b=FTINJCL8H5jo4U1Zt8RQiUO5wyXJ5CzT13q1hFAlNrDnkiiNvBvQedPqp1mS5O46o974dNNk4s96t/b4Ry4CwavaukYA3fSVBUJ0jhAgVGJOyZWa1zSOCW9S1TFqzZkLLmSsuh5PobR1UhEOgeDwRxzES933jWDnODV4PIrvFnc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774976590; c=relaxed/simple; bh=upa1S2W0ccU/2gDEH+nvcnYWRuU3CjGWZspxRnp7I9Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gOzTQ90bZH3XfQm9Gg0JnTCRxswXJ8ahj94Q574fcEO0Kujz4GmAndbo/9LnCxXVXUduXcs4xdw7kZ/iVf7KE0Kb1+xVmowEgVWYe4tca8eZHZ36eKYm0ZGRawZBK3jCOo4rg2NGYmyRsTjFYB3FCLEjx+mozH953Vvi/g4owwc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=j/qQk3Rp; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="j/qQk3Rp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0913C19423; Tue, 31 Mar 2026 17:03:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774976590; bh=upa1S2W0ccU/2gDEH+nvcnYWRuU3CjGWZspxRnp7I9Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j/qQk3RpzBk17giePvZUltib0XmHi9x271bN6nPhAbrlxdjLvq9ZFFB9ScHpkOc1e iV9fGRVa2AeYjFCiz4ep72iutm+GwAiIhj8KHIJvhKR8HarGYFYrPcJKno+1+xe5ly g61RX45ho7pm/RpaFG/7oMSOt7ry5562fUdHJ21U= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Guenter Roeck , "Mike Rapoport (Microsoft)" , Ard Biesheuvel , Sasha Levin Subject: [PATCH 6.18 151/309] x86/efi: efi_unmap_boot_services: fix calculation of ranges_to_free size Date: Tue, 31 Mar 2026 18:20:54 +0200 Message-ID: <20260331161759.028103246@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260331161753.468533260@linuxfoundation.org> References: <20260331161753.468533260@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mike Rapoport (Microsoft) [ Upstream commit 217c0a5c177a3d4f7c8497950cbf5c36756e8bbb ] ranges_to_free array should have enough room to store the entire EFI memmap plus an extra element for NULL entry. The calculation of this array size wrongly adds 1 to the overall size instead of adding 1 to the number of elements. Add parentheses to properly size the array. Reported-by: Guenter Roeck Fixes: a4b0bf6a40f3 ("x86/efi: defer freeing of boot services memory") Signed-off-by: Mike Rapoport (Microsoft) Signed-off-by: Ard Biesheuvel Signed-off-by: Sasha Levin --- arch/x86/platform/efi/quirks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c index 35caa5746115d..79f0818131e83 100644 --- a/arch/x86/platform/efi/quirks.c +++ b/arch/x86/platform/efi/quirks.c @@ -424,7 +424,7 @@ void __init efi_unmap_boot_services(void) if (efi_enabled(EFI_DBG)) return; - sz = sizeof(*ranges_to_free) * efi.memmap.nr_map + 1; + sz = sizeof(*ranges_to_free) * (efi.memmap.nr_map + 1); ranges_to_free = kzalloc(sz, GFP_KERNEL); if (!ranges_to_free) { pr_err("Failed to allocate storage for freeable EFI regions\n"); -- 2.53.0