From nobody Tue Jun 30 17:20:26 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 4gqVK74M06z6jY1q for ; Tue, 30 Jun 2026 17:20: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gqVK66RvKz3qGx for ; Tue, 30 Jun 2026 17:20:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782840027; 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=dR/o/f0VCDJZhMKad7OCb7cQe93lnvQCyPn0uueKaXU=; b=nSkdRpYQX//wKymcFy3X4y6SUgrViRgm0FymD4GrNI0u4Ib83L6xewbr035c2njLFCB7cQ SlyrF5RoAWyApO2jtBvwZ6drnCIftreSrw3T3+Y89KczJa31eSfcDlVYdOlZEJ45J+31yB xFVVWihuMKDEo5hln0DfFsp0ulJFBCU0zKc+KUouPYBGOteCfmbZrDnaGEfqARp47Tmc9w hR7MPeawAfoZht7S4u+N7wpPIp0m4qO+4nx3RGvQCpHnhsxE/svBj8ylwfsB+/bqeFHPXo TIHA4Jtn7gmKIaFhILPb0aTUD8msf2lvyGISC3g1tATGTNDo/CaU+ONVtB3AmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782840027; a=rsa-sha256; cv=none; b=gisncWARq5H33lnj7uqmgtSMBFxCRrEiyc7g6OY4a/zqyRlEJqA6oOmkBt1EYqg94XjLZA /OhEQwQ/ClUvRcEQOrRFK+6r5p6XbALZTrxB8EgLXqNUNAMec3INNYYtP1hg+K72kDQGEC gsMdgNdhwV4/H0DyP8GWHJnwC6UVbzDjrpF4kT14tlHA4Fv76rnblMori838YaZaw75GdA cw9vpvUZlwxwHeQe4PcGkMNgd8tqQfrdHgYO1Qn8utNd2hcU4yB9yuzerM6DnDSuuhzG1E Am3X8oAu1720Jwtq7aEWqHSpTqH2ibn0e3FaCL2ftXd8bBkogcDgA7wuupcNDg== 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=1782840027; 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=dR/o/f0VCDJZhMKad7OCb7cQe93lnvQCyPn0uueKaXU=; b=TYcoZ7DlDCB9z8gSaT93lsnnWE0JYeSSmpzEbmTG6XJtZxfOeL/bQC/t/Qn6wxmwReHnPT l+Zo5MaFQdz1VyHOQrzP5Nsz8HuupHiaMoZigeaKoILlrApc8Y0Oik3AjJKsjyPP+58JK8 InvfMtiOptJDlk5R8R3yiAq/Dr1zQI+Y70Mlc/w7AAgoWW3ZFT60FjCTeTDSL2NXORpa0X 9CXMRYFujPEmK1gcp7ZM5xQCyNKUnoBpbZolQnmVehiFF4cs6fYOnkfV+1vY4YiXfYf6+d Dmg9giHN62GoiPDP3rI+P9U5Z/oXY4Q4t1vrQOQXp7VhRx49R4STKTO8uZKuow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVK64P44ztVD for ; Tue, 30 Jun 2026 17:20:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45891 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:20:26 +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: e96d0e1fccf5 - releng/14.3 - 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.3 X-Git-Reftype: branch X-Git-Commit: e96d0e1fccf5bbc59f43403b4dc7582f4b75ca70 Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:20:26 +0000 Message-Id: <6a43fada.45891.4c636a87@gitrepo.freebsd.org> The branch releng/14.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e96d0e1fccf5bbc59f43403b4dc7582f4b75ca70 commit e96d0e1fccf5bbc59f43403b4dc7582f4b75ca70 Author: Piotr Kubaj AuthorDate: 2026-06-11 11:41:29 +0000 Commit: Mark Johnston CommitDate: 2026-06-30 02:31:57 +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