From: guenther <guenther@openbsd.org>
Date: Thu, 18 May 2023 16:14:05 +0000 (+0000)
Subject: memmove() entry point is declared with NENTRY() and isn't consecutive
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=eb1d3726c94ac148087f9f8314645e5aad9d2a88;p=openbsd

memmove() entry point is declared with NENTRY() and isn't consecutive
with an ENTRY(), so it needs its own endbr64 for IBT

ok deraadt@
---

diff --git a/lib/libc/arch/amd64/string/memmove.S b/lib/libc/arch/amd64/string/memmove.S
index 67f2e41e7b8..2d73e60e8d5 100644
--- a/lib/libc/arch/amd64/string/memmove.S
+++ b/lib/libc/arch/amd64/string/memmove.S
@@ -45,6 +45,7 @@ ENTRY_NB(bcopy)
 	/* fall into memmove */
 
 NENTRY(memmove)
+	endbr64
 	RETGUARD_SETUP(memmove, r10)
 	movq	%rdi,%r11	/* save dest */
 	movq	%rdx,%rcx