From nobody Thu Jun 11 11:47:16 2026 X-Original-To: dev-commits-src-main@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 4gbgqb0nVNz6hJ9L for ; Thu, 11 Jun 2026 11:47:23 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gbgqY6svmz3Cxk for ; Thu, 11 Jun 2026 11:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781178443; 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=7rfHWVXTt9KYjbmeq5g45l84qqYn9XecVdDpDm87MgQ=; b=D1uHrFXEGi/CDwOd3C9xchuryChIl+hPUbnAYM7qd0LGNa87Mg2JP/Wy2/pDG8drP6UtvT zSW30hCQuCXzq606dp6ysXCCQBseT9SI0CITgMuv+ObhDnRSFYlb6F19/2Si+Y2b8dYAqk QvWvmfK/laB0j+8G7PGmKjAgQ/IjLA61XQu03YY6unGwD86U5supc8qlb1pAFpeL8hGMD9 pwR3QNxlLE10ssURiZhOfLQaXkqqJCfMQjZIYnNwEDU4hU1IHm1+JHVtTmScRXZ05l2NTz ntv7R+RQz28A/4jG6F7l1gtOTfW226fJmrXBFBoTO7Djal/GRuzSMreFHhaObQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781178443; a=rsa-sha256; cv=none; b=oWC4p0+13Lv6DTTIi7GRiwONXtwmL+VFOvJjDLDVHYe7prpYXXHJDQ+CTevm9AF4g5danR PAFc3xTRfo7S4KIWc6/HqrnpbNXKOwBeLrLanxs2sWWKBO7yqIEGTfNlMy7ufKF/oh/J6K LtNpBk6XgjDqlvtWDEswa3mJJw3xK07wZ4ykSer/BBk4fLxuwK1g8VY/xrmvICkLeGysf2 jX1urDr+keoDCIOPGV/uw4wDHZ8vC9VQFfSIeF28iMABPrQaKlr6bkGSeSbIx7rXSLXR8h 374a9XMBEfnY3TApcWAB1PGjykWWDjgs9BMyEOld+XwXatqe9rBBIo1TrDDEMA== 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=1781178443; 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=7rfHWVXTt9KYjbmeq5g45l84qqYn9XecVdDpDm87MgQ=; b=K05lfk4JmVT+zgPlZZrIWRXaN7QEuX3UxEC+cbcScHr30LO0+ldeO8HE+vJC+3oV+IwAMv JKePMWDRw91me/aBvBzz5o6NEhB1jafboD0cv7/AK9nZP6Ujf2jig/mThVdXOkUzLyVZ6M Yf/LK6vnnCdhNGMt5+yI9Xk1xHuBSircO/aX9r60RtCGNwDgRqQE2tiZ2COV1Z0w52h7AO fYGrMfwftCFEFv5ii+B3PFIgdvd+G5HnEi6yd1pQ5BHm10+rUPfDX5CmHxS+2wyZznKyDk YQt2PVvi4tY+AzsuBgE/wFpSVdir0yGY8xmRWLXdBea5qsNT7U/f+PVfL1LlaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gbgqY6PPgzqQT for ; Thu, 11 Jun 2026 11:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42806 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 11 Jun 2026 11:47:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Piotr Kubaj From: Robert Clausecker Subject: git: 92ae21e8a155 - main - sys/arm64: fix return values of freebsd32_{set,swap}context() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 92ae21e8a155734f73589b7ef9fa19a6bb6d042f Auto-Submitted: auto-generated Date: Thu, 11 Jun 2026 11:47:16 +0000 Message-Id: <6a2aa044.42806.34e559e5@gitrepo.freebsd.org> The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=92ae21e8a155734f73589b7ef9fa19a6bb6d042f commit 92ae21e8a155734f73589b7ef9fa19a6bb6d042f Author: Piotr Kubaj AuthorDate: 2026-06-11 11:41:29 +0000 Commit: Robert Clausecker CommitDate: 2026-06-11 11:46:38 +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. Tested by: fuz MFC after: 1 week --- 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