94eca17094
Upstream commit: ede8d94d154157d269b18f3601440ac576c1f96a
- csu: Implement and use _dl_early_allocate during static startup
- Linux: Introduce __brk_call for invoking the brk system call
- Linux: Implement a useful version of _startup_fatal
- ia64: Always define IA64_USE_NEW_STUB as a flag macro
- Linux: Define MMAP_CALL_INTERNAL
- i386: Honor I386_USE_SYSENTER for 6-argument Linux system calls
- i386: Remove OPTIMIZE_FOR_GCC_5 from Linux libc-do-syscall.S
- elf: Remove __libc_init_secure
- Linux: Consolidate auxiliary vector parsing (redo)
- Linux: Include <dl-auxv.h> in dl-sysdep.c only for SHARED
- Revert "Linux: Consolidate auxiliary vector parsing"
- Linux: Consolidate auxiliary vector parsing
- Linux: Assume that NEED_DL_SYSINFO_DSO is always defined
- Linux: Remove DL_FIND_ARG_COMPONENTS
- Linux: Remove HAVE_AUX_SECURE, HAVE_AUX_XID, HAVE_AUX_PAGESIZE
- elf: Merge dl-sysdep.c into the Linux version
- elf: Remove unused NEED_DL_BASE_ADDR and _dl_base_addr
- x86: Optimize {str|wcs}rchr-evex
- x86: Optimize {str|wcs}rchr-avx2
- x86: Optimize {str|wcs}rchr-sse2
- x86: Cleanup page cross code in memcmp-avx2-movbe.S
- x86: Remove memcmp-sse4.S
- x86: Small improvements for wcslen
- x86: Remove AVX str{n}casecmp
- x86: Add EVEX optimized str{n}casecmp
- x86: Add AVX2 optimized str{n}casecmp
- x86: Optimize str{n}casecmp TOLOWER logic in strcmp-sse42.S
- x86: Optimize str{n}casecmp TOLOWER logic in strcmp.S
- x86: Remove strspn-sse2.S and use the generic implementation
- x86: Remove strpbrk-sse2.S and use the generic implementation
- x86: Remove strcspn-sse2.S and use the generic implementation
- x86: Optimize strspn in strspn-c.c
- x86: Optimize strcspn and strpbrk in strcspn-c.c
- x86: Code cleanup in strchr-evex and comment justifying branch
- x86: Code cleanup in strchr-avx2 and comment justifying branch
- x86_64: Remove bcopy optimizations
- x86-64: Remove bzero weak alias in SS2 memset
- x86_64/multiarch: Sort sysdep_routines and put one entry per line
- x86: Improve L to support L(XXX_SYMBOL (YYY, ZZZ))
- fortify: Ensure that __glibc_fortify condition is a constant [BZ #29141]
32 lines
1.5 KiB
Diff
32 lines
1.5 KiB
Diff
commit b72bbba23687ed67887d1d18c51cce5cc9c575ca
|
|
Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
|
|
Date: Fri May 13 10:01:47 2022 +0530
|
|
|
|
fortify: Ensure that __glibc_fortify condition is a constant [BZ #29141]
|
|
|
|
The fix c8ee1c85 introduced a -1 check for object size without also
|
|
checking that object size is a constant. Because of this, the tree
|
|
optimizer passes in gcc fail to fold away one of the branches in
|
|
__glibc_fortify and trips on a spurious Wstringop-overflow. The warning
|
|
itself is incorrect and the branch does go away eventually in DCE in the
|
|
rtl passes in gcc, but the constant check is a helpful hint to simplify
|
|
code early, so add it in.
|
|
|
|
Resolves: BZ #29141
|
|
Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
|
|
(cherry picked from commit 61a87530108ec9181e1b18a9b727ec3cc3ba7532)
|
|
|
|
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
|
|
index b36013b9a6b4d9c3..e0ecd9147ee3ce48 100644
|
|
--- a/misc/sys/cdefs.h
|
|
+++ b/misc/sys/cdefs.h
|
|
@@ -163,7 +163,7 @@
|
|
/* Length is known to be safe at compile time if the __L * __S <= __OBJSZ
|
|
condition can be folded to a constant and if it is true, or unknown (-1) */
|
|
#define __glibc_safe_or_unknown_len(__l, __s, __osz) \
|
|
- ((__osz) == (__SIZE_TYPE__) -1 \
|
|
+ ((__builtin_constant_p (__osz) && (__osz) == (__SIZE_TYPE__) -1) \
|
|
|| (__glibc_unsigned_or_positive (__l) \
|
|
&& __builtin_constant_p (__glibc_safe_len_cond ((__SIZE_TYPE__) (__l), \
|
|
(__s), (__osz))) \
|