diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2023-04-17 00:15:00 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2023-04-17 00:15:00 +0000 |
| commit | 2ace2159461cceebfecb94e2807f286ec4966753 (patch) | |
| tree | d94269d32eab5044dc020577d2c6e917e320159d | |
| parent | 20343fab5005353b0511d6d1ce0803203086a5bb (diff) | |
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
| -rw-r--r-- | sys/arch/amd64/amd64/locore.S | 3 |
1 files changed, 2 insertions, 1 deletions
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 */ |