From patchwork Wed Jun 26 15:20:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Remus X-Patchwork-Id: 92896 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 75947387542D for ; Wed, 26 Jun 2024 15:21:31 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by sourceware.org (Postfix) with ESMTPS id DA4C13871035 for ; Wed, 26 Jun 2024 15:20:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DA4C13871035 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linux.ibm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DA4C13871035 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1719415257; cv=none; b=wkit1T1GLpGSx80Grdx1YsqNfVt9SvZhPlc5FWYRtG5EaUTeXdZDQCXQNQro2xMiSbIAZ1alIdMg7Y1/L55CSi6q7zBTMljZWaNJVIxu7PbBNYFwnVGkVR5C8EZDeMtXvGd45upV8kXR9ykVzrWKGZTh8vqRiX9pu+J18/VskJ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1719415257; c=relaxed/simple; bh=0mJ1zN+d2pzZ2RplKR2lYGhDNiE2JlXk5DFnTGkqg54=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=o5XFooVwaKnfAnHj5k9ukZf33gfOTohpN21DQeTNOKbPa260d0r8pYh7vOJlq5hpUplrpvrgVVKm77ZAbPR5mGLveBEq0rYUxiw6zFCTqN8g34aYpA/lqlsYvmIEIpp5LlliFkBZBHYuI0IsmpGGUxBbBX7Su1heFZ6t0+63/x0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 45QEwWs1024531 for ; Wed, 26 Jun 2024 15:20:50 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from :to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=pp1; bh=jER14rYmd2qQX lDRffbBs1DE3LqvdM8G8VhpGQMZLhc=; b=YmlWcox3g8Zi+f7YRqvL6HLf96d+/ FnHLjD5n5qpeEORUy3eErujAN2gGQgmZC7i57UYJc2jQJFYmfgTXRMfK46RxC7LX V+adG+agKDRh9BbMaKwfrrRVcygnErHybwecZKQ3kQ17VAJkIr/LC/7gkfTlMQO9 uW7ab8xVtdIZ3/FqSHeOKTDH+GPgPidnUX1kgCIIdMf6b5L2+8iViu94TXO7hmLC XxUTLVlI2ALfCuMxvMf/rEEpA9tQS8kO0q3qr+QGivU4lKPG9Gqcs8XZ+RatXp0b KKcJC+Be9bwTfPATxce1DVW/CxclNHSep+xSAufwZeWXTudSHglhvhWQA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 400n7fr26x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 26 Jun 2024 15:20:50 +0000 (GMT) Received: from m0353725.ppops.net (m0353725.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 45QFKnGt028328 for ; Wed, 26 Jun 2024 15:20:49 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 400n7fr26t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 26 Jun 2024 15:20:49 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 45QCwEkm020058; Wed, 26 Jun 2024 15:20:49 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 3yxb5mmv5g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 26 Jun 2024 15:20:49 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 45QFKhUL37093788 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 26 Jun 2024 15:20:45 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BB2D62004B; Wed, 26 Jun 2024 15:20:43 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8E1112004D; Wed, 26 Jun 2024 15:20:43 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 26 Jun 2024 15:20:43 +0000 (GMT) From: Jens Remus To: binutils@sourceware.org, Andreas Krebbel Cc: Jens Remus , Alexander Gordeev , Ilya Leoshkevich Subject: [PATCH 2/2] s390: Avoid reloc overflows on undefined weak symbols (cont) Date: Wed, 26 Jun 2024 17:20:33 +0200 Message-Id: <20240626152033.2567309-3-jremus@linux.ibm.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240626152033.2567309-1-jremus@linux.ibm.com> References: <20240626152033.2567309-1-jremus@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: vLKfIMibqGcMejwqWf2WNFs4Wd2JK8wy X-Proofpoint-ORIG-GUID: ed0KwcsCCsrXggVi5EVBI0tMtQg_35JG X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-26_07,2024-06-25_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 spamscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 mlxlogscore=999 adultscore=0 bulkscore=0 clxscore=1015 mlxscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2406140001 definitions=main-2406260109 X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+patchwork=sourceware.org@sourceware.org This complements and reuses logic from Andreas Krebbel's commit 896a639babe2 ("s390: Avoid reloc overflows on undefined weak symbols"). Replace relative long addressing instructions of weak symbols, which will definitely resolve to zero, with either a load address of 0 or a a trapping insn. This prevents the PLT32DBL relocation from overflowing in case the binary will be loaded at 4GB or more. bfd/ * elf64-s390.c (elf_s390_relocate_section): Replace instructions using undefined weak symbols with relative addressing to avoid relocation overflows. ld/ * testsuite/ld-s390/s390.exp: Add new test. * testsuite/ld-s390/weakundef-2.s: New test. * testsuite/ld-s390/weakundef-2.dd: Likewise. Reported-by: Alexander Gordeev Suggested-by: Ilya Leoshkevich Suggested-by: Andreas Krebbel Signed-off-by: Jens Remus --- bfd/elf64-s390.c | 37 +++++++++++++++++++++++++++++ ld/testsuite/ld-s390/s390.exp | 5 +++- ld/testsuite/ld-s390/weakundef-2.dd | 17 +++++++++++++ ld/testsuite/ld-s390/weakundef-2.s | 17 +++++++++++++ 4 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 ld/testsuite/ld-s390/weakundef-2.dd create mode 100644 ld/testsuite/ld-s390/weakundef-2.s diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c index 2f35da4a6275..f9d9902651bf 100644 --- a/bfd/elf64-s390.c +++ b/bfd/elf64-s390.c @@ -2399,6 +2399,43 @@ elf_s390_relocate_section (bfd *output_bfd, /* We didn't make a PLT entry for this symbol. This happens when statically linking PIC code, or when using -Bsymbolic. */ + + /* Replace relative long addressing instructions of weak + symbols, which will definitely resolve to zero, with + either a load address of 0 or a trapping insn. + This prevents the PLT32DBL relocation from overflowing in + case the binary will be loaded at 4GB or more. */ + if (h->root.type == bfd_link_hash_undefweak + && !h->root.linker_def + && (bfd_link_executable (info) + || ELF_ST_VISIBILITY (h->other) != STV_DEFAULT) + && r_type == R_390_PLT32DBL + && rel->r_offset >= 2) + { + void *insn_start = contents + rel->r_offset - 2; + uint16_t op = bfd_get_16 (input_bfd, insn_start) & 0xff0f; + uint8_t reg = bfd_get_8 (input_bfd, insn_start + 1) & 0xf0; + + /* NOTE: The order of the if's is important! */ + /* Replace load address relative long (larl) with load + address (lay) */ + if (op == 0xc000) + { + /* larl rX, -> lay rX,0(0) */ + bfd_put_16 (output_bfd, 0xe300 | reg, insn_start); + bfd_put_32 (output_bfd, 0x71, insn_start + 2); + continue; + } + /* Replace branch relative and save long (brasl) with a trap. */ + else if (op == 0xc005) + { + /* brasl rX, -> jg .+2 (6-byte trap) */ + bfd_put_16 (output_bfd, 0xc0f4, insn_start); + bfd_put_32 (output_bfd, 0x1, insn_start + 2); + continue; + } + } + break; } if (s390_is_ifunc_symbol_p (h)) diff --git a/ld/testsuite/ld-s390/s390.exp b/ld/testsuite/ld-s390/s390.exp index eb9ea35400b2..ac62d7a8a1a5 100644 --- a/ld/testsuite/ld-s390/s390.exp +++ b/ld/testsuite/ld-s390/s390.exp @@ -95,9 +95,12 @@ set s390xtests { "-m64" {pltoffset-1.s} {{objdump "-dzrj.text --stop-address=16" pltoffset-1.dd}} "pltoffset-1"} - {"WEAKUNDEF1: overflow test" + {"WEAKUNDEF1: overflow test (PC32DBL)" "-m elf64_s390 -dT 8GB.ld --no-error-rwx-segments" "" "-m64" {weakundef-1.s} {{objdump "-dzrj.text" weakundef-1.dd}} "weakundef-1"} + {"WEAKUNDEF2: overflow test (PLT32DBL)" + "-m elf64_s390 -dT 8GB.ld --no-error-rwx-segments -no-pie" "" "-m64" {weakundef-2.s} + {{objdump "-dzrj.text" weakundef-2.dd}} "weakundef-2"} } if [istarget "s390-*-*"] { diff --git a/ld/testsuite/ld-s390/weakundef-2.dd b/ld/testsuite/ld-s390/weakundef-2.dd new file mode 100644 index 000000000000..e7f0e2239b6a --- /dev/null +++ b/ld/testsuite/ld-s390/weakundef-2.dd @@ -0,0 +1,17 @@ +tmpdir/weakundef-2: file format elf64-s390 + +Disassembly of section .text: + +0+200000000 : +.*: c0 10 00 00 00 12 [ ]*larl %r1,200000024 +.*: c0 10 00 00 00 10 [ ]*larl %r1,200000026 +.*: e3 10 00 00 00 71 [ ]*lay %r1,0 +.*: c0 e5 00 00 00 09 [ ]*brasl %r14,200000024 +.*: c0 e5 00 00 00 07 [ ]*brasl %r14,200000026 +.*: c0 f4 00 00 00 01 [ ]*jg .* + +0+200000024 : +.*: 07 fe [ ]*br %r14 + +0+200000026 : +.*: 07 fe [ ]*br %r14 diff --git a/ld/testsuite/ld-s390/weakundef-2.s b/ld/testsuite/ld-s390/weakundef-2.s new file mode 100644 index 000000000000..d147b53d6dca --- /dev/null +++ b/ld/testsuite/ld-s390/weakundef-2.s @@ -0,0 +1,17 @@ +.text + .globl foo +foo: + larl %r1,d@PLT + larl %r1,wd@PLT + larl %r1,wu@PLT + brasl %r14,d@PLT + brasl %r14,wd@PLT + brasl %r14,wu@PLT + .weak wu + .type d,@function +d: + br %r14 + .weak wd + .type wd,@function +wd: + br %r14