From f4d0a2629d02c75337b910158daf8ea1b113d7b2 Mon Sep 17 00:00:00 2001
From: guenther <guenther@openbsd.org>
Date: Fri, 2 Aug 2024 22:24:51 +0000
Subject: [PATCH] Code patch out the retpoline in the signal trampoline just
 like the others.

Nudged, test, and ok deraadt@
---
 sys/arch/amd64/amd64/locore.S | 6 ++++--
 1 file 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
-- 
2.20.1