From nobody Tue Oct 25 16:00:52 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mxc9c6pdlz4gBYr; Tue, 25 Oct 2022 16:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mxc9c6KjLz470j; Tue, 25 Oct 2022 16:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666713652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+/i5zu/XIhVCjNmZTSYXpbku8/SIfDl14bhoauA6TJg=; b=ik8POXs+53Pu6QpuGsTw64wsiUdE4w63dUbnCkLIejk+QUvPD8UP5YV24MYCk/jr8CA99/ 3g3M2/44mnMaWQ5uWlaFmEEacdn7blUjh8v2coJs1eNtbJCxjPp3KlL2MojwEYZ+erdRRM ZdMr2Oxd3SoxdMT8pfpuARFac52WBswkXP2/1uPqWU/FEHXn5BwYdVyUVdkC1rctGlzD2x 6Cpbe69/sk4RsGHbn3Cmx5xBzQtyjGIMsSNN873A/EKRCCnjm+S+J8ptvqhWUvV1vQ46EY IbCW8ag0w/XiEqklK+d5vauKrIvoFbs3l0R1Q061MOPY0h+i6bN1ZFry9UQZ6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mxc9c5N5Fzjs2; Tue, 25 Oct 2022 16:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29PG0q9e090498; Tue, 25 Oct 2022 16:00:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29PG0qXQ090497; Tue, 25 Oct 2022 16:00:52 GMT (envelope-from git) Date: Tue, 25 Oct 2022 16:00:52 GMT Message-Id: <202210251600.29PG0qXQ090497@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ca18304ea491 - main - arm, arm64: tweak hard-coded load addresses for PIE binaries List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca18304ea491263389b8b1239e9b5b21d80da7f5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666713652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+/i5zu/XIhVCjNmZTSYXpbku8/SIfDl14bhoauA6TJg=; b=ewvbsc7Og69URDZOY7DKlNmSisWCBhwDMEL2hvSqccYs8HxL/170qKCS6e/n5MzuTQjhO5 4XXhF6ftMHbpMiAQFoWV1BscjiWNnvp7qtyZLD+S6ke9Ol72wWhYHv5YlMqnL2/vFn0kUJ U7h+1zHj4ONz0DcHhI5G/jyoTlsnApkmqnV7wmD50krnTUj0el0IN/Dl5YxV6FMa7WMYBz ABq7CUWAS9Sr/pox47gCHzyXFMUiks4GT1VIhyC9o//aSTOxueXLlCF/OA5nU7GIYn4uxU HvUYBrzczR8EAiJJhjwt1hUs6SDtNv1x1Vp7/2XLBuJVhKNfr/WqOuJVQYyKsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666713652; a=rsa-sha256; cv=none; b=AlxuZDrwkRnGv7em/eMaxzCDzrx2rcm0aAjvbkVSiNsC04tLmIrOYGoJqM28dqfEDvzyeg 6+c2vOhhVbSYHTJCoMhsOKlXzc96gNfaRTO1jD1xUMd7hBAGWjT3u4omUtblPLraTeLffu X7R8mtCkiH9FdYBPxFE8xTSOx8R3pXf9l4NRKglBYldDb+ikwPUtW7RIwfXewTQ65PqCHR UdS0kBKHetAqbGkzX3VCkmoGiH0F7cw55CWe/xHCQhWfTEQqNR9ew/KU3LDdXqFsmqUiIH ROJdXp59kppSvoj03OQrHjhbb86fmlzCYFz6NaTGndQMVaxLMxq9UqxC++sz+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ca18304ea491263389b8b1239e9b5b21d80da7f5 commit ca18304ea491263389b8b1239e9b5b21d80da7f5 Author: Konstantin Belousov AuthorDate: 2022-10-22 10:58:43 +0000 Commit: Konstantin Belousov CommitDate: 2022-10-25 16:00:44 +0000 arm, arm64: tweak hard-coded load addresses for PIE binaries They are used when ASLR is not applied. The need for adjusting is due to rtld direct exec mode puts ld-elf.so.1 at the PIE load address, and this address must not conflict with the default linker' load address for non-PIE binaries. Otherwise rtld in direct mode cannot activate image. Example of implicit failure is ldd(1) refusing to run. Reported by: kp Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D37085 --- sys/arm/include/elf.h | 2 +- sys/arm64/include/elf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm/include/elf.h b/sys/arm/include/elf.h index affd4b349163..35d0fa55ca1a 100644 --- a/sys/arm/include/elf.h +++ b/sys/arm/include/elf.h @@ -78,7 +78,7 @@ __ElfType(Auxinfo); #define EF_ARM_EABI_VERSION_UNKNOWN 0 #define EF_ARM_EABI_FREEBSD_MIN 4 -#define ET_DYN_LOAD_ADDR 0x500000 +#define ET_DYN_LOAD_ADDR 0x01001000 /* Flags passed in AT_HWCAP. */ #define HWCAP_SWP 0x00000001 /* Unsupported, never set. */ diff --git a/sys/arm64/include/elf.h b/sys/arm64/include/elf.h index 3f7c3964d428..22e968c632bf 100644 --- a/sys/arm64/include/elf.h +++ b/sys/arm64/include/elf.h @@ -86,7 +86,7 @@ __ElfType(Auxinfo); #endif #if __ELF_WORD_SIZE == 32 -#define ET_DYN_LOAD_ADDR 0x12000 +#define ET_DYN_LOAD_ADDR 0x01001000 #else #define ET_DYN_LOAD_ADDR 0x100000 #endif