From nobody Fri Jul 15 16:34:02 2022 X-Original-To: dev-commits-src-branches@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 4Lkxky4YsPz4T4GF; Fri, 15 Jul 2022 16:34:02 +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 4Lkxky3YwGz3H4Y; Fri, 15 Jul 2022 16:34:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657902842; 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=6NIjWBzeT1aS2VRiR+oredmGMt3oAv3f5O3+zWD4jgk=; b=ubYbzWKJBj4S58zTJcsF9feHuTnifFTMXSR+rvAJqpRoHYd1AwAA6SAYOhV6vL0ET8N1Um MonzUnRHptJizjuZa+aAZp3Yq06ANd9BaR59cq5vZQZC+kQ6+JDYbaGDaj2r+Sc79mwJqj ejKB74G/UG4oGH23freIJV8JdarbevRvgEzLidne7BHS9qEBd0CiPvTpAw2kEUdtzDA5UF Xhlpqzzw1gAkFFXmnoV6LE92TrVE3rUz9bLGiFPV9Ro+qZZtjXIT6QE/uFFkwkfq7Fas8H wNCizAdowx+0Dpu8CgGKXmb3/n71TChTSGfqR+MLooHExAvNYatvHc0ezgQszQ== 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 4Lkxky2d1fzpj5; Fri, 15 Jul 2022 16:34:02 +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 26FGY2FB038108; Fri, 15 Jul 2022 16:34:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26FGY2Wv038107; Fri, 15 Jul 2022 16:34:02 GMT (envelope-from git) Date: Fri, 15 Jul 2022 16:34:02 GMT Message-Id: <202207151634.26FGY2Wv038107@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d9da2f90cbec - stable/13 - loader: Relax the check in is_kernphys_relocatable() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d9da2f90cbec9b3c4777bd12671e2f837907ff5a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657902842; 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=6NIjWBzeT1aS2VRiR+oredmGMt3oAv3f5O3+zWD4jgk=; b=Tx1cslbK0/8CIQ1Sct8g9GrBdqCSNU1La4ho1rgBvZFtLNBRgQKnFoAk/EsyiC2CS2UPJg XsGi45YxQhVJTm68cd42afCfG82Hpj3NFLRy3TXxq2MPqFps2O6JI03VosHzgG3tKx0utw J5DUtveKFT3JKruUImk69HBGZLVwD5JfFji5/eBQPCGGUHYQQmltCJSL8wYKDQm6D9zrZV pBORIs9CFlqwDkAFOkLqcb3wPjX90yqa16MO04KiH1OfBhFwnjhX6uH7ViPd7ZrhpHItob Mhef84e/FIg5XCtA/S4uu0W6tz2x6sMQL7jNyycu2ZZXTFIR7YWxOZFRz3DWsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657902842; a=rsa-sha256; cv=none; b=PTuQsTvOAEQrySCGYdIeZKMVKiDk0tRAUvBi0T9pok417fI2PJG118o/fKXlgj+3Ru0UgU YrmPX2c6icaUQhkD32FHktyvCXyN8yOKm1ENmkb++QRXhQUzDVQ6spEuNcjSW1Gfm1Y1O0 PAU4ceqW7jk4fcKJE33Fa0wSGIrF6XHvNCTuUQMeTyTmgg1XB1lbQTW3n6lvcnDgDQwO+E ykbHlBQXhB8DO9PxnaHpF1kvr1IpBBW48rkKMfArZRgo2wf6PBL8n9y+4QPPmalDIBR1vZ K0Qb6qqU5eGQT9u7zD6FWhxrnAUTbGZP8qc7ZAZPHoeBnORclsZqIAgOvkgrKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d9da2f90cbec9b3c4777bd12671e2f837907ff5a commit d9da2f90cbec9b3c4777bd12671e2f837907ff5a Author: Mark Johnston AuthorDate: 2022-06-15 14:47:13 +0000 Commit: Mark Johnston CommitDate: 2022-07-15 16:33:03 +0000 loader: Relax the check in is_kernphys_relocatable() The check fails in kernels compiled with KASAN because AddressSanitizer inserts redzones around global variables, so the size of the "kernphys" symbol is 32 rather than 8. Thus we fall back to copying even though it's not necessary. Simply remove the size check. I didn't want to extend the symbol size check since there's no guarantee that AddressSanitizer will always emit 32 bytes for "kernphys". Reviewed by: kib Sponsored by: The FreeBSD Foundation (cherry picked from commit 9a964ad56182740ea09b87f7e6db4197c6756e48) --- stand/common/load_elf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/stand/common/load_elf.c b/stand/common/load_elf.c index c75567b4a560..d8fad9df994b 100644 --- a/stand/common/load_elf.c +++ b/stand/common/load_elf.c @@ -214,8 +214,7 @@ is_kernphys_relocatable(elf_file_t ef) { Elf_Sym sym; - return (__elfN(lookup_symbol)(ef, "kernphys", &sym, STT_OBJECT) == 0 && - sym.st_size == 8); + return (__elfN(lookup_symbol)(ef, "kernphys", &sym, STT_OBJECT) == 0); } #endif