From nobody Tue Sep 16 16:31:26 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 4cR6q3574kz67ZFS; Tue, 16 Sep 2025 16:31:27 +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 4cR6q30jG4z42Sh; Tue, 16 Sep 2025 16:31:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758040287; 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=YIEfrMrHBE+MggTpYRTces6cI63TCE1b3iJEt2bqfHU=; b=jZKXFvU3HzcVd6D7a9D0K8E9ON3V3zby8zwCgWGoWgN6NDB25dOm/a6dKS7rrIDvolqph6 J45E4kjRFN25dewNEmve72WJnysrM9rTylSWjHGlkG0tHSpQAVZYvPr0Yz+DIT/g8EAlss gGou3qzo5fKoDLlVinjZVnjxGXXMZ986HPKCtmK6XMpC8nu3JUZtQVZnvQqo8wuIeawuoA 79qh4MoO2aV018lEE1i9UtCFiBbAoMYvBFNrHX6QoWYYey0lBeqyLOXR2UA9GYbDSKMIVL wQjOPb8Sl+BAuDSetHl2JsrZWfIj/+7dnx5DpdMy/YBC9PzusLTORRjIKCQpOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758040287; 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=YIEfrMrHBE+MggTpYRTces6cI63TCE1b3iJEt2bqfHU=; b=H8C16KT3mqywo4aab7ayNTprQG7P6xOoXfiggiNXVhuXGZCTR1/F/t5E56005YVbO8FeX4 jELg+5rjHv68af6PJP02XzbRw7S2QRrm7LAGqgZKJIJjLh88EcBlhJM8koa6dTa0qx3mOa h7QqKNDUiVqU9wQ/BouayanQZObzEhVYrIb/yE86JdanJzIjb1tHfG1gMZn4lng/3182D1 X3nsncEDWrjmtF3lmsdENtwpvMDIXtvhyJ1g+SOiGGuSlBIwLDOslWBAbeLdBbka+ZKDNP MUUsIoyagg4eZZARkGa/G5rhU4QJnS+L/fkSlX+dtcz1koaKmSFJGkHxkuscow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758040287; a=rsa-sha256; cv=none; b=LuE+jkv+IAAvt9L9hFpGOtfsYNqmFkrgbYFLIuNFPod6qbs6cx8otubNq0/Js7aZZ5mJOJ qdAyeFNFTmGbjU4Xm93pKL0OubyH0llFWvrmgn1gJXWCDamFQYyuKl5T9x2R+KLHpZTWYd EddyjTy+HF+EqucOfXzgbb+X3vlXY6BFQoZ8W7URvmozBM+Ult5aiCA1zDV4K4WSHSw/av LEtxCizG+swfLf9DTf11kr/DnY2nglG141xFO4oFi7wxT38w4N6BMAHASbttptHNWs329h nt+EKkrKKo6oVPrj1tCqASRQ7hnSnlXGMk3kG5E7dL03lXI4++WZtzZ0L03Cdg== 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 4cR6q26q23zpSh; Tue, 16 Sep 2025 16:31:26 +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 58GGVQcP062667; Tue, 16 Sep 2025 16:31:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GGVQIP062664; Tue, 16 Sep 2025 16:31:26 GMT (envelope-from git) Date: Tue, 16 Sep 2025 16:31:26 GMT Message-Id: <202509161631.58GGVQIP062664@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: 751971e55454 - releng/13.5 - 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/13.5 X-Git-Reftype: branch X-Git-Commit: 751971e5545451114df20d809ead68bfe1d00915 Auto-Submitted: auto-generated The branch releng/13.5 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=751971e5545451114df20d809ead68bfe1d00915 commit 751971e5545451114df20d809ead68bfe1d00915 Author: John-Mark Gurney AuthorDate: 2025-08-18 20:25:37 +0000 Commit: Gordon Tetlow CommitDate: 2025-09-14 00:22:42 +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 98ac13c4baf5deb84010d632cb3b96dacd8c4eb6) --- 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;