From nobody Fri Oct 14 03:08:07 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 4MpWY41QMzz4fNc2; Fri, 14 Oct 2022 03:08:08 +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 4MpWY40tdPz3K9m; Fri, 14 Oct 2022 03:08:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665716888; 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=DIQRmk3mEdTci75V1HlIkgfjDiqPnWuqkI9PtTXxL34=; b=nHzxtE6wkPHJ1BXnBC/WFh5AyIb8HoEvMJPZ3Kj6bNldexpRm5fVl20d/kXayoO0+jUzW9 13/WVdXjCmrSS2NqXnfnlQBXJQ1iWUlEQAw8A7AXg3qxw8Hx2bAnp8h5IbJKZEm7Vrw1Uk J/rMVYsAp6i8p9rluwqeUWOrdC4xc35+qabZgh7t10B1HpVrfJbpJ9qcq0bLylX3bXacTn mZ21YDNV8GB5MGzNGjk/uGgn227xC/QZK/R9d0rRP4DYzDYAmaaojCRfxw8RTTnjDXWz/l IzFFstvq+N8IwuEl+Wr6a+Cw3PNUR3fVrjipINLvFdx39DL3baU1xTJaCNbkqA== 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 4MpWY36lrHzdNv; Fri, 14 Oct 2022 03:08:07 +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 29E387lN070091; Fri, 14 Oct 2022 03:08:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29E387mA070090; Fri, 14 Oct 2022 03:08:07 GMT (envelope-from git) Date: Fri, 14 Oct 2022 03:08:07 GMT Message-Id: <202210140308.29E387mA070090@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 0701dbda94f2 - main - loader: fix elf lookup_symbol type filtering 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0701dbda94f21de8ddab3113f79262a26cc7b96c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665716888; 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=DIQRmk3mEdTci75V1HlIkgfjDiqPnWuqkI9PtTXxL34=; b=jTjdMsTz2Aq4gF6jDN4u0ymNvP3rhgchUJKm4lNqINP+huF7ZzeNefCQcDWfehCfv1RuvT lTepBnMLYVtMxvFBuPL89bZRYx3KU0K6/dn1+z2GGztkgwRVxFMp31cvZdaYOvQVNaRW62 G6g05pUsRz17lDQ1Gqx0Vvi9X/nCTZ+um67kgiqE8AuS9BDYnixGHDv6qbFdqZweM4Eshb HLgnp8/qHV4mqONJekmUv2JZWRY5WN4svUHaAcYoVNoEuyGvOcV3R1bjqJD6cDMHQZ/sb5 WQomLfazzanaZMYCgb8MwxNTpnGYo6E1PFrGboaEt+jdmwptiP7Jqe2/Ie512g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665716888; a=rsa-sha256; cv=none; b=R+sg47RbhT21ryZcpTu7bhjhSRLBBdj47/4dKrj4m+K8rs23zfRWc0f5mzuxjxjVaXg827 5ALV6YOWRx0oyPx4qwto0QJd26xSOO1IVxfw/dF6yLQEm3CC8ofBb7pxzGmOKu8QUidFxE Dp4JBmsHZ3UyvRxa1rW/4ECM5Fa/Okryt3x6srW7nwFqhbWImyRNHXWeVUaKgSjMi+/0MC DkgxLydW4yKfX71ZIuzkMC3NFYAA82x/c5maNRoP44BZW7J3CtcYJySl2ScZnrKRexyF1l rqYp9yWamU7RCy3kg217Wpx3I32Nm/O5mKXPvsoE6d2GvGD4vg59SBJFWO98eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=0701dbda94f21de8ddab3113f79262a26cc7b96c commit 0701dbda94f21de8ddab3113f79262a26cc7b96c Author: Kyle Evans AuthorDate: 2022-10-14 03:06:13 +0000 Commit: Kyle Evans CommitDate: 2022-10-14 03:07:52 +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. Reported by: Christian McDonald Reviewed by: imp, kib, tsoome MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D36975 --- 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 463578ec3a6b..81b9e3e7ee9f 100644 --- a/stand/common/load_elf.c +++ b/stand/common/load_elf.c @@ -1262,9 +1262,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; }