From 339eb9d2beb7531aa8f4faaff8e0cf2f21c7f7f7 Mon Sep 17 00:00:00 2001 From: deraadt Date: Mon, 17 Apr 2023 00:14:59 +0000 Subject: [PATCH] For future userland IBT, the sigcode needs to start with a endbr64. This is simpler than clearing the cet_u bits in the kernel. ok guenther, kettenis --- sys/arch/amd64/amd64/locore.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/arch/amd64/amd64/locore.S b/sys/arch/amd64/amd64/locore.S index cbdaccb65fe..677c816d6f9 100644 --- a/sys/arch/amd64/amd64/locore.S +++ b/sys/arch/amd64/amd64/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.133 2023/04/17 00:03:59 deraadt Exp $ */ +/* $OpenBSD: locore.S,v 1.134 2023/04/17 00:14:59 deraadt Exp $ */ /* $NetBSD: locore.S,v 1.13 2004/03/25 18:33:17 drochner Exp $ */ /* @@ -171,6 +171,7 @@ lapic_isr: .section .rodata .globl sigcode sigcode: + endbr64 call 1f movq %rsp,%rdi pushq %rdi /* fake return address */ -- 2.20.1