From bf39093a75df8b229ee5666cd0683c2926b41012 Mon Sep 17 00:00:00 2001 From: guenther Date: Mon, 22 May 2023 00:37:19 +0000 Subject: [PATCH] NENTRY() doesn't provide an endbr64, so give memmove one in case it ever gets called through a function pointer (with retpoline disabled) ok deraadt@ --- sys/lib/libkern/arch/amd64/memmove.S | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/lib/libkern/arch/amd64/memmove.S b/sys/lib/libkern/arch/amd64/memmove.S index e10113a3745..6c49b21dd79 100644 --- a/sys/lib/libkern/arch/amd64/memmove.S +++ b/sys/lib/libkern/arch/amd64/memmove.S @@ -45,6 +45,7 @@ ENTRY(bcopy) /* fall into memmove */ NENTRY(memmove) + endbr64 RETGUARD_SETUP(memmove, r10) movq %rdi,%r11 /* save dest */ movq %rdx,%rcx -- 2.20.1