Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 30 Jun 2026 17:21:50 +0000
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Cc:        Piotr Kubaj <pkubaj@FreeBSD.org>
Subject:   git: a2235baa622b - releng/15.1 - sys/arm64: fix return values of freebsd32_{set,swap}context()
Message-ID:  <6a43fb2e.45a29.74d9d25@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch releng/15.1 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=a2235baa622badb7d4e2078cb3447fe77204e948

commit a2235baa622badb7d4e2078cb3447fe77204e948
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2026-06-11 11:41:29 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
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
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a43fb2e.45a29.74d9d25>