diff options
| author | Frederic Berat <fberat@redhat.com> | 2023-06-20 20:18:52 +0200 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2023-06-22 00:20:52 -0400 |
| commit | 1bc85effd549ae42318b37555a4c76ebc479b92a (patch) | |
| tree | ea5d6187c3303b03b2cfb5ed67cafc656f360c5c | |
| parent | 9e6863a537e66e01f5819dc356c5405a2bc67dc7 (diff) | |
| download | glibc-1bc85effd549ae42318b37555a4c76ebc479b92a.tar.gz glibc-1bc85effd549ae42318b37555a4c76ebc479b92a.tar.xz glibc-1bc85effd549ae42318b37555a4c76ebc479b92a.zip | |
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 <siddhesh@sourceware.org>
| -rw-r--r-- | sysdeps/i386/mempcpy_chk.S | 2 | ||||
| -rw-r--r-- | sysdeps/x86_64/mempcpy_chk.S | 2 |
2 files changed, 2 insertions, 2 deletions
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 |