From: Frederic Berat Date: Tue, 20 Jun 2023 18:18:52 +0000 (+0200) Subject: sysdeps/{i386, x86_64}/mempcpy_chk.S: fix linknamespace for __mempcpy_chk X-Git-Tag: glibc-2.38~119 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=1bc85effd549ae42318b37555a4c76ebc479b92a;p=glibc.git sysdeps/{i386, x86_64}/mempcpy_chk.S: fix linknamespace for __mempcpy_chk On i386 and x86_64, for libc.a specifically, __mempcpy_chk calls mempcpy which leads POSIX routines to call non-POSIX mempcpy indirectly. This leads the linknamespace test to fail when glibc is built with __FORTIFY_SOURCE=3. Since calling mempcpy doesn't bring any benefit for libc.a, directly call __mempcpy instead. Reviewed-by: Siddhesh Poyarekar --- diff --git a/sysdeps/i386/mempcpy_chk.S b/sysdeps/i386/mempcpy_chk.S index 8b785bd9a5..1e9bf71bfb 100644 --- a/sysdeps/i386/mempcpy_chk.S +++ b/sysdeps/i386/mempcpy_chk.S @@ -28,6 +28,6 @@ ENTRY (__mempcpy_chk) movl 12(%esp), %eax cmpl %eax, 16(%esp) jb __chk_fail - jmp mempcpy + jmp __mempcpy END (__mempcpy_chk) #endif diff --git a/sysdeps/x86_64/mempcpy_chk.S b/sysdeps/x86_64/mempcpy_chk.S index b1ddb02f78..b60ee4ff08 100644 --- a/sysdeps/x86_64/mempcpy_chk.S +++ b/sysdeps/x86_64/mempcpy_chk.S @@ -28,6 +28,6 @@ ENTRY (__mempcpy_chk) cmpq %rdx, %rcx jb __chk_fail - jmp mempcpy + jmp __mempcpy END (__mempcpy_chk) #endif