From nobody Mon Apr 18 16:39:29 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 878D511D4704; Mon, 18 Apr 2022 16:39: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 4Kht1t18c3z4v7k; Mon, 18 Apr 2022 16:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650299970; 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=fgJoBjKCucsfjr1R8JnaYK62+/QO7wDElLsokaQeN+Q=; b=K9JsAQ2t5mBzrnbrezrL2+cj5em7G/PLrz8BcI042CZZKO1RZEzgtl5+a5r8dN/X/tWW8W Ei1nW/RGL+l+kcELJortmXxlzDKxk1NoEIS152LWDE2rKtaAYxDV8j+/QYPDkPaiDz9+bO k9tfL/KFqdDnAIAB0njOg83pk3pXSJ87iu/Llb88S3wDwuyQTxWrkfEYYlReauQc3DEJKk IHS1pED7oFtn0vENPtPnSJReRiRx2abIScoRVMnuX9iLVK+gpasQ4huZeYTdVP6s2rPkhr lAi0FUUrw1F9jdO0Km+7s43zxQD+8VJAYEfFhcAU/YtLlAK+OdtcaDZ/u2lDjw== 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 B5B051645A; Mon, 18 Apr 2022 16:39:29 +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 23IGdTL2085805; Mon, 18 Apr 2022 16:39:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23IGdTeg085804; Mon, 18 Apr 2022 16:39:29 GMT (envelope-from git) Date: Mon, 18 Apr 2022 16:39:29 GMT Message-Id: <202204181639.23IGdTeg085804@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: 5444e90da19d - releng/13.1 - 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/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 5444e90da19d35da1d4df2103a32c2d24d59f54a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650299970; 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=fgJoBjKCucsfjr1R8JnaYK62+/QO7wDElLsokaQeN+Q=; b=ggK79i9UqosP+FmT1f+1AfFrAW2LRPM1/DavS6x/pAvdM3rp7242RWVwmOcHN9kgO6UfwI 3vwsGe/lmTxf9LMttRCKDgyWBL5YvQN4WJaXkW/O21rWWGxtySrtfCBZH0bd0b2SiE1PQm Sk0hnaYVZbEtINOypj2weKGQBrWgJUX5zW46itS766zXWlCAonttJ3doj1VVs7AF9Ookbu EVog2AyhE2ssE7FwaUD0LvOZHr34CTqlf583VWHrmAAsO1tYkS3LVMDr97jRG02U7BwJf6 LmrOF57re7vCG3wvQaOVXYX+7/5M28zVYUhFamNH8ZOcYbSg2I0gfgm+iswckQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650299970; a=rsa-sha256; cv=none; b=SD2VoXwTpFFKpH9qD3j7YddvJlUr6Ra0LDTcork+Ykm9ZbFLArVvfbiUV3DvHzoA9WeisE OEbSzdidxXvPvzei0WxJenpyKO35ueNckOfDrz6RuB/M/N4WbA6Bd39qtGgYmgwlEvyv8l irO+jtjEdyEhkfNiQsvhjiATXOXt6ov3BxgH08pxWG5TtCpOth28OplfJsgUSA3LZ7vjvd iBVYm9xZFMSwq/4C/XEAuDaNPdP62KF0N5zTgy7/GEyb3K7cvXim85b3R2abtTh9IPSleq c6ZnBSav8w7w1UgA6RYb9qkiMcX7ZzkLfAlKap9T0ZpKLTaTv+cRwKqHD0ugLw== 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=5444e90da19d35da1d4df2103a32c2d24d59f54a commit 5444e90da19d35da1d4df2103a32c2d24d59f54a Author: Mark Johnston AuthorDate: 2022-03-07 13:53:05 +0000 Commit: Mark Johnston CommitDate: 2022-04-18 16:38:34 +0000 linker: Permit CTFv3 containers Approved by: re (gjb) Reviewed by: Domagoj Stolfa Sponsored by: The FreeBSD Foundation (cherry picked from commit 8dbae4ce32bde42daee050ccfceee5eb2d306786) (cherry picked from commit 8409eb0251ce54b4a901b534198ca82f5048c7fe) --- 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;