From nobody Tue Sep 16 16:31:06 2025 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 4cR6pf4YwXz67Z2f; Tue, 16 Sep 2025 16:31:06 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR6pf3qg8z41hW; Tue, 16 Sep 2025 16:31:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758040266; 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=5b7U7tRtMfLbumJT4t2hPVCnplnxST93RNHKKxvdMwM=; b=WEgNLFP8p2JbfCrjuQK93Mf/vchbBcHYHZOsdpT3L9odwIzfHcPC5ihuQI7R++FTyWreCO 07iRBKE4tjqE/e5CVvvevQTqChSGs3EBaIk+i+CbVHuLJkEgwGZjNA2n8uSAXlFz+bME2l HliJ9LLUAyvM+/Ja7i/7SvyEaf14WUUNfBgbeQfnbCDgh/Cj9YyU/WszEdqhDAr1kw5m7j intr34b/KzRCImQdQbGoAHn+LX/87p20ywU7qRu3pp+/d+/LmiyD4j2JCLTGWuf5kKVTqx DnmoTMDJ2v1+cAtz/GIqKP4BZH5a1wEGH4DXTQqR9OroEdumu+bf7ngmVyXyVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758040266; 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=5b7U7tRtMfLbumJT4t2hPVCnplnxST93RNHKKxvdMwM=; b=lXLaWdAdbAhuLhFeSU0g753/2YXKaShFtHE9gYiXo/gQ5KNLZC/LsEBsxHtHYGfMax6bbH R20ht6ryd3TDOeu3o6uzdjjNOydo1Q1/IhuKgtZmijzcC0ZJ5Vc1LocxvWIVN/t2bbBhAZ lCItmGhos84So/bzHbElY6e/mBVent76NiaMYLpVOQyBVkw9X5z+E9vJsOL66j5WiFe34U QcMKZiIsmj5pkifQIH3rFQn34JwYnb8XGtwHbIuyG+MHpzGglf3m+Zi4/j/h++IZLbkXWF FNRbLhVfjzfvo01ooYOaoU3dJes3foShNnV+4lTgtAJf8tIdmKve+1zQ3hVNtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758040266; a=rsa-sha256; cv=none; b=rF2yM1d/T3stWjUvH6I86SJ8SdYSkFDXtWy/bF6xv5+9T1yqJPL99BeAkWPNTi1reynNQ7 gbo7yqRPIhpS9EQWbyfZmXcf4kQ835jBH9HdBuhaKxt9kv2v4smOdg3MNdh5JA9Xsyy8eR SGCwP21T0whAZvJ8T5FSjxrJqAGtsPq2s5GqPqw0hB+6ddDDABfpCHF/mgTXRtUeix1CzE 895CshnFGIGm0ZqOGY7h2TrOWKNoR7NjyN85NKUs4fQz5KK7ev6Q82dKL5p3XM97k28wTV iGpKerCdFMdIMnjOZcHwyeDzG+uzLEozofnTqg914NEwaLMWrNYfyJnY0nQSug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR6pf39f0zpVn; Tue, 16 Sep 2025 16:31:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GGV61k058617; Tue, 16 Sep 2025 16:31:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GGV6Vr058614; Tue, 16 Sep 2025 16:31:06 GMT (envelope-from git) Date: Tue, 16 Sep 2025 16:31:06 GMT Message-Id: <202509161631.58GGV6Vr058614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 99012995b4c6 - releng/14.3 - arm64: prevent panic when using syscall mux + large arg call (mmap) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 99012995b4c69ecc352047a41cf76ece50b25134 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=99012995b4c69ecc352047a41cf76ece50b25134 commit 99012995b4c69ecc352047a41cf76ece50b25134 Author: John-Mark Gurney AuthorDate: 2025-08-18 20:25:37 +0000 Commit: Gordon Tetlow CommitDate: 2025-09-14 00:20:46 +0000 arm64: prevent panic when using syscall mux + large arg call (mmap) if the syscall muxes are used, up to two additional arguments may be required. This means that the 8 required for mmap increases up to 10 (for __syscall). Sponsored by: Juniper Networks, Inc. Approved by: so Security: FreeBSD-EN-25:15.arm64 (cherry picked from commit 740b879c6ade531adebeba7cd2f261bbe650797f) (cherry picked from commit 17d87881a363c160e7e8cdb252d0261214c1a50b) --- sys/arm64/arm64/elf32_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_machdep.c index de0ee9607ad1..5f35d01f9ac0 100644 --- a/sys/arm64/arm64/elf32_machdep.c +++ b/sys/arm64/arm64/elf32_machdep.c @@ -193,7 +193,7 @@ freebsd32_fetch_syscall_args(struct thread *td) register_t *ap; struct syscall_args *sa; int error, i, nap, narg; - unsigned int args[4]; + unsigned int args[6]; nap = 4; p = td->td_proc;