From nobody Mon Aug 25 15:23:22 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 4c9ZLf74gJz65w1g; Mon, 25 Aug 2025 15:23:22 +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 4c9ZLf6f0Gz3Yr7; Mon, 25 Aug 2025 15:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135402; 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=PHV3bS46HZecQ4FUkBdJuZqMvnL53Mtq1XcJbOadP7s=; b=LQEJ0Ic+dWQelAhenhcvNJ2nwxiUM3N7/QckJamGMBjOOuBRDW/f2xQ5OL6xw+l8WGtgOX K5Ve2KElzhiZYiBzbvIJWKzS9LU9Be54mpU6DiiTC5tU0LPb+Rn8EYQZCbMkcAu5l7Mr5q hbOBrXeLNeaGZmUKOqhE4hcNPDkCVOJkZ2LqGk49Fn7HyF3hczEi3gc2QRFTky78BbJfYZ Ynku/BMcdgfmkCSpXomW3PaT29UJdSHK3lrYtrsNku0GdegDpkVHgsEMAD6ZJ1SybAeCYT G/1ZCwfm7X/kNJZlLljE0e3se4MhOnFWWoHS6XoPfgPCXkLVzjYbJDcIlJr3rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135402; 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=PHV3bS46HZecQ4FUkBdJuZqMvnL53Mtq1XcJbOadP7s=; b=sP3KIYXdr8mX1vI44lGY3/X+jsTQ2Y1HNrz/nkpyO5sWIm71I5SezPq5NSD0IpdFo9+uA4 CjadM9e6Q8NfdwX8KrPPUwpl4SMyXHxXnay1vUel0qvQXvw/qIdjrhuawleGJittsf81Ap aLvUl2dFuVlGwIkHhmj5lJu08je7pKoVkT6edqO+/xSnFTXr7YXmVTkApGh35KbSPMJCFT AflO7+1maGRWO+7KrSH8qKnSod95Xh50lMLyhCfXZxIPsEEWJpS8H+QpdAIfhfERl6zc1m 57/5o2TW/Stj+bZ+NsB/2kqRImFKfagyDTiS+sfFBxTgofRM3KMkC5qbTxqxCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756135402; a=rsa-sha256; cv=none; b=tJj397DXSTDVxVC1q3f1QGTGDljNK2CsbGfqLzuI23NNDOWUh/aRL9fpJZc6PDUgfxbnqQ T7j2YKUnLZF2yR/rBCGKJsrABVcSpufXbLZ12+mJF48rnh+yf6A+vi0JW2zOFhnYpeO77o V4WKQP0/WCiOybYR39WYLC3K/THq16sI8qytEYDoZVPJtSmuKe5l09ljqsjAnPYuF57Ndw OIC/t52fPZP6C1mCmgZWo3sG+WFmehPOZ/6UwsCikSUYz53obAGCVtNvaZgiORXxvutEiX Fw9ryJm2zzIzskLFm5bPPURjrh9AFgwu4AgwLn+2i5NFVWixnpqHarf4dtUPVA== 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 4c9ZLf692bzvx9; Mon, 25 Aug 2025 15:23:22 +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 57PFNMjX054527; Mon, 25 Aug 2025 15:23:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PFNM8n054524; Mon, 25 Aug 2025 15:23:22 GMT (envelope-from git) Date: Mon, 25 Aug 2025 15:23:22 GMT Message-Id: <202508251523.57PFNM8n054524@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: 98ac13c4baf5 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 98ac13c4baf5deb84010d632cb3b96dacd8c4eb6 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=98ac13c4baf5deb84010d632cb3b96dacd8c4eb6 commit 98ac13c4baf5deb84010d632cb3b96dacd8c4eb6 Author: John-Mark Gurney AuthorDate: 2025-08-18 20:25:37 +0000 Commit: Mark Johnston CommitDate: 2025-08-25 15:23:12 +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 1c580e2b0de3..6392de73acff 100644 --- a/sys/arm64/arm64/elf32_machdep.c +++ b/sys/arm64/arm64/elf32_machdep.c @@ -190,7 +190,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;