From nobody Tue Jun 30 17:20:53 2026 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 4gqVKf2Qmpz6jYGc for ; Tue, 30 Jun 2026 17:20:54 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gqVKd1frmz3rDR for ; Tue, 30 Jun 2026 17:20:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782840053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YIA0D4D5bKfiFHK9idqyS/4Cnl8WdmRvaz2X3q3Asv4=; b=EJmD6wwcmr4oL5iHYhAWXsIxU4w0wH68G+F0TPsnXLZrPa31Wtcvrd7NBQ45TOJTBmFGob hB4kCXXVW6li8Z08y3mEvOZGpk+EGl+5kbgroowkMA2vU6LynJM5LfTEucnaJrt0LCzr+c uEpKpvUZ8uyEaq1ON354lYopoWEtPdUjwvch3hNVXeL2rQ9tfRmHGBzs5ggYzGxIr6AhLy XFUO//4AV7K3Mka6OLyMZS6yd7BBrRT2kovqyQSvVDHY0w19Mdf/wfPtF5xLAPXlZ4cZ6w YiRiFOuoj33DhHALjpZw6T093XVSA2zAST2S/uNF+FalcIRVMuzJv+ihZzxe/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782840053; a=rsa-sha256; cv=none; b=EKYNCktnpPR6FD7bEPhrGHcIZm5IYN/aff/5KqZert+loMcbJLHelEc3lmt23ahfyqAT7U L2lfIlbuFdyKC2fxnUXwld4em6Sdaa9fcgBe0ayLN5nzNKqXTnNlQsdJgu/XSy+uqpRdBJ 6vrLrXR5ux9OGispFcUsq8pOFiS+gPfz868ANL344U07S4gEP3vid8pUxGrsr0JGjGED2N MGDmjFHEor+Vp3dhgBwg/q3S/dcw91EyA1QmaiLH8b/mCQ3PTOPdgtgG65LcLYyJfTmsXo i/ELn6DJR/X79YrujGD278yKmqQXlwcjSWg5stmK37QoWzw2MBDn1cZzPuC5Jw== 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=1782840053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YIA0D4D5bKfiFHK9idqyS/4Cnl8WdmRvaz2X3q3Asv4=; b=YIhfsohbGVdymYQ6dmrX1nC7Y+1qQv2/OG1EcNsbAY2Ggw39p1f8K7vuzGdHj4E5z7pkJV N0Zeyb9931k/3dB479KzMXjSu/UtJ6M2ynrGTSW2FItkpITh7g9osTBBsLOA/8St1BT+98 4oNqhBRNB/Z3UVmNOBEjVTd8GkaUvHCLlxqy8FPEBbvYhbOtffCR6cEYJuTXySgnF8ULYj NiIalhsQhmIFQijExjjk3nSjqXMi4kEp8v2MWcVs8j7yg5tm4DexP5kFnH1cjPhTZtboAn bufzXI+1H7F0BAjis6/bCloz8LmNNY4zvoQ/0mXvnW2ob4JvoIB9o9OM1lxj+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVKd0kg0zsXx for ; Tue, 30 Jun 2026 17:20:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45e11 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:20:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Piotr Kubaj From: Mark Johnston Subject: git: f902821db095 - releng/14.4 - sys/arm64: fix return values of freebsd32_{set,swap}context() 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/releng/14.4 X-Git-Reftype: branch X-Git-Commit: f902821db0950cffaa76bbd1fe31294a0f2bba94 Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:20:53 +0000 Message-Id: <6a43faf5.45e11.52fdfac@gitrepo.freebsd.org> The branch releng/14.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f902821db0950cffaa76bbd1fe31294a0f2bba94 commit f902821db0950cffaa76bbd1fe31294a0f2bba94 Author: Piotr Kubaj AuthorDate: 2026-06-11 11:41:29 +0000 Commit: Mark Johnston CommitDate: 2026-06-29 19:17:18 +0000 sys/arm64: fix return values of freebsd32_{set,swap}context() This patch aligns the return values of freebsd32_{set,swap}context() with their counterparts on amd64 and powerpc64, fixing the setcontext() and swapcontext() calls in armv7 applications running on aarch64. In particular, this fixes random crashes in armv7 Ruby applications running on aarch64 hosts. Approved by: so Security: FreeBSD-EN-26:16.arm64 Tested by: fuz MFC after: 1 week (cherry picked from commit 92ae21e8a155734f73589b7ef9fa19a6bb6d042f) (cherry picked from commit 58a15fe75cc59a73016f00069f2dad001d798edf) --- sys/arm64/arm64/freebsd32_machdep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/freebsd32_machdep.c b/sys/arm64/arm64/freebsd32_machdep.c index 1cf8403e0a0e..dc0e536c2bbc 100644 --- a/sys/arm64/arm64/freebsd32_machdep.c +++ b/sys/arm64/arm64/freebsd32_machdep.c @@ -292,7 +292,7 @@ freebsd32_setcontext(struct thread *td, struct freebsd32_setcontext_args *uap) NULL, 0); } } - return (ret); + return (ret == 0 ? EJUSTRETURN : ret); } int @@ -340,7 +340,7 @@ freebsd32_swapcontext(struct thread *td, struct freebsd32_swapcontext_args *uap) } } } - return (ret); + return (ret == 0 ? EJUSTRETURN : ret); } void