diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2024-08-02 22:24:52 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2024-08-02 22:24:52 +0000 |
| commit | 996d03b4385f4438bb3f86dc0cb6e4535c000391 (patch) | |
| tree | 8f7237cf9b9e61d7eaf72f107a2693390b696263 /sys/arch | |
| parent | 57ccfa2a3d0f6388a6bff4556bdbd6512c4f5efe (diff) | |
Code patch out the retpoline in the signal trampoline just
like the others.
Nudged, test, and ok deraadt@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/amd64/locore.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/amd64/amd64/locore.S b/sys/arch/amd64/amd64/locore.S index c5d91e68caa..c9781fd67fd 100644 --- a/sys/arch/amd64/amd64/locore.S +++ b/sys/arch/amd64/amd64/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.147 2024/03/17 05:49:41 guenther Exp $ */ +/* $OpenBSD: locore.S,v 1.148 2024/08/02 22:24:51 guenther Exp $ */ /* $NetBSD: locore.S,v 1.13 2004/03/25 18:33:17 drochner Exp $ */ /* @@ -182,7 +182,9 @@ sigcodecall: .globl sigcoderet sigcoderet: int3 -1: JMP_RETPOLINE(rax) +1: CODEPATCH_START + JMP_RETPOLINE(rax) + CODEPATCH_END(CPTAG_RETPOLINE_RAX) .globl esigcode esigcode: .globl sigfill |