From nobody Tue Nov 01 20:33:46 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 4N21vH37F8z4hD4R; Tue, 1 Nov 2022 20:33:47 +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 4N21vG5lRyz3FZ7; Tue, 1 Nov 2022 20:33:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667334826; 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=kw3I0EI3fDN1cBw5G2zU4Kt29+CBWiRE9PryIwWxNfI=; b=j4kWN+/6zRGE+419pob8XW30gmSXyOoaq79dbg0Xl78dd9GKVVjgyXKVsN930bomSAEk0u loMlc5C7nqBE4PnGZAJHJaBGrcwifMUEyvD2rUpG7SeBJqu6AatpmxC//6davdVNy8v+an z/hbXr1MbUQ0p6jcbFih+8a2wV+NGhE8HGOFVYipLEhzJu3YTeJ6aig7jL1C0PjALVB82E zNbX3ooESxarZUsewotme+TTayRoCHsVP1RfCUUj1vfwflZhduwfOAq51UR5JFDIieZ66E 6/fzwx56Fjp32gOsEOWL0KvJ/KfHEXZ/eVvcFsq4TEpJOZAWoihwdvbZvhKDMg== 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 4N21vG4pSlzVBc; Tue, 1 Nov 2022 20:33:46 +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 2A1KXkmv026401; Tue, 1 Nov 2022 20:33:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A1KXkH1026400; Tue, 1 Nov 2022 20:33:46 GMT (envelope-from git) Date: Tue, 1 Nov 2022 20:33:46 GMT Message-Id: <202211012033.2A1KXkH1026400@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: 1ee7e4ba70e1 - releng/13.1 - loader: fix elf lookup_symbol type filtering 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/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 1ee7e4ba70e10e0ac0c9c144ad0301ffeca8824d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667334826; 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=kw3I0EI3fDN1cBw5G2zU4Kt29+CBWiRE9PryIwWxNfI=; b=qzsPuT4tuA2Y0gu3XcEgE9JkhEy+lQnVJWiTxnAuV6QLkJV5oygdXZzUXNFrzwMN/p/msG qe6L9gsDRf3XCELxF+MxBQwh7yjEFSh+4ti6YOgNP2MY+fySyH9e43vyJiCcn5TmfUIWMY ZzS5LqU2u2NFtaZkEOzEX/p5xdyUT3sbXwxnE+BUD/ueDVVldJqE1JZD66gfkqFxKdxCzi uD7U/f6GP0Xr7fjXbpjCmbcgchVUwI7Pzz4F1WtAynQ0mzbP3GjRyG0oDpLJEAq+O7m5tU ip7OwU7CMvIarSRwtnQ8s0wDr38hhxAcTnDAYdCBmbJC8YoXrWrqbFHwPs9Zbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667334826; a=rsa-sha256; cv=none; b=bKJ/CFImZ9ouvTyLeyCDh+kbCXEynP7R/bqcHELHq1AQDqbmTyS1+97x0f57Y4lVXsRsqw N08XcWw3fShPdGG2rHTBC62Xpae1AZCTIVyLlGZi2q7T1qVdxZj4CftSxpJ3kHOzhjwNhW kGC7J/IG6jb4GiV+elidPqz95alC9prO0yfLFPcZ896utckEaCz2aFfyCyNX5v1iJob786 TjZGO4aibqNwd/IpE/RbgHZ8O0Nfrk6P2O77sawQ2nsYt/KJklivHI3aXfcgbR1X22xN9Y D3bH154RGrWD0qolBMWsZfADYZZmStC7fMToJa1VHWLv0oW44+CV/idfA9caVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1ee7e4ba70e10e0ac0c9c144ad0301ffeca8824d commit 1ee7e4ba70e10e0ac0c9c144ad0301ffeca8824d Author: Kyle Evans AuthorDate: 2022-10-14 03:06:13 +0000 Commit: Mark Johnston CommitDate: 2022-11-01 18:03:25 +0000 loader: fix elf lookup_symbol type filtering The existing logic doesn't seem to make much sense, as we won't filter on the type if st_shndx != SHN_UNDEF. In practice, this breaks booting 12.3 kernels on newer loaders, as they do have a `kernphys` symbol of the wrong type (NOTYPE, rather than OBJECT) -- we end up deriving the wrong value for copy_staging. It's unclear if this version makes any more sense, but it seems to match what rtld's matched_symbol() does. Loader doesn't need to care about STT_FUNC w/ UND shndx, because we won't encounter those; in kmods, undefined (kernel) functions are NOTYPE. Approved by: so Security: FreeBSD-EN-22:27.loader Reported by: Christian McDonald Reviewed by: imp, kib, tsoome (cherry picked from commit 0701dbda94f21de8ddab3113f79262a26cc7b96c) (cherry picked from commit 2b31059ea701957584e68a75857206d80a230211) --- stand/common/load_elf.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/stand/common/load_elf.c b/stand/common/load_elf.c index c75567b4a560..9e47d3db3828 100644 --- a/stand/common/load_elf.c +++ b/stand/common/load_elf.c @@ -1259,9 +1259,8 @@ __elfN(lookup_symbol)(elf_file_t ef, const char* name, Elf_Sym *symp, strp = strdupout((vm_offset_t)(ef->strtab + sym.st_name)); if (strcmp(name, strp) == 0) { free(strp); - if (sym.st_shndx != SHN_UNDEF || - (sym.st_value != 0 && - ELF_ST_TYPE(sym.st_info) == type)) { + if (sym.st_shndx != SHN_UNDEF && sym.st_value != 0 && + ELF_ST_TYPE(sym.st_info) == type) { *symp = sym; return 0; }