From patchwork Tue Jan 14 13:19:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 104748 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 0F53A385AC33 for ; Tue, 14 Jan 2025 13:24:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0F53A385AC33 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=google header.b=C9OaLlqK X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by sourceware.org (Postfix) with ESMTPS id 8EB5E385AC3A for ; Tue, 14 Jan 2025 13:19:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8EB5E385AC3A Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8EB5E385AC3A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::32b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736860791; cv=none; b=RId0KM6J79aPXQxoNQfbjJUEuLVYzEg2eoDvVzKFzioBWO72CWKKW6emctkIfN+JaiAR51GDhTsU+2JgaR3Gq3SR9wQM9gYoWdKPaBBIgPU5TAUITe/8fmT4oPWmRVMvAKvzSFerZTq8ic8zVgcaZl98du75p2opqT7r7HblV7s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736860791; c=relaxed/simple; bh=sRsdd7V55xsGEYlHb/fnZbLLbVt3M+JAB7CMbW97e2c=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:From:To; b=XXl7d7PdsYrMq2emDy53Z+xUvGov3H+BC7tjfB5MDf5+nvoR3aZYQJrL5PLWApI1DbqURh/3wRKzgSsKtMg6BwRG++QklECioZHD7Wk/6K/3wle/KQgSTVxbd1KkBAmGAbYczYRQFurGv5Mem9dUyZhuhtdxQaG/XR1tUQmX8Yg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8EB5E385AC3A Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4362f61757fso52232705e9.2 for ; Tue, 14 Jan 2025 05:19:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1736860789; x=1737465589; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=rdZm5KopJc/uSfOXBG5DmXVv7tbn4joRsTgXj/H/UY0=; b=C9OaLlqKWlLGfF0aqyROM7Tt9OkSe93JbyFvauG8QOfFs+SFVSbz6hkNLvZu0Jyplm AIXlEXMYx6cjqqd7d3cyApubqtWIbyqMZcfw7SfSsXTHLeEY+WU34RVT1gc6cqFUP4zd e20KQpTxtgm7Pz3CaHOj8Lb1muZhg9+qoYT55Kp6dd42DzvkohPEg85cu0YDVthCOE4+ yzOOgQXNpeGPyStsgU7Xu+sxAGRs6VJDyV35gIdTvffnc5rytLebZrKX4ZDn5NrxEoOO 7JgW8rqW+NHMVgJ58qhO3uXmsxOAttIckCpzroQH6iN+HgNi/Tk2EYfQ3qiMu0z5LEKS rMmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736860789; x=1737465589; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rdZm5KopJc/uSfOXBG5DmXVv7tbn4joRsTgXj/H/UY0=; b=BIkqJm4KhzFtMxmjPwMGgg6iCfeS2QxOwyjHvq8bc3eZnzE1i/Ab0dQSW8R2XtsRZx E4zkqtJcBnHXxdPv5Io2GcQXsI7W2THkzHG3lgomvvMq1WB2jLMthh0KOEWlNOrFLEl7 UjvseiFA7KYc3IRAXslRaBpDAoWPGeXQL55XjtIyyt7Wb59s2TPErTFkZlLszVolEDmm ras3sH5Sll9+H+gc7icna+SE8PTpG8Y2FpEX+zdVDuJxq7+3x60cYnn0JgZTyBgr6gr3 FZULjMe1yK3yN/bUzcrcyZdaHml5mwzJBwr+88zEaznEvhfpg5p+uSdD1aqwAIDJSDNY ARwA== X-Gm-Message-State: AOJu0YzgLeGUTLkfGImmZByk9UHYm1qTdJUs8Cwnpc1FtQTmZthjzdIT b9uHxj6BDnVxCW2hjbN+UkT51SyVhJ/YPDOGqnE6jtLkw87WK3Vdw6uNkeucRdu68WapAwWsCTI = X-Gm-Gg: ASbGnctEQ2mXAX8i1TqoLFcByDjjP5hvnZQxoHAiBZDFXdByopin/BdMzEl48jh9Pol MdngzBGDJuCDuMV1qtC4lVuzmeh9T0Sm0si0Aa9YMUCdgdHSOj8yofkFKTLH+D/f4yCzVaqtgb4 bWZ6wvltdDjV+0KEVaa1PLOZyJ1NhFUvJXjj9AxfYF5CDkoWeEOCDV1uPZqXKRtx51uuUnN0/DV T5ugtytF+fTikxotTNpllMsblUJASFZ+Ow3yalaV3U8HfuQxNJyBRVxjSt9okqJhguG22v7kb0e jsrxvW/ELc1+B8giyMYZ8rMncFaP5VoI23u7wu+Fkg== X-Google-Smtp-Source: AGHT+IGUAkwqr/pECyjNTA/27yMF6IIBPgSV5GJ9YN6oy37aln3nFMhlqJQrvOp2pxYQTxZq6VJ0XQ== X-Received: by 2002:a05:600c:1d9e:b0:436:8a6f:b6db with SMTP id 5b1f17b1804b1-436e2707c41mr196263855e9.22.1736860789154; Tue, 14 Jan 2025 05:19:49 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436e9d26a7bsm181109795e9.0.2025.01.14.05.19.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 14 Jan 2025 05:19:48 -0800 (PST) Message-ID: Date: Tue, 14 Jan 2025 14:19:48 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 2/2] x86-64: tighten convert-load-reloc checking From: Jan Beulich To: Binutils Cc: "H.J. Lu" References: Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: X-Spam-Status: No, score=-3022.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, 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 Even if the assembler avoids using relaxable relocations for inapplicable insns, such relocations can still appear for other reasons. Be more thorough in the opcode checking we do, to avoid bogusly altering other insns. Furthermore correct an opcode mask (even if with the added condition that's now fully benign). --- The use of "abs_relocation" as an if() condition (just outside of lower patch context) is highly questionable: The value of a symbol doesn't express whether a symbol is absolute. In fact this way non-absolute symbols also undergo the respective range check. Whereas at the same time absolute symbols coming from the linker script or the --defsym command line option aren't checked (because of what ABS_SYMBOL_P() expands to). However, changing this breaks the pr19609-6a linker testcase, as the way ABS_SYMBOL_P() works the range checking would then be skipped, while later on when the relocation is processed it would overflow. --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -2223,13 +2223,15 @@ elf_x86_64_convert_load_reloc (bfd *abfd modrm = 0xc0 | (modrm & 0x38) >> 3; opcode = 0xf7; } - else + else if ((opcode | 0x38) == 0x3b) { /* Convert "binop foo@GOTPCREL(%rip), %reg" to "binop $foo, %reg". */ - modrm = 0xc0 | (modrm & 0x38) >> 3 | (opcode & 0x3c); + modrm = 0xc0 | ((modrm & 0x38) >> 3) | (opcode & 0x38); opcode = 0x81; } + else + return true; /* Use R_X86_64_32 with 32-bit operand to avoid relocation overflow when sign-extending imm32 to imm64. */ --- /dev/null +++ b/ld/testsuite/ld-x86-64/load4.d @@ -0,0 +1,13 @@ +#as: --64 -mrelax-relocations=yes +#ld: -melf_x86_64 -z max-page-size=0x200000 -z noseparate-code +#objdump: -dw + +.*: +file format .* + +Disassembly of section .text: + +0+4000b0 <_start>: +[ ]*[a-f0-9]+: 12 05 ([0-9a-f]{2} ){4} * adc 0x[a-f0-9]+\(%rip\),%al # 6000c8 <.*> +[ ]*[a-f0-9]+: 44 84 3d ([0-9a-f]{2} ){4} * test %r15b,0x[a-f0-9]+\(%rip\) # 6000c8 <.*> +[ ]*[a-f0-9]+: 48 87 05 ([0-9a-f]{2} ){4} * xchg %rax,0x[a-f0-9]+\(%rip\) # 6000c8 <.*> +#pass --- /dev/null +++ b/ld/testsuite/ld-x86-64/load4.s @@ -0,0 +1,23 @@ + .data + .type bar, @object +bar: + .byte 1 + .size bar, .-bar + .globl foo + .type foo, @object +foo: + .byte 1 + .size foo, .-foo + .text + .globl _start + .type _start, @function +_start: + # Other insns must not be accidentally transformed. + adc 1f(%rip), %al +1: .reloc .-4, R_X86_64_GOTPCRELX, bar-4 + test %r15b, 1f(%rip) +1: .reloc .-4, R_X86_64_REX_GOTPCRELX, bar-4 + xchg 1f(%rip), %rax +1: .reloc .-4, R_X86_64_REX_GOTPCRELX, bar-4 + + .size _start, .-_start --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -653,6 +653,7 @@ run_dump_test "apx-load1d" run_dump_test "load2" run_dump_test "load3a" run_dump_test "load3b" +run_dump_test "load4" run_dump_test "call1a" run_dump_test "call1b" run_dump_test "call1c"