From nobody Mon Mar 07 15:43:30 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 EE95719F0473; Mon, 7 Mar 2022 15:43:30 +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 4KC2mf5cvyz3qdZ; Mon, 7 Mar 2022 15:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646667810; 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=p5gOERl6WW67PPNSwk+YOpGpzS8MXX4ILjfZU6pl590=; b=CscYjyteYzo9qGH811zJyQoGdrtSY4wvOa2sHvOyAXfBdyMXDIjMSvYIGwoAIdV6M7zc95 cf8dNbFaaadKgRxz7EQ15bhWqQ28PYuohoMbzgBruvMQYIlGYCw/HXEH4FreHOp6tQggfB AdeA/+yd531bLq9mEoKQIBSPMxfZ+DJJsnJfTEVynn1F0+KjkHZIqZPFBH0hWg/7Nx8wxr Lmcg+4LvzSo3yVSbv9VV8SOrXGn7AXG3UzqkPBFJDWoywPGSKIPnXKa0h1I0lnfVRpntzQ e28ZGFDg9JSHpIOBp7tKtE4F0d5bPZcxVIbOXZ92pJSZ0mz28tAHT2igHFhkvg== 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 7EA802E3F; Mon, 7 Mar 2022 15:43:30 +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 227FhUjv048372; Mon, 7 Mar 2022 15:43:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227FhUGt048371; Mon, 7 Mar 2022 15:43:30 GMT (envelope-from git) Date: Mon, 7 Mar 2022 15:43:30 GMT Message-Id: <202203071543.227FhUGt048371@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: 8dbae4ce32bd - main - linker: Permit CTFv3 containers 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: 8dbae4ce32bde42daee050ccfceee5eb2d306786 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646667810; 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=p5gOERl6WW67PPNSwk+YOpGpzS8MXX4ILjfZU6pl590=; b=k6Vx1soMzdGnrHUQbUj2PtIrDtqVQkzdaT6+/z15lskdIIz970WIayyjQKGsWROvyGRuLY U0bR8ORcK0P3rtHrHWeuNTnyK4PTPMhb7QTGK/dw5lPie9NtPftKJflkoLkaV2Jnqn7FS6 4Vaj8NizarrL4YUdh9u5/ZNFKBzcpcX+IDreynSZ+a0GVabPVBkMXNKYdidaw60XNicDVX JV89Zn7zLFdanQZR69X9oM5xAYnsi+RSgJcrMOaclHCu6gpT4ivPKIcOmU0Dv7FQ95Wb/c yx90h81xeBT/R3duGuNG5t4Pqg4LNAitWuth6WnLZZ9F5+ZgGCQnAtGQXx6aEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646667810; a=rsa-sha256; cv=none; b=BH4Nbo7AH0P8SX7W4omgTBzL1j+ji4rzSKODFFp5C8pT+sbSfFNarwUILhtdlqhuZWxVey BLGXeU4+OYd1dCwW3w1ebl/fAJTb9Rq7Yl0zN4wppUibf5hRLWNLJiVcrtZlQBVrIRfcpm 5QWnQpH4J+A/m1XFij8v0dPllCWhTsKpudl6vlKfgzySnQtlmGRcsukUVXKkRh/+RCPIjY afFWezIwZeqHpJ+T0Zd4O5w3M/K1fGyE+Cu9qqkMKhg8vWzAb6PqoRG7Bp0+AFX6rh76v9 Da54G3BRlcv8xvcf0MbyN1dnJ9Gf8wSdqSra/nUSWBfpynQFL1YuWAI5k9//gA== 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=8dbae4ce32bde42daee050ccfceee5eb2d306786 commit 8dbae4ce32bde42daee050ccfceee5eb2d306786 Author: Mark Johnston AuthorDate: 2022-03-07 13:53:05 +0000 Commit: Mark Johnston CommitDate: 2022-03-07 15:43:19 +0000 linker: Permit CTFv3 containers Reviewed by: Domagoj Stolfa MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34362 --- sys/kern/kern_ctf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_ctf.c b/sys/kern/kern_ctf.c index e9a4f98a98dc..aafa75eff097 100644 --- a/sys/kern/kern_ctf.c +++ b/sys/kern/kern_ctf.c @@ -182,10 +182,10 @@ link_elf_ctf_get(linker_file_t lf, linker_ctf_t *lc) goto out; } - /* Check if version 2. */ - if (cth.cth_version != CTF_VERSION_2) { - printf("%s(%d): module %s CTF format version is %d " - "(2 expected)\n", + if (cth.cth_version != CTF_VERSION_2 && + cth.cth_version != CTF_VERSION_3) { + printf( + "%s(%d): module %s CTF format has unsupported version %d\n", __func__, __LINE__, lf->pathname, cth.cth_version); error = EFTYPE; goto out;