668eaab0c7
* Fri Jul 22 2022 Arjun Shankar <arjun@redhat.com> - 2.34-40
- Sync with upstream branch release/2.34/master,
commit b2f32e746492615a6eb3e66fac1e766e32e8deb1:
- malloc: Simplify implementation of __malloc_assert
- Update syscall-names.list for Linux 5.18
- x86: Add missing IS_IN (libc) check to strncmp-sse4_2.S
- x86: Move mem{p}{mov|cpy}_{chk_}erms to its own file
- x86: Move and slightly improve memset_erms
- x86: Add definition for __wmemset_chk AVX2 RTM in ifunc impl list
- x86: Put wcs{n}len-sse4.1 in the sse4.1 text section
- x86: Align entry for memrchr to 64-bytes.
- x86: Add BMI1/BMI2 checks for ISA_V3 check
- x86: Cleanup bounds checking in large memcpy case
- x86: Add bounds `x86_non_temporal_threshold`
- x86: Add sse42 implementation to strcmp's ifunc
- x86: Fix misordered logic for setting `rep_movsb_stop_threshold`
- x86: Align varshift table to 32-bytes
- x86: ZERO_UPPER_VEC_REGISTERS_RETURN_XTEST expect no transactions
- x86: Shrink code size of memchr-evex.S
- x86: Shrink code size of memchr-avx2.S
- x86: Optimize memrchr-avx2.S
- x86: Optimize memrchr-evex.S
- x86: Optimize memrchr-sse2.S
- x86: Add COND_VZEROUPPER that can replace vzeroupper if no `ret`
- x86: Create header for VEC classes in x86 strings library
- x86_64: Add strstr function with 512-bit EVEX
- x86-64: Ignore r_addend for R_X86_64_GLOB_DAT/R_X86_64_JUMP_SLOT
- x86_64: Implement evex512 version of strlen, strnlen, wcslen and wcsnlen
- x86_64: Remove bzero optimization
- x86_64: Remove end of line trailing spaces
- nptl: Fix ___pthread_unregister_cancel_restore asynchronous restore
- linux: Fix mq_timereceive check for 32 bit fallback code (BZ 29304)
Resolves: #2109505
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
commit b2f32e746492615a6eb3e66fac1e766e32e8deb1
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Thu Jul 21 12:12:08 2022 +0200
|
|
|
|
malloc: Simplify implementation of __malloc_assert
|
|
|
|
It is prudent not to run too much code after detecting heap
|
|
corruption, and __fxprintf is really complex. The line number
|
|
and file name do not carry much information, so it is not included
|
|
in the error message. (__libc_message only supports %s formatting.)
|
|
The function name and assertion should provide some context.
|
|
|
|
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
|
|
(cherry picked from commit ac8047cdf326504f652f7db97ec96c0e0cee052f)
|
|
|
|
diff --git a/malloc/malloc.c b/malloc/malloc.c
|
|
index 7882c70f0a0312d1..d31e985ecce968fe 100644
|
|
--- a/malloc/malloc.c
|
|
+++ b/malloc/malloc.c
|
|
@@ -294,19 +294,14 @@
|
|
# define __assert_fail(assertion, file, line, function) \
|
|
__malloc_assert(assertion, file, line, function)
|
|
|
|
-extern const char *__progname;
|
|
-
|
|
-static void
|
|
+_Noreturn static void
|
|
__malloc_assert (const char *assertion, const char *file, unsigned int line,
|
|
const char *function)
|
|
{
|
|
- (void) __fxprintf (NULL, "%s%s%s:%u: %s%sAssertion `%s' failed.\n",
|
|
- __progname, __progname[0] ? ": " : "",
|
|
- file, line,
|
|
- function ? function : "", function ? ": " : "",
|
|
- assertion);
|
|
- fflush (stderr);
|
|
- abort ();
|
|
+ __libc_message (do_abort, "\
|
|
+Fatal glibc error: malloc assertion failure in %s: %s\n",
|
|
+ function, assertion);
|
|
+ __builtin_unreachable ();
|
|
}
|
|
#endif
|
|
#endif
|