From nobody Tue Jun 30 17:21:50 2026 X-Original-To: dev-commits-src-branches@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 4gqVLk74Ppz6jYfr for ; Tue, 30 Jun 2026 17:21:50 +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 4gqVLk66FQz3sXD for ; Tue, 30 Jun 2026 17:21:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782840110; 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=uBTlXrM9MaRTmgcBNjQ3vTBmg3+/U/oa5U1bkOrPM/g=; b=dRyJSyEWKiQ/uazq/BMldcmvpWlGVOoT5/qEb98zpNVRXQOhSKTePl/6yY+fvAL/OIzfLZ 6uPU9yukZ/qaau/lScafKWmfsF/WFg4jnueY90YNe5zL+thGQg7UlT6dnWSFz0XvWNuW9L bNV1pchNGojvZMd8GogN9z4+vcf9zXNqR/1Jhlfaik4rRpD4Mh/AxXdl5xMYqoo6DXs7DN f6cWo4QMJJluUjCBaHaAHZrJOL0OIIPxkZD3UJMAcSSVBOsdrJy/XqJNibJyDheCHhbH64 tYUH0iI4T8ZBrn4G0g8mGOiMfBkpTtA7sjZIRzKFgLqjKjGPHi7ejNAXSMLq2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782840110; a=rsa-sha256; cv=none; b=NZeaPOqV1LcaTuDaKxNLptdlLJX+RSJ8qQPrTgiZ4TuCbfrllFcFffTIeZMp2liP4va1Qm rs6t9UXk6pCZVI6tUH3yK+X5XjZmBH+xHbINr79rDflAWQWCHLuggY7lW7vd8AeEm0pR/C NrRCEQP/33GZlYF4XTBSZRk4v3LYqm1y5j2Q24FFXvwN2mAsVO/10qtDGE8rORy0YPrsjC k1TNL5RcIt2lsGPQRZXheV4jRZYN01/t9X4IiyX0nbkJZRiIbcXFbWrS7uWvhjrVbs6x2q aVzJjprSle6huXIi5k4jg1HPxDsqd1RfRFDsTDOdg5XHoq9m03Q5i2VaFPERTQ== 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=1782840110; 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=uBTlXrM9MaRTmgcBNjQ3vTBmg3+/U/oa5U1bkOrPM/g=; b=AkrIOZtl5govuPAES9Knd5n3mMBc/meTmBvg6G9CjGT1RkvI4v5W9LWOPaKqiDJ1VaExGF GIk2t6ady5wZfx5468iaHdKnLGcEWhd1T88SVGVDvygJH2BDnSTUI6rPF7DPwQOgMDZsfh OxafBQG5V+scDy078TVjRLIlIs9zTrdDBvE1IVlCBZjcZ6eySrjhxKRJgX32nJBAThvYps bwGxAWu5SM4cNhobJ8WEMOz1EGcs7it3OCqADssAl+XY76fZHpoXEi8WM8OVslQveQVlyz IONs+MjXjdGZMSqSjBLoqaEYgcsp1Pd6C0B3fJQge9+SDLvTyyEs5Zo6xOVWww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVLk57GrztqX for ; Tue, 30 Jun 2026 17:21:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45a29 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:21:50 +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: a2235baa622b - releng/15.1 - sys/arm64: fix return values of freebsd32_{set,swap}context() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/15.1 X-Git-Reftype: branch X-Git-Commit: a2235baa622badb7d4e2078cb3447fe77204e948 Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:21:50 +0000 Message-Id: <6a43fb2e.45a29.74d9d25@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a2235baa622badb7d4e2078cb3447fe77204e948 commit a2235baa622badb7d4e2078cb3447fe77204e948 Author: Piotr Kubaj AuthorDate: 2026-06-11 11:41:29 +0000 Commit: Mark Johnston CommitDate: 2026-06-29 19:16:29 +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 964215aa1347c9da457ecaced0521c29eaaf7b21) --- 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 d0218dc1dc80..3c7040bf5bb4 100644 --- a/sys/arm64/arm64/freebsd32_machdep.c +++ b/sys/arm64/arm64/freebsd32_machdep.c @@ -293,7 +293,7 @@ freebsd32_setcontext(struct thread *td, struct freebsd32_setcontext_args *uap) NULL, 0); } } - return (ret); + return (ret == 0 ? EJUSTRETURN : ret); } int @@ -341,7 +341,7 @@ freebsd32_swapcontext(struct thread *td, struct freebsd32_swapcontext_args *uap) } } } - return (ret); + return (ret == 0 ? EJUSTRETURN : ret); } void