From nobody Wed Oct 11 15:44:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S5HBl2LBLz4wKKQ; Wed, 11 Oct 2023 15:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S5HBk75Tjz3dcp; Wed, 11 Oct 2023 15:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697039071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gBB+fjKhDSM/5591FWdxq4YbVt4GrhDWh2M5BrPu9rM=; b=yvdC2GTl48zaD3dqREJwaXNrsAuslY9/chhGJau4eyso9wIanjjnXFn9+NvjYy/43uubw1 KBJ7yryAgwGpHeD4/Zr7h+9mctXYINy3/BbuR4HZO5FAi6plsUTJVJQK49n6khAMF6QIzr b9NSVOhsAk3FgRFWNuzcqSX4I6kGKcz3VcV7ioblkP/Ij6kXBgLchaOx+KjE51I6Xr5kow 6pgmgWYxMdgDGlJwNMKOmS7KbI0w/qgD+2PBFSFewMkhbi6XjfGHIhhksliILMKrFYacmd KqyBxUeVYo/I6KUfBSWaCpU9Ex5wNaNQnBwOldSOnqb1SnBR5IN33GdEKL0Wew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697039071; a=rsa-sha256; cv=none; b=qgc0CfCg5g4YQtyBmlNsn0+hwFH0vM22YZMYO4qeRfKRwNgQ5oNyu9UdX1nlT8XMNRZZc6 Cf8tHKmn17KGMl8Yi09VdO8c1Qj4N3SkZKN1z3Sb9D+lOvpxI0jC8KtAnMi2rX9ZaJXa6O Le/DTnxqv338DBp6gPJRnMWXMg7RaKrHkQLlQz6j/BFACIwj8aHMG97FuM47SZFvoPk+Y1 rj5sIm5kM8GHlv0aVCWRqrT+kOh52Nu+M19i882b9PNcYZKRFzlj8uLTrvRyzqrzh1RuOw /xwbmQrBxK43GNSm4FjAlwPCBUH10/A2OOoL1m1i1447qZ0d0op0qyggYd3pig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697039071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gBB+fjKhDSM/5591FWdxq4YbVt4GrhDWh2M5BrPu9rM=; b=pUKMiHTAm4MOEdYvnfwd6Rg1FH2bnOLUh1+TBPNzcs+zm8PexqDBWXD4XZ6hNiG/bkMTjP OQW1DuFGDtNQeAtb7yiNOL0Vq3+S5I1ot8ybQrtppHf1dgQgqKjVL+jUOxnoZvHd7Z5wZW Z+kH8RtKXlGXQWNf6WPc/WqLXv5oWdsF2vf/QCc2DsdAPUwIvHxo8JFFzE3x1qO8UX6umq +V65pZ+yPAjWYosE6QHsaV6haie/ObxHMaHLm+BDF4iraDDbgiDki8+Wqij5pM9AEvOy5S DTEFI2HbRPdkg4J2ubBpG3I6Rt5KXX6yPER8ozIChu2hfHxEbolWUa3UIWvlKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S5HBk67pzzBhL; Wed, 11 Oct 2023 15:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39BFiU6W024135; Wed, 11 Oct 2023 15:44:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BFiUUS024132; Wed, 11 Oct 2023 15:44:30 GMT (envelope-from git) Date: Wed, 11 Oct 2023 15:44:30 GMT Message-Id: <202310111544.39BFiUUS024132@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: b7f6b86ee7e4 - stable/14 - gic_acpi: Limit the number of CPUs to GIC_MAXCPU List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b7f6b86ee7e49718ab8bf74f7a33fa8cda4d38dc Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b7f6b86ee7e49718ab8bf74f7a33fa8cda4d38dc commit b7f6b86ee7e49718ab8bf74f7a33fa8cda4d38dc Author: John Baldwin AuthorDate: 2023-09-09 19:13:57 +0000 Commit: John Baldwin CommitDate: 2023-10-11 15:10:32 +0000 gic_acpi: Limit the number of CPUs to GIC_MAXCPU madt_table_data contains an array of pointers for each CPU and was allocated on the stack. If MAXCPU is raised to a sufficiently large value this can overflow the kernel stack. Cap the stack growth by using GIC_MAXCPU instead as for other parts of the gicv1/v2 driver in commit a0e20c0ded1a. Suggested by: andrew Reviewed by: andrew, emaste Obtained from: CheriBSD Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41800 (cherry picked from commit d0af08c4ba3e400049d246d72401ce36d3bee98a) --- sys/arm/arm/gic_acpi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arm/arm/gic_acpi.c b/sys/arm/arm/gic_acpi.c index e18bc12faf4d..56ff78f9b685 100644 --- a/sys/arm/arm/gic_acpi.c +++ b/sys/arm/arm/gic_acpi.c @@ -84,7 +84,7 @@ EARLY_DRIVER_MODULE(gic, acpi, gic_acpi_driver, 0, 0, struct madt_table_data { device_t parent; ACPI_MADT_GENERIC_DISTRIBUTOR *dist; - ACPI_MADT_GENERIC_INTERRUPT *intr[MAXCPU]; + ACPI_MADT_GENERIC_INTERRUPT *intr[GIC_MAXCPU]; }; static void @@ -107,7 +107,7 @@ madt_handler(ACPI_SUBTABLE_HEADER *entry, void *arg) break; case ACPI_MADT_TYPE_GENERIC_INTERRUPT: intr = (ACPI_MADT_GENERIC_INTERRUPT *)entry; - if (intr->CpuInterfaceNumber < MAXCPU) + if (intr->CpuInterfaceNumber < GIC_MAXCPU) madt_data->intr[intr->CpuInterfaceNumber] = intr; break; } @@ -151,7 +151,7 @@ gic_acpi_identify(driver_t *driver, device_t parent) } intr = NULL; - for (i = 0; i < MAXCPU; i++) { + for (i = 0; i < GIC_MAXCPU; i++) { if (madt_data.intr[i] != NULL) { if (intr == NULL) { intr = madt_data.intr[i];