From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 0AF823858D37; Tue, 4 Oct 2022 13:00:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0AF823858D37 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1664888422; bh=N8IxNl+rlvk9ZtYHqld610zHFI23av4FtGNPnqw0E4I=; h=From:To:Subject:Date:From; b=F+olKfzKBp8Qk1hR3lTdqndfKE0fZltndrNbUzZGAq/1GX6F61LhUrXelsMD+BjGp jMduYWf+MebzleQD1oL8QS0bYt6Mb1SLANrKBnACRnF0xYt6iZI2vp3+qIBINNJJeI vZS/1qa+p0j07m2YBfFgfv9W6lvdWUmNim6KOlQU= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] x86: Add inhibit_stack_protector on ifunc handlers X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: 49e63cc8fda5a67ccf6eca14d45911830bb11cea X-Git-Newrev: 86128c82e479925b7e80d9934cdd20821eb23d3d Message-Id: <20221004130022.0AF823858D37@sourceware.org> Date: Tue, 4 Oct 2022 13:00:22 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=86128c82e479925b7e80d9934cdd20821eb23d3d commit 86128c82e479925b7e80d9934cdd20821eb23d3d Author: Adhemerval Zanella Date: Thu Aug 4 09:41:29 2022 -0300 x86: Add inhibit_stack_protector on ifunc handlers Diff: --- sysdeps/i386/i686/multiarch/ifunc-memset.h | 1 + sysdeps/i386/i686/multiarch/ifunc-sse2-bsf.h | 1 + sysdeps/i386/i686/multiarch/ifunc-sse2-ssse3.h | 1 + sysdeps/i386/i686/multiarch/ifunc-sse2.h | 1 + sysdeps/i386/i686/multiarch/ifunc-sse4_2.h | 1 + sysdeps/i386/i686/multiarch/ifunc-ssse3-sse4_2.h | 1 + sysdeps/x86_64/fpu/multiarch/ifunc-avx-fma4.h | 1 + sysdeps/x86_64/fpu/multiarch/ifunc-fma.h | 1 + sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h | 1 + sysdeps/x86_64/fpu/multiarch/ifunc-sse4_1.h | 1 + sysdeps/x86_64/multiarch/ifunc-avx2.h | 1 + sysdeps/x86_64/multiarch/ifunc-evex.h | 1 + sysdeps/x86_64/multiarch/ifunc-memcmp.h | 1 + sysdeps/x86_64/multiarch/ifunc-memmove.h | 1 + sysdeps/x86_64/multiarch/ifunc-memset.h | 1 + sysdeps/x86_64/multiarch/ifunc-sse4_2.h | 1 + sysdeps/x86_64/multiarch/ifunc-strcasecmp.h | 1 + sysdeps/x86_64/multiarch/ifunc-strcpy.h | 1 + sysdeps/x86_64/multiarch/ifunc-strncpy.h | 1 + sysdeps/x86_64/multiarch/ifunc-wcslen.h | 1 + sysdeps/x86_64/multiarch/ifunc-wmemset.h | 1 + sysdeps/x86_64/multiarch/strchr.c | 1 + sysdeps/x86_64/multiarch/strcmp.c | 1 + sysdeps/x86_64/multiarch/strncmp.c | 1 + sysdeps/x86_64/multiarch/strstr.c | 1 + sysdeps/x86_64/multiarch/wcscpy.c | 1 + 26 files changed, 26 insertions(+) diff --git a/sysdeps/i386/i686/multiarch/ifunc-memset.h b/sysdeps/i386/i686/multiarch/ifunc-memset.h index 9dca987cab..a9756b37b2 100644 --- a/sysdeps/i386/i686/multiarch/ifunc-memset.h +++ b/sysdeps/i386/i686/multiarch/ifunc-memset.h @@ -24,6 +24,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2) attribute_hidden; extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2_rep) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features* cpu_features = __get_cpu_features (); diff --git a/sysdeps/i386/i686/multiarch/ifunc-sse2-bsf.h b/sysdeps/i386/i686/multiarch/ifunc-sse2-bsf.h index 912f90fddd..6340c77ea1 100644 --- a/sysdeps/i386/i686/multiarch/ifunc-sse2-bsf.h +++ b/sysdeps/i386/i686/multiarch/ifunc-sse2-bsf.h @@ -24,6 +24,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2) attribute_hidden; extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2_bsf) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features* cpu_features = __get_cpu_features (); diff --git a/sysdeps/i386/i686/multiarch/ifunc-sse2-ssse3.h b/sysdeps/i386/i686/multiarch/ifunc-sse2-ssse3.h index ea1ad57a33..e7b58a1836 100644 --- a/sysdeps/i386/i686/multiarch/ifunc-sse2-ssse3.h +++ b/sysdeps/i386/i686/multiarch/ifunc-sse2-ssse3.h @@ -25,6 +25,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2) attribute_hidden; extern __typeof (REDIRECT_NAME) OPTIMIZE (ssse3) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features* cpu_features = __get_cpu_features (); diff --git a/sysdeps/i386/i686/multiarch/ifunc-sse2.h b/sysdeps/i386/i686/multiarch/ifunc-sse2.h index b6f70e920a..e2316a8655 100644 --- a/sysdeps/i386/i686/multiarch/ifunc-sse2.h +++ b/sysdeps/i386/i686/multiarch/ifunc-sse2.h @@ -23,6 +23,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (ia32) attribute_hidden; extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features* cpu_features = __get_cpu_features (); diff --git a/sysdeps/i386/i686/multiarch/ifunc-sse4_2.h b/sysdeps/i386/i686/multiarch/ifunc-sse4_2.h index 41eadf7953..23822a1078 100644 --- a/sysdeps/i386/i686/multiarch/ifunc-sse4_2.h +++ b/sysdeps/i386/i686/multiarch/ifunc-sse4_2.h @@ -23,6 +23,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (ia32) attribute_hidden; extern __typeof (REDIRECT_NAME) OPTIMIZE (sse42) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features* cpu_features = __get_cpu_features (); diff --git a/sysdeps/i386/i686/multiarch/ifunc-ssse3-sse4_2.h b/sysdeps/i386/i686/multiarch/ifunc-ssse3-sse4_2.h index 6b95cd7947..d38d004d1d 100644 --- a/sysdeps/i386/i686/multiarch/ifunc-ssse3-sse4_2.h +++ b/sysdeps/i386/i686/multiarch/ifunc-ssse3-sse4_2.h @@ -25,6 +25,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (ssse3) attribute_hidden; extern __typeof (REDIRECT_NAME) OPTIMIZE (sse4_2) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features* cpu_features = __get_cpu_features (); diff --git a/sysdeps/x86_64/fpu/multiarch/ifunc-avx-fma4.h b/sysdeps/x86_64/fpu/multiarch/ifunc-avx-fma4.h index 9eb1e56afa..6d13f7b466 100644 --- a/sysdeps/x86_64/fpu/multiarch/ifunc-avx-fma4.h +++ b/sysdeps/x86_64/fpu/multiarch/ifunc-avx-fma4.h @@ -25,6 +25,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (fma) attribute_hidden; extern __typeof (REDIRECT_NAME) OPTIMIZE (fma4) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features* cpu_features = __get_cpu_features (); diff --git a/sysdeps/x86_64/fpu/multiarch/ifunc-fma.h b/sysdeps/x86_64/fpu/multiarch/ifunc-fma.h index 24254c520b..2bc26e38f7 100644 --- a/sysdeps/x86_64/fpu/multiarch/ifunc-fma.h +++ b/sysdeps/x86_64/fpu/multiarch/ifunc-fma.h @@ -22,6 +22,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2) attribute_hidden; extern __typeof (REDIRECT_NAME) OPTIMIZE (fma) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features* cpu_features = __get_cpu_features (); diff --git a/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h b/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h index 93be985429..e5bf987962 100644 --- a/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h +++ b/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h @@ -24,6 +24,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (fma) attribute_hidden; extern __typeof (REDIRECT_NAME) OPTIMIZE (fma4) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features* cpu_features = __get_cpu_features (); diff --git a/sysdeps/x86_64/fpu/multiarch/ifunc-sse4_1.h b/sysdeps/x86_64/fpu/multiarch/ifunc-sse4_1.h index aafda9d219..1c309f850f 100644 --- a/sysdeps/x86_64/fpu/multiarch/ifunc-sse4_1.h +++ b/sysdeps/x86_64/fpu/multiarch/ifunc-sse4_1.h @@ -22,6 +22,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (c) attribute_hidden; extern __typeof (REDIRECT_NAME) OPTIMIZE (sse41) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features* cpu_features = __get_cpu_features (); diff --git a/sysdeps/x86_64/multiarch/ifunc-avx2.h b/sysdeps/x86_64/multiarch/ifunc-avx2.h index a57a9952f3..deb4949659 100644 --- a/sysdeps/x86_64/multiarch/ifunc-avx2.h +++ b/sysdeps/x86_64/multiarch/ifunc-avx2.h @@ -31,6 +31,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (avx2_rtm) attribute_hidden; extern __typeof (REDIRECT_NAME) OPTIMIZE (GENERIC) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features *cpu_features = __get_cpu_features (); diff --git a/sysdeps/x86_64/multiarch/ifunc-evex.h b/sysdeps/x86_64/multiarch/ifunc-evex.h index 310cfd269f..1583abb0e8 100644 --- a/sysdeps/x86_64/multiarch/ifunc-evex.h +++ b/sysdeps/x86_64/multiarch/ifunc-evex.h @@ -28,6 +28,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (avx2_rtm) attribute_hidden; extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features *cpu_features = __get_cpu_features (); diff --git a/sysdeps/x86_64/multiarch/ifunc-memcmp.h b/sysdeps/x86_64/multiarch/ifunc-memcmp.h index 27a1459413..ee93eaa9c5 100644 --- a/sysdeps/x86_64/multiarch/ifunc-memcmp.h +++ b/sysdeps/x86_64/multiarch/ifunc-memcmp.h @@ -27,6 +27,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (avx2_movbe_rtm) attribute_hidden; extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features *cpu_features = __get_cpu_features (); diff --git a/sysdeps/x86_64/multiarch/ifunc-memmove.h b/sysdeps/x86_64/multiarch/ifunc-memmove.h index 1643d32887..7f5f2eef4c 100644 --- a/sysdeps/x86_64/multiarch/ifunc-memmove.h +++ b/sysdeps/x86_64/multiarch/ifunc-memmove.h @@ -49,6 +49,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2_unaligned_erms) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features *cpu_features = __get_cpu_features (); diff --git a/sysdeps/x86_64/multiarch/ifunc-memset.h b/sysdeps/x86_64/multiarch/ifunc-memset.h index ed514976aa..9edb61f6af 100644 --- a/sysdeps/x86_64/multiarch/ifunc-memset.h +++ b/sysdeps/x86_64/multiarch/ifunc-memset.h @@ -47,6 +47,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2_unaligned_erms) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features *cpu_features = __get_cpu_features (); diff --git a/sysdeps/x86_64/multiarch/ifunc-sse4_2.h b/sysdeps/x86_64/multiarch/ifunc-sse4_2.h index 9a819ee1d2..8411cfa20d 100644 --- a/sysdeps/x86_64/multiarch/ifunc-sse4_2.h +++ b/sysdeps/x86_64/multiarch/ifunc-sse4_2.h @@ -23,6 +23,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (generic) attribute_hidden; extern __typeof (REDIRECT_NAME) OPTIMIZE (sse42) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features* cpu_features = __get_cpu_features (); diff --git a/sysdeps/x86_64/multiarch/ifunc-strcasecmp.h b/sysdeps/x86_64/multiarch/ifunc-strcasecmp.h index 68646ef199..4926b3fd68 100644 --- a/sysdeps/x86_64/multiarch/ifunc-strcasecmp.h +++ b/sysdeps/x86_64/multiarch/ifunc-strcasecmp.h @@ -29,6 +29,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (sse42) attribute_hidden; extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features *cpu_features = __get_cpu_features (); diff --git a/sysdeps/x86_64/multiarch/ifunc-strcpy.h b/sysdeps/x86_64/multiarch/ifunc-strcpy.h index e083f71df3..6154506c69 100644 --- a/sysdeps/x86_64/multiarch/ifunc-strcpy.h +++ b/sysdeps/x86_64/multiarch/ifunc-strcpy.h @@ -31,6 +31,7 @@ extern __typeof (REDIRECT_NAME) extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features *cpu_features = __get_cpu_features (); diff --git a/sysdeps/x86_64/multiarch/ifunc-strncpy.h b/sysdeps/x86_64/multiarch/ifunc-strncpy.h index 5c1c46b885..0141d6c188 100644 --- a/sysdeps/x86_64/multiarch/ifunc-strncpy.h +++ b/sysdeps/x86_64/multiarch/ifunc-strncpy.h @@ -28,6 +28,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2_unaligned) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features *cpu_features = __get_cpu_features (); diff --git a/sysdeps/x86_64/multiarch/ifunc-wcslen.h b/sysdeps/x86_64/multiarch/ifunc-wcslen.h index 064722c2bd..1ed29a5459 100644 --- a/sysdeps/x86_64/multiarch/ifunc-wcslen.h +++ b/sysdeps/x86_64/multiarch/ifunc-wcslen.h @@ -33,6 +33,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (sse4_1) attribute_hidden; extern __typeof (REDIRECT_NAME) OPTIMIZE (GENERIC) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features *cpu_features = __get_cpu_features (); diff --git a/sysdeps/x86_64/multiarch/ifunc-wmemset.h b/sysdeps/x86_64/multiarch/ifunc-wmemset.h index 3810c719c6..779d86005a 100644 --- a/sysdeps/x86_64/multiarch/ifunc-wmemset.h +++ b/sysdeps/x86_64/multiarch/ifunc-wmemset.h @@ -29,6 +29,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (avx2_unaligned_rtm) extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2_unaligned) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features *cpu_features = __get_cpu_features (); diff --git a/sysdeps/x86_64/multiarch/strchr.c b/sysdeps/x86_64/multiarch/strchr.c index ce7441c532..177800ac5b 100644 --- a/sysdeps/x86_64/multiarch/strchr.c +++ b/sysdeps/x86_64/multiarch/strchr.c @@ -35,6 +35,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2) attribute_hidden; extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2_no_bsf) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features *cpu_features = __get_cpu_features (); diff --git a/sysdeps/x86_64/multiarch/strcmp.c b/sysdeps/x86_64/multiarch/strcmp.c index fdd5afe3af..a894dd4b96 100644 --- a/sysdeps/x86_64/multiarch/strcmp.c +++ b/sysdeps/x86_64/multiarch/strcmp.c @@ -40,6 +40,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features *cpu_features = __get_cpu_features (); diff --git a/sysdeps/x86_64/multiarch/strncmp.c b/sysdeps/x86_64/multiarch/strncmp.c index 4ebe4bde30..89a701be2a 100644 --- a/sysdeps/x86_64/multiarch/strncmp.c +++ b/sysdeps/x86_64/multiarch/strncmp.c @@ -36,6 +36,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (sse42) attribute_hidden; extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features *cpu_features = __get_cpu_features (); diff --git a/sysdeps/x86_64/multiarch/strstr.c b/sysdeps/x86_64/multiarch/strstr.c index 78fad019b2..a6a64a64b4 100644 --- a/sysdeps/x86_64/multiarch/strstr.c +++ b/sysdeps/x86_64/multiarch/strstr.c @@ -43,6 +43,7 @@ extern __typeof (__redirect_strstr) __strstr_avx512 attribute_hidden; extern __typeof (__redirect_strstr) __libc_strstr; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features *cpu_features = __get_cpu_features (); diff --git a/sysdeps/x86_64/multiarch/wcscpy.c b/sysdeps/x86_64/multiarch/wcscpy.c index 92c917b6b4..5f072ee603 100644 --- a/sysdeps/x86_64/multiarch/wcscpy.c +++ b/sysdeps/x86_64/multiarch/wcscpy.c @@ -31,6 +31,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (ssse3) attribute_hidden; extern __typeof (REDIRECT_NAME) OPTIMIZE (generic) attribute_hidden; static inline void * +inhibit_stack_protector IFUNC_SELECTOR (void) { const struct cpu_features* cpu_features = __get_cpu_features ();