From nobody Mon Aug 25 15:23:01 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 4c9ZLF4VNBz65vxt; Mon, 25 Aug 2025 15:23:01 +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 4c9ZLF1qhvz3Xxd; Mon, 25 Aug 2025 15:23:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135381; 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=vHo8Nf8psVqxt9pnFjE9Izs6TCnpUX622KaDUn/vajw=; b=paNn/CD8mIu3ZMQ5CS+xSaQmqTUIR93EEzxBoQUen8g5zeD9gMN+xOuGxGY5HFzDpIHiO2 bzRv8dE/V3u6e5ReKdXDyKyTUbZHPmxYGavCqgoDXjeVmIVhPeFfCFZg6aYDhSqOrpb4e8 WzkKF2/o39MJ7RvIJA0ISdmvWNWKoQt9nD0hOT7Zzj6tyg0w36O86lMreO6nCFC8MCnlKz zkFyX5qEcVtkt7UF0Q9Ksxuo1qEpxumzp+gusWn64K0Y3Bmqqo3qD/cUGlcmtNHElewNKO Jm3U135t1MXedhAlc92/sqZd1OXqcN8StCEjyWGlxWh40/Fes4TaqBNUQ/+4lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135381; 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=vHo8Nf8psVqxt9pnFjE9Izs6TCnpUX622KaDUn/vajw=; b=iZ4vUh5Q30YsEPH3mTzPQNyoH/cMMoEuANyUtRG+6/EImHEJFxNxkKgPT9lev+fRGHy+/c 0Eovx9afggWjRn1slB9OngX9nmz3S4m1L/pso+lrNoHFRXmohb7quLGcW81JHR/0qdY5l2 2rMlP74ZnhhqwhyDS+jHWdezRC+ZRygzb6YoUAqluRum+m4uxosUuZpi5Dzib0bF2WmqJH x1tkLQjbICigkZjyWK7BtG2EvS22pOkJ6D1yIPAbgQSqzcDJYRDjdw9a/bERDkkO7Agk2C p6GhuhGfY76TdA955Nn1BF+H7AL2PYhjg22RbTWqiLFTgy/W+IA9jrk9KgATPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756135381; a=rsa-sha256; cv=none; b=QoJHwKYKFjn1W+QdQWwfalxaoP+mWDlmRLYlhhqEMkokf736BRZP6xF+OCddrZUCUsMgZY K75Ex7f01dkDAApkQ15M7gme8KESzq9AC2Daq04ZOAeQKwKTaDqU0cAdNYsTk8xERytpUQ kT9vPAcl25tluS4BMhZQufv30v8T30Z684pDQEjXK5kCTM+I+3mmP5ilRxGJ8p4r4Esxlh tFhhjZjCRMNV3BMxXHJoST32IJL/R1ir4mhrBcTnt1wWeC6djuekBK0WDBywuv/0sJuiXg wbRTtvGgjh4H2mmSuaOQFlHUDCm2EJH5XJNZBavaxbsW1uEIvUXxnjtSlhxD+A== 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 4c9ZLF1D7szvx8; Mon, 25 Aug 2025 15:23:01 +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 57PFN11c054262; Mon, 25 Aug 2025 15:23:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PFN1cs054259; Mon, 25 Aug 2025 15:23:01 GMT (envelope-from git) Date: Mon, 25 Aug 2025 15:23:01 GMT Message-Id: <202508251523.57PFN1cs054259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 17d87881a363 - stable/14 - 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 17d87881a363c160e7e8cdb252d0261214c1a50b Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=17d87881a363c160e7e8cdb252d0261214c1a50b commit 17d87881a363c160e7e8cdb252d0261214c1a50b Author: John-Mark Gurney AuthorDate: 2025-08-18 20:25:37 +0000 Commit: Mark Johnston CommitDate: 2025-08-25 15:19:47 +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. (cherry picked from commit 740b879c6ade531adebeba7cd2f261bbe650797f) --- 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;