From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2206) id 77A893858D28; Thu, 22 Jun 2023 04:53:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 77A893858D28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1687409611; bh=Mz9qzuC6hkNbVcdd9L9dyHn7BaTjcbsqO2HucmYPQrs=; h=From:To:Subject:Date:From; b=i6mXxY25Yx6mzG5WCfbOT2L71pqK//n07MneAbAIKJNW+Dqik+r46jQG2HSE5epf3 bkBEQpvW6XT8eILKKttunK97/MBBTbLtzlCiF77CIZt6IllAxDkg7ocFLqirXMSF50 RJrBrQm5aiLfLsz6DBr0ZM8r0z6+UGJC4Flc2fas= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Siddhesh Poyarekar To: glibc-cvs@sourceware.org Subject: [glibc] sysdeps/{i386, x86_64}/mempcpy_chk.S: fix linknamespace for __mempcpy_chk X-Act-Checkin: glibc X-Git-Author: Frederic Berat X-Git-Refname: refs/heads/master X-Git-Oldrev: 9e6863a537e66e01f5819dc356c5405a2bc67dc7 X-Git-Newrev: 1bc85effd549ae42318b37555a4c76ebc479b92a Message-Id: <20230622045331.77A893858D28@sourceware.org> Date: Thu, 22 Jun 2023 04:53:31 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1bc85effd549ae42318b37555a4c76ebc479b92a commit 1bc85effd549ae42318b37555a4c76ebc479b92a Author: Frederic Berat Date: Tue Jun 20 20:18:52 2023 +0200 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: --- sysdeps/i386/mempcpy_chk.S | 2 +- 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