From nobody Wed Jun 15 15:39:28 2022 X-Original-To: dev-commits-src-all@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 A0BF485524C; Wed, 15 Jun 2022 15:39:28 +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 4LNTxr3LRXz4m7F; Wed, 15 Jun 2022 15:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655307568; 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=yHbO6zty3Wk0lps/PpoUYV+DHHxqviS1UgO0zQFVvFI=; b=XbtraGl6fIIUhff4Hnk1dUwgoQv3pitTb9woP0fx4m8E3ZUP6VbDZWz/4jP01hq0aNkgEa WvaHYUvB0dbwWoD/Q2n+pniPCIXtWXd6jP3k7Gbglsdq5+xhSGOjKBSj5d7BkcDhrfQUTR JdMULiLPdgVQmT6HAO1azKZaLkGJX2PRp83eiXoK1zLZOhHauTzrDNU5QmH4iykjPnMlBo nPDcs//63lu97ONPGS1LGYbAc5gzbXczwvtzvT6p2mfszsgaoeGIiArDg8xlwprnmxAfwY jkHYc7/QBwF696obuDXgIsCfgNW9jNd7AMcQ6C3Rc0zcgj7sqaVg/BAryiJd8Q== 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 2475D212A8; Wed, 15 Jun 2022 15:39:28 +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 25FFdSK0085448; Wed, 15 Jun 2022 15:39:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25FFdS3o085447; Wed, 15 Jun 2022 15:39:28 GMT (envelope-from git) Date: Wed, 15 Jun 2022 15:39:28 GMT Message-Id: <202206151539.25FFdS3o085447@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 9a964ad56182 - main - loader: Relax the check in is_kernphys_relocatable() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 9a964ad56182740ea09b87f7e6db4197c6756e48 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655307568; 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=yHbO6zty3Wk0lps/PpoUYV+DHHxqviS1UgO0zQFVvFI=; b=qPfGmo1zKc1RTJ77K8FPYkbjwgo2XbMTWzMR6q2vLDfWzht+ReWPns9x/ebmJB846oUrT4 XkiAuan9/ZQ6LLGLslabqeVv5cwY4j54vJvjhLg5Q/ycJ8QIadTxbqu8uFlUZqp4fRPBc6 ncilTYOXboYnVF4gRvxNSfeduXaAR3t1MfLxGa19qIiqu1oYpazDLzW1NZRfkuxGvWVM+6 tdbg7vebUs1/avP/II2ETKpEiohD1ZWb8/cCh1hVVpf8ebCLmG6cGENQ9Y/n2rebHd+NMR Nw77JCSSn7tVr2tVqE+mDFnjsWQVvaNKOWM00mf7rr0azzbEpCq4n+b8yn7t0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655307568; a=rsa-sha256; cv=none; b=P7Rgu498VZj8xcfftAtQiZfMwdCWHeFLjEZWwecm0v2sBtPYA/EeN9udS+YcQvEYbsfHCo QzK5lg9PrYE0f99C3IdYpTdyFnpsnVXuGpiq5Oz3qwlLJFvzjOxCYitajAe1jyYbBES1EM ia5ZHd0PEBnYQNceA6RV3J2jReC6IWndDO03Ess/l9se0R4rt+BmOc+oE8Fy1T/q8hTFqK EQK1iKd18vTs+CXEueag1vgY6CZjPn+q3ds3Tmx0aJF2UJvLLjEvEv45lshOFN61PaoqB4 I7tUt1a/i65mZiM9OML09NYkACf45ZBBs8L8cuTqSOWTt0VR+S3MMFjeCvp7gQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9a964ad56182740ea09b87f7e6db4197c6756e48 commit 9a964ad56182740ea09b87f7e6db4197c6756e48 Author: Mark Johnston AuthorDate: 2022-06-15 14:47:13 +0000 Commit: Mark Johnston CommitDate: 2022-06-15 15:39:10 +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 MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35448 --- 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 4a6c1d5f4e7f..fd9985f51bf9 100644 --- a/stand/common/load_elf.c +++ b/stand/common/load_elf.c @@ -211,8 +211,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