Blame SOURCES/0001-annocheck-warning-about-missing-.note.gnu.property-s.patch

b9398b
From 6de192ad5ffe9ec04328bfd178050cb8a33e1cbb Mon Sep 17 00:00:00 2001
b9398b
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
b9398b
Date: Wed, 15 Dec 2021 12:46:24 +0000
b9398b
Subject: [PATCH] annocheck warning about missing .note.gnu.property section
b9398b
MIME-Version: 1.0
b9398b
Content-Type: text/plain; charset=UTF-8
b9398b
Content-Transfer-Encoding: 8bit
b9398b
b9398b
copy and paste recommendation from:
b9398b
https://sourceware.org/annobin/annobin.html/Test-cf-protection.html
b9398b
b9398b
and adapt like:
b9398b
https://github.com/openssl/openssl/commit/51994e505dbb1cd0dd76869ec962e2948b77b585
b9398b
where https://bugs.ruby-lang.org/attachments/8962 is similar
b9398b
b9398b
Intel docs have "The ENDBR32 and ENDBR64 (collectively ENDBRANCH) are
b9398b
two new instructions that are used to mark valid indirect CALL/JMP
b9398b
target locations in the program."
b9398b
b9398b
Change-Id: Ie867c263a888763db4478720ba189c9ec6cc974d
b9398b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126859
b9398b
Tested-by: Jenkins
b9398b
Tested-by: Caolán McNamara <caolanm@redhat.com>
b9398b
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
b9398b
(cherry picked from commit af55dc3891f7950d392175004b2090cb0e54828e)
b9398b
---
b9398b
 .../source/cpp_uno/gcc3_linux_intel/call.s    | 16 ++++++++++++++++
b9398b
 .../source/cpp_uno/gcc3_linux_x86-64/call.s   | 19 +++++++++++++++++++
b9398b
 config_host.mk.in                             |  1 +
b9398b
 configure.ac                                  | 14 ++++++++++++++
b9398b
 solenv/gbuild/platform/com_GCC_class.mk       |  1 +
b9398b
 5 files changed, 51 insertions(+)
b9398b
b9398b
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/call.s b/bridges/source/cpp_uno/gcc3_linux_intel/call.s
b9398b
index 6be583247733..0a5870defcf3 100644
b9398b
--- a/bridges/source/cpp_uno/gcc3_linux_intel/call.s
b9398b
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/call.s
b9398b
@@ -290,3 +290,19 @@ privateSnippetExecutorClass:
b9398b
     .align 4
b9398b
 .LEFDEc:
b9398b
     .section .note.GNU-stack,"",@progbits
b9398b
+    .section .note.gnu.property,"a"
b9398b
+    .p2align 2
b9398b
+    .long     1f - 0f
b9398b
+    .long     4f - 1f
b9398b
+    .long     5
b9398b
+0:
b9398b
+    .string     "GNU"
b9398b
+1:
b9398b
+    .p2align 2
b9398b
+    .long     0xc0000002
b9398b
+    .long     3f - 2f
b9398b
+2:
b9398b
+    .long     0x3
b9398b
+3:
b9398b
+    .p2align 2
b9398b
+4:
b9398b
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/call.s b/bridges/source/cpp_uno/gcc3_linux_x86-64/call.s
b9398b
index 447ac0cecfdd..2e9346dff8a0 100644
b9398b
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/call.s
b9398b
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/call.s
b9398b
@@ -22,6 +22,9 @@
b9398b
 	.type	privateSnippetExecutor, @function
b9398b
 privateSnippetExecutor:
b9398b
 .LFB3:
b9398b
+#if defined(END_BRANCH_INS_SUPPORT)
b9398b
+	endbr64
b9398b
+#endif
b9398b
 	pushq	%rbp
b9398b
 .LCFI0:
b9398b
 	movq	%rsp, %rbp
b9398b
@@ -115,3 +118,19 @@ privateSnippetExecutor:
b9398b
 	.align 8
b9398b
 .LEFDE1:
b9398b
 	.section	.note.GNU-stack,"",@progbits
b9398b
+	.section	.note.gnu.property,"a"
b9398b
+	.p2align 3
b9398b
+	.long	 1f - 0f
b9398b
+	.long	 4f - 1f
b9398b
+	.long	 5
b9398b
+0:
b9398b
+	.string	 "GNU"
b9398b
+1:
b9398b
+	.p2align 3
b9398b
+	.long	 0xc0000002
b9398b
+	.long	 3f - 2f
b9398b
+2:
b9398b
+	.long	 0x3
b9398b
+3:
b9398b
+	.p2align 3
b9398b
+4:
b9398b
diff --git a/config_host.mk.in b/config_host.mk.in
b9398b
index d6edba704b21..6ac2a90695e2 100644
b9398b
--- a/config_host.mk.in
b9398b
+++ b/config_host.mk.in
b9398b
@@ -260,6 +260,7 @@ export GTK3_CFLAGS=$(gb_SPACE)@GTK3_CFLAGS@
b9398b
 export GTK3_LIBS=$(gb_SPACE)@GTK3_LIBS@
b9398b
 export USING_X11=@USING_X11@
b9398b
 export HAMCREST_JAR=@HAMCREST_JAR@
b9398b
+export HAVE_ASM_END_BRANCH_INS_SUPPORT=@HAVE_ASM_END_BRANCH_INS_SUPPORT@
b9398b
 export HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED=@HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED@
b9398b
 export HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR=@HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR@
b9398b
 export HAVE_LO_CLANG_DLLEXPORTINLINES=@HAVE_LO_CLANG_DLLEXPORTINLINES@
b9398b
diff --git a/configure.ac b/configure.ac
b9398b
index bd28bc6eb38e..ef03408e8e98 100644
b9398b
--- a/configure.ac
b9398b
+++ b/configure.ac
b9398b
@@ -7730,6 +7730,20 @@ _ACEOF
b9398b
 
b9398b
     CPPFLAGS="$save_CPPFLAGS"
b9398b
 
b9398b
+    AC_MSG_CHECKING([if CET endbranch is recognized])
b9398b
+cat > endbr.s <<_ACEOF
b9398b
+endbr32
b9398b
+_ACEOF
b9398b
+    HAVE_ASM_END_BRANCH_INS_SUPPORT=
b9398b
+    if $CXX -c endbr.s -o endbr.o >/dev/null 2>&5; then
b9398b
+        AC_MSG_RESULT([yes])
b9398b
+        HAVE_ASM_END_BRANCH_INS_SUPPORT=TRUE
b9398b
+    else
b9398b
+        AC_MSG_RESULT([no])
b9398b
+    fi
b9398b
+    rm -f endbr.s endbr.o
b9398b
+    AC_SUBST(HAVE_ASM_END_BRANCH_INS_SUPPORT)
b9398b
+
b9398b
     AC_LANG_POP([C++])
b9398b
 fi
b9398b
 
b9398b
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk
b9398b
index c29e2a979fd9..e2056abf9682 100644
b9398b
--- a/solenv/gbuild/platform/com_GCC_class.mk
b9398b
+++ b/solenv/gbuild/platform/com_GCC_class.mk
b9398b
@@ -44,6 +44,7 @@ $(call gb_Helper_abbreviate_dirs,\
b9398b
 		-x assembler-with-cpp \
b9398b
 		$(gb_LTOFLAGS) \
b9398b
 		$(gb_AFLAGS) \
b9398b
+		$(if $(HAVE_ASM_END_BRANCH_INS_SUPPORT),-DEND_BRANCH_INS_SUPPORT) \
b9398b
 		-c $(3) \
b9398b
 		-o $(1)) \
b9398b
 		$(INCLUDE) && \
b9398b
-- 
b9398b
2.33.1
b9398b