From nobody Thu Apr 7 00:31:02 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 19E581A94DF0; Thu, 7 Apr 2022 00:31:03 +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 4KYj3V6vyBz4snm; Thu, 7 Apr 2022 00:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649291463; 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=FsS0N0JklOFP5rRKqzo6/7ZTo5YMepAaOfL6uEjAee4=; b=GoQrczlbt4pf31pU6k+u5KQB2oFKPvlLllLB9tSrCNJxVBcwTigs0M0Ngg8OXveN7fUZiU wMUlLqXK/EHR1j5dHjdSt2Sb2Zf/cKIm7+Jsl+9DSvjxrKEJAC40gAHzYFt1V0xPPl69Rx 3PYgf66zRDKqIfp3lhoVL04d+zFdodf0Eo7xq7eQlDWsxqCnS4Zo8OslWKRKqieeN6owxR 5abwuAj99k31vgvdWMrRzJibMYMpNdtRT5QrljDHdso5abgiVvgAYhasTtztk1WMHJLqky 7cXJXoOhUPaE675V0P8Lv6YdJl4UAxJ+JE2hQeTrhWJxzNJ2ujhtEuFjfYAnvw== 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 8B6762557D; Thu, 7 Apr 2022 00:31: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 2370V2Aq072793; Thu, 7 Apr 2022 00:31:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2370V2Zc072792; Thu, 7 Apr 2022 00:31:02 GMT (envelope-from git) Date: Thu, 7 Apr 2022 00:31:02 GMT Message-Id: <202204070031.2370V2Zc072792@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: 8409eb0251ce - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 8409eb0251ce54b4a901b534198ca82f5048c7fe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649291463; 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=FsS0N0JklOFP5rRKqzo6/7ZTo5YMepAaOfL6uEjAee4=; b=sbOxX2kXxW/WwLyidTZuYGAtTSXraBPqLOaYPXthZZBipeZdwWAefYWrbzE/9v85w3bDL1 AXohBrQy/7XjU+r3VHfb/i4t+XMa5OuuhC6BP1hj8EYL+8ndcMUQLoZUJjmPYJ+JJv0EsC dhjQ706LcMSid1dv8Qo9jfpev/Ik1hUQSKEAavoQMxcFvUAsTNGJ9f74bol/JhB6BlZvWE 6aDrMzkWjR/U7cU/E6B5UD9KwQPuOSmcA5t8V8EOOBvVQaup/vw7LCpNsKZQBIvXR6PPFr LH8T78bDI76NZvSu8In7H56z89uX3/5XSs8e2kLDMh2pz+S3PurcFUX6TsOJkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649291463; a=rsa-sha256; cv=none; b=qHwwSwJksrLwa1biVvJvmqTRgEi0fHWva8mvGLDTbM+ul8twMXG5X0A5EkITStuqkv0o6U krSI5TFn9crzJPzujm0nPgaHUDExTbpLia53Z6YujMWjaqAEne7EoVrAbBtLCGUr44lefD L7LUzbJoJdlZ1VUxupNh7Xt0JZ9fFmo0M4K7ukaossAyWHsm7XI9jHG0oeFmhSRl+WaZoB n+wTDs6czIq66L3e2vbWWPkqCS8H4ABqRFmopndaZOtCGkzKhleWH1p1m4HhM1POGprG5y ZknyqnXwNJ+tfgzllsO6SBzk9OtURky8XUJj0z7DNvtBwj7oc7HGgJ2kOPwQjQ== 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=8409eb0251ce54b4a901b534198ca82f5048c7fe commit 8409eb0251ce54b4a901b534198ca82f5048c7fe Author: Mark Johnston AuthorDate: 2022-03-07 13:53:05 +0000 Commit: Mark Johnston CommitDate: 2022-04-07 00:30:44 +0000 linker: Permit CTFv3 containers Reviewed by: Domagoj Stolfa Sponsored by: The FreeBSD Foundation (cherry picked from commit 8dbae4ce32bde42daee050ccfceee5eb2d306786) --- 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 55e73b78c8ed..00eb6aaffb51 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;