From nobody Sat Sep 9 19:14:17 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 4RjjMY6Bh2z4sjW9; Sat, 9 Sep 2023 19:14:17 +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 4RjjMY5mRrz4dFF; Sat, 9 Sep 2023 19:14:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694286857; 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=+ynq1+Cx42Ca6PFnEp2YUfYGyHxLQfj9JT7yBdu6SU0=; b=oZADfjQSsRPKYpj53iwo/O1AuMqyBXPVQZorfPPC0A7U/iVVXxyVUFQTfe3aard1Gfb3X9 EkMncQk8YVyF/6XrD11RjgzkTH4VHMulYOSME1v1OYTGln+/Y2yBZnsQVhsKduEgkNXa2K CnwwS+V1jLRJhjy6XDvLX6BRYrH31tOeBMA9pXqDiuCiUUZK+HzlZk6pOL841XmNSbcui3 jlaqEU/j+RsYm7Rb6d7V7TAqzDgnJ1bzkCrvV8i7vJYHVTe3RqTIFRUQs3qkhzE75AjOJ+ STW/cuYJAD/B0giFGS78LekUhEUhghEbgkobC4zjHVv5RGLad2RL54OBGx0fIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694286857; a=rsa-sha256; cv=none; b=JJYSgnnSywYkQs2ssyinXzrFRVjbiqGVlAUeWbgI3anij8P+dCJ4hD6GXXdQcQAGDtTzFO bqo08fny+OJmte1Ugag3YNcM70OodJy0I1BNs30bpMoPvvaq0uMItRpwsDvrtq9CbMyAZy H96DbFPwgZjKJbSIehexcvXcv2efwjsJYy2QBXR09HaEKv+QIy/4ay5J6u3lSJKrFr4pHF uodLGOvNy6aVI23Z7B4goh4cjta31IjdozLrkzB18kTOyD+RglbVz9C6bULoExb4lyMlWQ +S/4HMehh0wj/lnOru1J8xZeR9i0knph5Wtc9dthZ+gkdWOB51atPofnEJMcgw== 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=1694286857; 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=+ynq1+Cx42Ca6PFnEp2YUfYGyHxLQfj9JT7yBdu6SU0=; b=AYhdJsn7JGKZekY4lK1BLk8YQuNh6s3wrSZUX9pqfYBxnd5ZtviMWbkizNxvev3QJ6oSgg a4aNGBv3VcCRy/uFZplNJ2P5YOM6Hx5QW5zIkaI4mMTjO7dN2h3rvLDjRRIJCze2PU7oz9 iAwCtT28+UddDIP3ZqWxXk6kAviBts787ZWT0RTtXqYym/1kMoKHmbxFUwIify8gAdYs3n zOIpr6UddGrn1GAHr/Zu59MJYvnigHhaeuyFw3R/Xv/zwExHMT8Gkqr4YeJMb62yT/wDhs ofLNrKb+jXJ7tr/baBF5DdhSDKGIpkEFjuJWklR62SWxwghsAu9ulkekUW/0/Q== 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 4RjjMY4dbDzcX4; Sat, 9 Sep 2023 19:14:17 +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 389JEHCp033490; Sat, 9 Sep 2023 19:14:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389JEHGW033487; Sat, 9 Sep 2023 19:14:17 GMT (envelope-from git) Date: Sat, 9 Sep 2023 19:14:17 GMT Message-Id: <202309091914.389JEHGW033487@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d0af08c4ba3e - main - 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/main X-Git-Reftype: branch X-Git-Commit: d0af08c4ba3e400049d246d72401ce36d3bee98a Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d0af08c4ba3e400049d246d72401ce36d3bee98a commit d0af08c4ba3e400049d246d72401ce36d3bee98a Author: John Baldwin AuthorDate: 2023-09-09 19:13:57 +0000 Commit: John Baldwin CommitDate: 2023-09-09 19:13:57 +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 --- 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];