x86: Add _CET_ENDBR to functions in crti.S

Add _CET_ENDBR to functions in crti.S, which are called indirectly, to
support IBT.

Tested on i686 and x86-64.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
	* sysdeps/i386/crti.S (_init): Add _CET_ENDBR.
	(_fini): Likewise.
	* sysdeps/x86_64/crti.S (_init): Likewise.
	(_fini): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 694d10f0840234b6623a33cd291449d645ab73af..59ed8bfa525d28b6659c559771a9f9b961cc5bc1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-07-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * sysdeps/i386/crti.S (_init): Add _CET_ENDBR.
+       (_fini): Likewise.
+       * sysdeps/x86_64/crti.S (_init): Likewise.
+       (_fini): Likewise.
+
 2018-07-17  Rafal Luzynski  <digitalfreak@lingonborough.com>
 
        [BZ #23140]

diff --git a/sysdeps/i386/crti.S b/sysdeps/i386/crti.S
index ffbc92c22f288d3d5667b6404ac0b788aac9ed96..65ddc1c934b2b30bee78155493f97b25fb56d022 100644 (file)
--- a/sysdeps/i386/crti.S
+++ b/sysdeps/i386/crti.S
@@ -61,6 +61,7 @@
        .hidden _init
        .type _init, @function
 _init:
+       _CET_ENDBR
        pushl %ebx
        /* Maintain 16-byte stack alignment for called functions.  */
        subl $8, %esp
@@ -81,6 +82,7 @@ _init:
        .hidden _fini
        .type _fini, @function
 _fini:
+       _CET_ENDBR
        pushl %ebx
        subl $8, %esp
        LOAD_PIC_REG (bx)

diff --git a/sysdeps/x86_64/crti.S b/sysdeps/x86_64/crti.S
index f26915e95605e7492bb9dbb346b0362995461e22..067ac148843f12972935b59b3232142ba797d6d5 100644 (file)
--- a/sysdeps/x86_64/crti.S
+++ b/sysdeps/x86_64/crti.S
@@ -61,6 +61,7 @@
        .hidden _init
        .type _init, @function
 _init:
+       _CET_ENDBR
        /* Maintain 16-byte stack alignment for called functions.  */
        subq $8, %rsp
 #if PREINIT_FUNCTION_WEAK
@@ -79,4 +80,5 @@ _init:
        .hidden _fini
        .type _fini, @function
 _fini:
+       _CET_ENDBR
        subq $8, %rsp