From patchwork Fri Dec 20 13:20:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 103505 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 C3B823858D3C for ; Fri, 20 Dec 2024 13:21:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C3B823858D3C 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=a7Z70wK6 X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by sourceware.org (Postfix) with ESMTPS id A5E493858402 for ; Fri, 20 Dec 2024 13:20:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A5E493858402 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 A5E493858402 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::334 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1734700852; cv=none; b=OHYtwzVBr3SOiGdFGMNmSAULmut09zkNlF4w9JdD6KG2Qz8kjwLsR3vPU1SOAEDuKVz7AnqBiXs8XlQrmmjeFsm73XtHH5c7jThJzqzrI2tLq203+Bzunp38y9gkoiyulqhVefo7eFctbTSITQL3FLJO5sYZ1MLPOvo0Oa8LBJ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1734700852; c=relaxed/simple; bh=D09t+VVmUvGL8VzBx1LZtQFeFFKiw7gMG4f6Nkn5svU=; h=DKIM-Signature:Message-ID:Date:MIME-Version:To:From:Subject; b=WtCeffPPuVd/wKERdHJJqRsJnQ6c/fx8P+BDAa3h0ra9vQBU7WDmqqUHcLKo9EnCdY3opre64OUbCExBlq/VD1iWOfXLtxUtggSzVa/gZpq6olzdq7BEb75SsFoWQuLsfz/ZMXOpe89NozroVy8XgtCl87geIqbzydRuqxVAdLo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A5E493858402 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-43634b570c1so13824365e9.0 for ; Fri, 20 Dec 2024 05:20:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1734700851; x=1735305651; darn=sourceware.org; h=content-transfer-encoding:autocrypt:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=TL9uU4iFGZtPBF5YjHZk6VysxqVHV/4KyfGs3mz6tEU=; b=a7Z70wK6CKDTWHtbvLJpH5Y4HWcVwD7aQfkyG0VwmO+Fi9k9MDbf1LBJrgtMOK2nLr JvDGynMftVqmiqcZKsGkEmNRcNpVJ0jhuQPNew17q890uK6eMEnLE+/YXOSr2llVCECG kIwf7c08/1X1xyMtjrSqSoRrzKhFsoGFVVN/dmVzYuMBFUSDtIObTBp0/sQKVb+qfOVk a8WYbwDJqxJD47oxailX2GOsJ7Ml4h6l1bwoKwZlGCJkU2NvsKC5G0zeulUdZqijJeXr Qfd6myljF3oaBi3YBzRu1yasKvGR6SOHgU/WfZCccIn+p6Y+feUrkIEcFpdQ2dGEcrcq sTVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734700851; x=1735305651; h=content-transfer-encoding:autocrypt:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=TL9uU4iFGZtPBF5YjHZk6VysxqVHV/4KyfGs3mz6tEU=; b=tOTwZy/Lad2q4+odSsMavmlRAkbuvUT87nlgr6iVWn+8xOTmMfOBnBZWiEX6VV/uoV eHYg9t2/tQFN1wedoS92GyGvB+RuojL63O1NIGnf1sLOleKGdBukufvHUOmvT7cKUPEL T1pLh0CPxSFW8ZPBPZf1201w3l7ODReruU8nUOFBBU5S8ktHTrfF7tFjcS+SX7dcshL6 WSoNC6PS/wLEyRtlosCkkjkc6vhzpf43IHYRFWYEYFaTm+V10p4yDujdMMTlvC78Qwt0 9yPLFEuW8TvTLB72H7baEKKZEnKcOPl3e6NwfROdQJdwIb9ZWKDAyUMcLhd4BYISTteC HIVQ== X-Gm-Message-State: AOJu0YzP4Yto/NN2IL+ns3sk2r+pk7ZHmuKpBxRZAiIhiUbam0jdJazR X+cDCcI2y2dVFlztfXDnZySkdaK419CpSCFUNoo2QJxZJU3gkmbhxiUwvAdgK/QpKIpE4z8RIjU = X-Gm-Gg: ASbGncsiphcuY68T27czvaNvzGzvIWOQdA1Jvrl40e0h63EmShP6aCM0ZHXGT/Dz6KM tbLHPRpdv+v/zworsoe6V3Kj8TrcrsOOryhvNLQzzrFzAXlcPyLIJ8u5SqgFkzVw2MUA/mcpgp7 xC1OD+Kg0pHB3OWEKwNjay9tROUCaqIIeXm9CCXuYxmNJ30/+xkUt46QkSXKROlyhZ9uCEtOIBC V6MD/R0iPzg21fGFnqzvS40axYANrpoq1hQ2kWvp5hh7R6166o8z9mznOhiDEI8sZBD4h/diM1+ z8LlxAk25+NRaS+LLKOF389mEo/RF2AaJJuN2xixKA== X-Google-Smtp-Source: AGHT+IFNMXONEnojaNirVRgSm/NF7ynoEbyd9M2i5xX3bXVvx7qQexOtkW/8dSi2tnncBHW3veixDA== X-Received: by 2002:a05:600c:4688:b0:435:b064:7dce with SMTP id 5b1f17b1804b1-4366864618emr26470775e9.18.1734700850921; Fri, 20 Dec 2024 05:20:50 -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-43656b119ccsm79881545e9.24.2024.12.20.05.20.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 20 Dec 2024 05:20:50 -0800 (PST) Message-ID: <2318e59c-a19d-4542-8fb5-79840ddb1bea@suse.com> Date: Fri, 20 Dec 2024 14:20:49 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Binutils Cc: "Andre Vieira (lists)" From: Jan Beulich Subject: [PATCH RFC] bfd/ELF: offset-adjust also the LOAD segment containing the PHDRs 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 X-Spam-Status: No, score=-3022.6 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 PR binutils/32324 Such segments have their file offsets set early. Include the subsequent offset adjustment also there, to maintain proper alignment (as mandated by the input binary). --- RFC: I can't really explain the m->p_align_valid part of the conditional, other than it (or something with the same overall effect) being needed to make the ld-elf/size-2 check pass. Without that extra check the program headers there move by 0x18 bytes. The resulting binary still looks legitimate, just a little odd in having an 24-byte gap _before_ the PHDRs rather than after. Overall the change still feels like a gross hack, yet considering how convoluted the entire function is, that's surely not the first one there. I'm in trouble here conceptually anyway: When objcopy- ing a fully linked binary, it feels wrong to see VAs be calculated from scratch. VAs may not change in this process, after all (and that they did in the reported case appears to support my view). RFC: Having a testcase for this situation would be nice, but ld won't permit creating an ELF binary with the problematic properties: It demands that if the PHDRs are part of any LOAD segment, they also be part of any earlier ones. --- a/bfd/elf.c +++ b/bfd/elf.c @@ -6057,6 +6057,9 @@ assign_file_positions_for_load_sections == ((off + off_adjust) & -maxpagesize))) off_adjust += maxpagesize; off += off_adjust; + if (m == phdr_load_seg && !m->includes_filehdr && m->p_align_valid) + p->p_offset += off_adjust; + if (no_contents) { /* We shouldn't need to align the segment on disk since