From nobody Tue Jun 30 17:21:18 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 4gqVL66N90z6jYVn for ; Tue, 30 Jun 2026 17:21:18 +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 4gqVL62wPrz3rh1 for ; Tue, 30 Jun 2026 17:21:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782840078; 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=TA6LftWMz5XwRj/+TqpZKVYuo1vb7//D7++2rKbj7zA=; b=I7Ky0AIon4qTWnh4/OOjpng8JZNn9/O55L/S62Fr2Na9eRUA6zk/ryzYHc7FqyVhYcHyXo mzQf9Dj2MnXhn2kCzn+PteDzJLav+TqGhLeEewnHdn8L7KJkrMavZI8nBdA4YdmEgcV2lr oI8XRRJNcjErD+j/l6z0RBYNSl6hjWh2jtaN0K6pazgI/tgTaC0tGmHtFFBTZxKQjc/mOI fZdnbFXHaf06Tn4ccLRaehcfSk+sRKnxbpiwyz1qs/cuABlVlznWUgqRA4wu6OQjIXNuFT Zj+bibTmAtSNDaSSKo4HpqYqXpcj5J7XulRr68P1kYxiUyk7MHCvpZ4/peB0CA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782840078; a=rsa-sha256; cv=none; b=H4vACQSCndT6ulxnE04dq1R7TUT/98tWfqmoc5JcdeT02A2sJfcVPRlqYl/FGrZLuTzAUC IrLMZdfA9RtQrwByF4x2bsqZLqpr0sneQ8nGd55NiDFTBvDGI3rz9DnQiV6wtIZpw0fZ3U XZdMe3eZJbSa7Q8COS1XhXeTLrpNZzdtAjtvlRq36XxK8n+9QSAYjFTYlTXf+/SNTVMkYp 7aFdSGPI2UitTDFbGl2oBTk3fN5DZLYMQ5OodgI8OxYNYaGjCZfwiJ4oLXuujGPM5H/HX7 L8Q0d3z83WbepRxE1f+KXgypNK5iwRvjIniM9sOH6NitZemV8H99R1PC4BeLEw== 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=1782840078; 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=TA6LftWMz5XwRj/+TqpZKVYuo1vb7//D7++2rKbj7zA=; b=KK3FfuEAWG9lk6M+XD5XbhGpGwq3N9LVFKR2lNjA7RiX7iOFw6ly/hSJz4ugMPVqj/Upjs 2RH5P0qpTArh8XrEsHIO6W6BF13bBhy1tT4V06BVvCaOXzbUhcJTY74cjw6TbM0u2jPFzp bnKpGOfAN7R6WUi5Hvb+Y70Ux3GeFdvxsUf/fJJqgOLrvriu/oi0JZzkhgJr10YMC0JMOu X5ea+6laWJsJ9RF0p1INl6IG0D5D+ev1aQG6uLk4eQd8hmEVWqHBjakP5VjYH3IU4ka4RE zFtJrRQkZ+MEEX92wqoBwjsBB0IsNUwQSzNUPg6J9DS2NUuEq39hB7hy9jqUMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVL620NcztkR for ; Tue, 30 Jun 2026 17:21:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45878 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:21:18 +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: b77d19dcc0d5 - releng/15.0 - 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/15.0 X-Git-Reftype: branch X-Git-Commit: b77d19dcc0d5ff8fc704ae255630b92b7a91f05d Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:21:18 +0000 Message-Id: <6a43fb0e.45878.3ad2120d@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b77d19dcc0d5ff8fc704ae255630b92b7a91f05d commit b77d19dcc0d5ff8fc704ae255630b92b7a91f05d Author: Piotr Kubaj AuthorDate: 2026-06-11 11:41:29 +0000 Commit: Mark Johnston CommitDate: 2026-06-30 02:32:51 +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