From nobody Mon Feb 12 03:21:55 2024 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 4TY8rh0nRXz59Kjl; Mon, 12 Feb 2024 03:21:56 +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 4TY8rh0LRZz4xfq; Mon, 12 Feb 2024 03:21:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707708116; 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=mX6OW0GK+WNU7YIfXJOyVcXmq29SwdP89Pv9S0cdt4s=; b=JQc9Iq3+4bbsGA21hUlLMY4O+QCef6hIvdsvVfDDavxn6P77sR1wa/DtcMwCzzkR+/ZeBh QgJrmyR5vZ4Ip/2qbhJ6Ptwdnk8itarfYIbK4JxmnJe7/mkey+nih33CWVac+AIvne9Zfu n73EX3BnQ2uE2/d7h+Rp11XjAFbSL/k+utzF0EhtC0q95sQG7i6/5gzXVELwZGxYJiQeRo IRBbCIVkL1hbUrm/pKTZw84hEYiFqrcTbWG/dKsdvWgo1a7CRg57enQoQLYQid9+mHnd1y AAY5BqWtAueXqjpb0aGHOof7MQgHM/m9hqUsajjF6thF1oV3QoXAqbSyXFSDKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707708116; a=rsa-sha256; cv=none; b=SIhDQ51zCVzGhSWKjpsDpKa1CMsPlTkz1hrPatgl4Gees2qoEC1mpZ0dDNwmwEgIsnXR2j R+4e98utb6MKh75P0Jm3vFN+95CSkS6E6dvcMNfHDpfrXjx0mTyFHsdZaKLeT8rg3/SJMB 7tnu35Ql1aQG09cUjKkt+MNcs6+bTM48hLC1zojJzHIEcvyVECFk3YDcwNn1p3gwXvxjFE t+mMGZzr0vgseKPG8utaSdy7Nzz+FgN956AKBwy5JEEDpLHdiJ2TznPTF1joC5LIJ61n1P LD2OIdWK+qSGEIdLTDV5bRD7MbG617ALS9c3DvM81q9VJsQA7tw3ylnzFiiQPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707708116; 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=mX6OW0GK+WNU7YIfXJOyVcXmq29SwdP89Pv9S0cdt4s=; b=OODMDLr470f1En5zmifsMJJ/hTL3pVeQ59EJnO3kWXH8xjUXhqj6ouN+ZDVkMcl5EY2p8J YmldGbEsIj2XqPSRXw6bUEIU/xJeuN2LAOaJM7t2Y44vP03mAyow6uC+743R1uH31YEp10 NPAUqXLeyCQWo4GEVjmWwGHDAPJDolUrWXWyNFrqFyh4734yF/7qv5IeRFBL996PxGXvp6 EtK4SzY1ZrA8evCB6LpxsaYUNYQqG2g0/kOIsbCWTIpc2T6+2hzVUmtlNLeVExL4WraedI 49uH4R7cDmQehHgh0Fx36YxIfQrrjzXMUt4SdkmqG02tMxOyeQbiBj9QKRaVrg== 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 4TY8rg6Wh3z1PkZ; Mon, 12 Feb 2024 03:21:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41C3LtuE064335; Mon, 12 Feb 2024 03:21:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41C3Ltp1064332; Mon, 12 Feb 2024 03:21:55 GMT (envelope-from git) Date: Mon, 12 Feb 2024 03:21:55 GMT Message-Id: <202402120321.41C3Ltp1064332@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: a1f798b54906 - stable/14 - release: Add AZURE to CLOUDWARE 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a1f798b54906f03c603d7faee827d12ad52d8b41 Auto-Submitted: auto-generated The branch stable/14 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=a1f798b54906f03c603d7faee827d12ad52d8b41 commit a1f798b54906f03c603d7faee827d12ad52d8b41 Author: Li-Wen Hsu AuthorDate: 2024-02-08 05:49:01 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-12 03:21:14 +0000 release: Add AZURE to CLOUDWARE Let Azure use the image directly built by the release engineering team. Reviewed by: emaste Approved by: cperciva (re) MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41906 (cherry picked from commit 63007e46110d7f7a1f9d48fbac99f8a5bc166456) --- release/Makefile.vm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 58703de16cf3..3a3b3bcd5f9d 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -17,7 +17,8 @@ VMDK_DESC= VMWare, VirtualBox disk image QCOW2_DESC= Qemu, KVM disk image RAW_DESC= Unformatted raw disk image -CLOUDWARE_TYPES?= BASIC-CI \ +CLOUDWARE_TYPES?= AZURE \ + BASIC-CI \ EC2 \ GCE \ OCI \ From nobody Mon Feb 12 15:23:50 2024 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 4TYSsg149jz5B0sy; Mon, 12 Feb 2024 15:23:51 +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 4TYSsg0Ln5z416r; Mon, 12 Feb 2024 15:23:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707751431; 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=/X5teVZxf015ahKgK6fgB/U/uu7Z9a4GIJ2TEhAKZ+A=; b=HCHzANAHf9kXgKHpCTw3qMn/AwteJiPOq2uF1lgQYFimVSla2LdcTDSLaNL2CM2ZQR2ArX 4Aktlvf2rLEZEC6q9SNAqczuCxJtksojwmyLzbZYwrK1U0uWk+cAf8ZfgmycY46mtl1c7P rJgSVxJiU2wiMfMJZFWxWS4D3B+ldNgMNt0NBZLUEuhfbDyVkpMGagdiWIE/oOySsfnrtH hDVGyoEU4W71rl9yqL/wWFj0rDLm35JqzelU/e9T7r+TWfQVyw/hzSiS8vzskN/2cXY+CE XbhJEQHb5N0HGCMmeb4p+6Qs8jHwGT6iWEr1Eni3c/KavSNMfvBM4VoxIJu7Sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707751431; a=rsa-sha256; cv=none; b=oWI/gaORB4Pn9afpEuMF0s4z30xYNNPag8bZmdyab7aDNME50ecEovsD3+1Ow9Ty1TN/th fyiZD0vqTa6tBY/gx2ZU0L2xPWnMPKx95pgvf025zKUQ3yiEJE7eEqyxUZ38oWY5XL2Ah7 vwkCR5y3g3nwSpol2ZTJExgisSYm3bEC5zFfRE96QVrtNzsb47ho54jOQS+rM+rGdz6EPq xfgvjnP1pbkCvAwaDB4nwy0POsjql9jsxLeXm5dYkocSrpi/uvnsTkjrTEpvuKMhKc+ak2 Co0TUX1vpPwGaukTc9K+vQYmGnf0YRju6oPA4an3h87iNAEW7fjMekJ4zjtUzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707751431; 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=/X5teVZxf015ahKgK6fgB/U/uu7Z9a4GIJ2TEhAKZ+A=; b=sHkORqkfkWdxVsqYmJbHL5sXVQVVOfP8C5673va4WQ1RhtIllJkZXNepvJNdaTUY5iy6f/ /PkFDhZfp3xCRUDdTKcEX7HoTaaM8tQH4Y4ZwOZBqSEFFBwx2GMktX11jOFGkxZzD3oS+O CaUYjnTNkqXLO15oG/2k/mM9TyZUTCxaQ1lPf/d/8fQcOxDqR1LvH0enNVE+djjynqS4F6 ucMtALrPEbIUrw9V2CWqIYredUqyn2TIOJZ/lsw3+gGvrVLwmM3/Rm/ZPlKkhezsr+F7N5 gNZQgUeQbfSSBuUhdgSY29O9b3I1tvCzE374ILXKSDjkXsZp2SXEhSxQZ7ei2w== 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 4TYSsf6VRjzXY0; Mon, 12 Feb 2024 15:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CFNoi9075508; Mon, 12 Feb 2024 15:23:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CFNoFh075505; Mon, 12 Feb 2024 15:23:50 GMT (envelope-from git) Date: Mon, 12 Feb 2024 15:23:50 GMT Message-Id: <202402121523.41CFNoFh075505@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wolfram Schneider Subject: git: 147ab264373a - stable/13 - do not expect mandoc(1) to terminate in finite time 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: wosch X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 147ab264373a61eea9f6bd9ffd06b399a186f7ef Auto-Submitted: auto-generated The branch stable/13 has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=147ab264373a61eea9f6bd9ffd06b399a186f7ef commit 147ab264373a61eea9f6bd9ffd06b399a186f7ef Author: Wolfram Schneider AuthorDate: 2022-12-27 17:04:04 +0000 Commit: Wolfram Schneider CommitDate: 2024-02-12 15:22:55 +0000 do not expect mandoc(1) to terminate in finite time PR: 266868 (cherry picked from commit 433c5a8ae42f0487cfe860af1d291ec3c7d009f7) --- usr.bin/man/man.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index 114ea9d7a0b2..1d9eb423b707 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -27,6 +27,12 @@ # SUCH DAMAGE. # +# Rendering a manual page is fast. Even a manual page several 100k in size +# takes less than a CPU second. If it takes much longer, it is very likely +# that a tool like mandoc(1) is running in an infinite loop. In this case +# it is better to terminate it. +ulimit -t 20 + # Usage: add_to_manpath path # Adds a variable to manpath while ensuring we don't have duplicates. # Returns true if we were able to add something. False otherwise. From nobody Mon Feb 12 15:49:36 2024 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 4TYTRN2HWZz5B35F; Mon, 12 Feb 2024 15:49:36 +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 4TYTRN1nChz43d2; Mon, 12 Feb 2024 15:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707752976; 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=+6zewjqAezCa6FDjOOwh2RPKgxt2ltFBQ7q4KMOUvmw=; b=fmEPO7QKbhAFKoGmX0X7O9WxXpp8Ga/LETYKApx1inT3GXQWgYwWYbtwfwlDkpfoLQjaNH yVsRPgjsx5fcXDkZBqn4EMohKA+/QMjfi/EqOTliDmVlpXzuogjn/WKbYB2hNzdQIATCgh dua0SI/0ZL/voLn0gTZNHkR0voGRJtJ95XgKWuxujW7t5sRLuMs8EmpGDBFVCWIjhf1L+O g4imaLnzdHmZdoZ4gstJkK+grhVTpJ8D0Y6DAqyahm9AoK4GZaf7NIzMEMp/zHm13L+KRU rNLV+sHCp6zHwUBfDwispUJBefn/673IE26Svuw2lgbScguX7EtChOeIJ5lM9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707752976; a=rsa-sha256; cv=none; b=oJfujimVf+3+Nubh8pYEXcGjcBRfk4XMsSL4kTPhiYa6GSeMilcn78QBrzUO8YxgJWpbBe jSOZa+3DqdIdYu6Xvo/ERKlYNVQw1oeXv8UdNHPxuJLPk1ZQ3HLSLlDeSbwboIFii+DTbL jiDlvpO6VSJcU51pRKE13C5KMRrmnqmFs8aPmSiLYExKkX8vs7Da0F4RYp2IsU1ixkox2Y z6NLnBWJ2pas47MDDcO0k50NFLIg3OkqE7h00j9G+yxergNfeAtwD6I/X+OSvqHmut70EA lzif34UeM7iiU6t3foTNeG1i2jobZu5us2NQinDGCbKRmx+y4vxYCPbIuEiCWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707752976; 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=+6zewjqAezCa6FDjOOwh2RPKgxt2ltFBQ7q4KMOUvmw=; b=mWpaDWyh142bGfN/B63OP0lsZ1HdI3lwd8cdo18J5SFxwAAD0t7TszjjsSNM6TxJV6qOGg vdklsDFJCIRY0+7SLWELS3983HQDdclBFCLWnpb884DhesFZmAXtNzTKcaIEIaOo7i+i81 CO4la6AZT2gB1Nkjf0v4PCtI6lAEHceyFdVcF+OuYiWZJrorRlzo1YPuk6rtVJOlrnyx0l h9yiaauz/5CPSDrpn7URd43zCocbqMZkNnzph7QUjL16wpIPFy9lS7V4K4XR+a+87Vk25s RB3XsmxTSeMr3LX5clIiH+JNmY+Ktx5C4aza8QFZULgfcQO8HnQkFX3hDhAAzA== 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 4TYTRN0r4PzY2Y; Mon, 12 Feb 2024 15:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CFnaLm010088; Mon, 12 Feb 2024 15:49:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CFna3d010085; Mon, 12 Feb 2024 15:49:36 GMT (envelope-from git) Date: Mon, 12 Feb 2024 15:49:36 GMT Message-Id: <202402121549.41CFna3d010085@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wolfram Schneider Subject: git: b8f3f97c5ce2 - stable/13 - man(1): Support custom sections 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: wosch X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b8f3f97c5ce240c156fab0205e0e3938196ed1e2 Auto-Submitted: auto-generated The branch stable/13 has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=b8f3f97c5ce240c156fab0205e0e3938196ed1e2 commit b8f3f97c5ce240c156fab0205e0e3938196ed1e2 Author: Wolfram Schneider AuthorDate: 2023-06-27 13:51:24 +0000 Commit: Wolfram Schneider CommitDate: 2024-02-12 15:41:01 +0000 man(1): Support custom sections PR: 271830 Signed-off-by: Mohamed Akram Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/764 (cherry picked from commit 8edb6fb572f29578877fdac3c30f718e589a0360 - needed for further bugfixes) --- usr.bin/man/man.sh | 76 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 28 deletions(-) diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index 1d9eb423b707..6ddeb62a3764 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -68,6 +68,25 @@ build_manlocales() { decho "Available manual locales: $MANLOCALES" } +# Usage: build_mansect +# Builds a correct MANSECT variable. +build_mansect() { + # If the user has set mansect, who are we to argue. + if [ -n "$MANSECT" ]; then + return + fi + + parse_configs + + # Trim leading colon + MANSECT=${mansect#:} + + if [ -z "$MANSECT" ]; then + MANSECT=$man_default_sections + fi + decho "Using manual sections: $MANSECT" +} + # Usage: build_manpath # Builds a correct MANPATH variable. build_manpath() { @@ -547,10 +566,10 @@ man_find_and_display() { fi } -# Usage: man_parse_args "$@" +# Usage: man_parse_opts "$@" # Parses commandline options for man. -man_parse_args() { - local IFS cmd_arg +man_parse_opts() { + local cmd_arg OPTIND=1 while getopts 'M:P:S:adfhkm:op:tw' cmd_arg; do @@ -594,19 +613,6 @@ man_parse_args() { do_apropos "$@" exit fi - - IFS=: - for sect in $man_default_sections; do - if [ "$sect" = "$1" ]; then - decho "Detected manual section as first arg: $1" - MANSECT="$1" - shift - break - fi - done - unset IFS - - pages="$*" } # Usage: man_setup @@ -626,14 +632,8 @@ man_setup() { decho "Using architecture: $MACHINE_ARCH:$MACHINE" setup_pager - - # Setup manual sections to search. - if [ -z "$MANSECT" ]; then - MANSECT=$man_default_sections - fi - decho "Using manual sections: $MANSECT" - build_manpath + build_mansect man_setup_locale man_setup_width } @@ -780,6 +780,10 @@ parse_file() { trim "${line#MANCONFIG}" config_local="$tstr" ;; + MANSECT*) decho " MANSECT" 3 + trim "${line#MANSECT}" + mansect="$mansect:$tstr" + ;; # Set variables in the form of FOO_BAR *_*[\ \ ]*) var="${line%%[\ \ ]*}" trim "${line#$var}" @@ -972,13 +976,29 @@ do_apropos() { } do_man() { - man_parse_args "$@" - if [ -z "$pages" ]; then - echo 'What manual page do you want?' >&2 - exit 1 - fi + local IFS + + man_parse_opts "$@" man_setup + shift $(( $OPTIND - 1 )) + IFS=: + for sect in $MANSECT; do + if [ "$sect" = "$1" ]; then + decho "Detected manual section as first arg: $1" + MANSECT="$1" + shift + break + fi + done + unset IFS + pages="$*" + + if [ -z "$pages" ]; then + echo 'What manual page do you want?' >&2 + exit 1 + fi + for page in "$pages"; do decho "Searching for \"$page\"" man_find_and_display "$page" From nobody Mon Feb 12 15:49:37 2024 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 4TYTRP308dz5B37Y; Mon, 12 Feb 2024 15:49:37 +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 4TYTRP2VDCz43lx; Mon, 12 Feb 2024 15:49:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707752977; 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=ZbtZZ2PSs3URtZg4cXsdeg8HYbb2sfaaZO5TJIMre1I=; b=omNd8iqLIxt5kgbHCsspcTXoxsbbuluV7vmRR2iEBmAobjTYgIyQgTZK9RhJMUzwWuQaEf zPikQZeCPHRLu9DfHlpqE07VcVuyFhkh3U1lXdymvmAu7pav/8Y0/vuZuFpayF489Th4YM 8rFaCUxH77P/vJonqBL3fzA3Poa7dJHojOvgFj7FZ3wOw7JaIwbJsCYW6uvii8EiSrBszu GdkiOFs4SxN18VMBYiDAZwzdACZAVjaCKRhqlUgUIFjHaO+nJYMVNgp9Wa/aOJiiPrf79X p6WnVn6kw/Yt1FsOsXHR/MZnYGb4gGs8qMZdgWiWJRvtUjvfp4mlw/be+loKww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707752977; a=rsa-sha256; cv=none; b=OlDVIArHBcApPypFzQy+1/7WXjSuxsYHtqP5lH7W5DX89TdEXMLknTDXuyYVuLTkNG4Uri /2vnVETi6QAzNkPpH/e5sdDjUFvxWnJV5msoUMN+ZYWW11bHnNxveflXRF/YVA1E8AsUaH RCp6jWRvWzIBuqbH/VL5QgenxGzCJqgCLWcGEkMUq3sVQ8lAVNLnzQBmEtV4fRGHIDCDvm zvW+vZjujuo2UnVHWbX3N6wHg44HlKpJIDHG0TY/5eQx2FkjFwLLeKML694WFcHJO43Lwn nCWsA1YpqVPeRbd7mzIr/SHhdj1f96MFFbcKxSxSEMm38DgZPsGg0KJQ/LTK+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707752977; 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=ZbtZZ2PSs3URtZg4cXsdeg8HYbb2sfaaZO5TJIMre1I=; b=cxjBPsBBzFnbkg4cFLA/G1DgdBYTcDyHQSLXOVx+HFGBj6Bkc6qHv8z1MQIc+EWoT//0b+ /EOWA3a8Piiqtul/8chbmlmafnA6kGG4VErUn5cswWySpHRK59ovKZQp/yi7uMrgJxCetY 03yFuU/7jwC0GtDtFzH8/Nt3RqmHMfRLNpRsCj/uRoxAmdhF8pGIPpo2KUd2d1woTDwbk9 HyZOuygoMN+uFJSxgDEmGqqVE+OpSTB3VCNawuF9sfDYdA5lODznERPM2tk05eWYTwyAUA p7yRojBy2irnrysYXGTvdhDngqEGgwh5A3DCvqra/olTjd6HTHIQe52u/LrcUQ== 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 4TYTRP1XfCzYBg; Mon, 12 Feb 2024 15:49:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CFnbfk010141; Mon, 12 Feb 2024 15:49:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CFnbZD010138; Mon, 12 Feb 2024 15:49:37 GMT (envelope-from git) Date: Mon, 12 Feb 2024 15:49:37 GMT Message-Id: <202402121549.41CFnbZD010138@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wolfram Schneider Subject: git: ec4c6d7ebfc9 - stable/13 - fix using man(1) with multiple pages 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: wosch X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ec4c6d7ebfc91a2e6a06949451aaaad4bf582041 Auto-Submitted: auto-generated The branch stable/13 has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=ec4c6d7ebfc91a2e6a06949451aaaad4bf582041 commit ec4c6d7ebfc91a2e6a06949451aaaad4bf582041 Author: Wolfram Schneider AuthorDate: 2024-02-12 15:44:40 +0000 Commit: Wolfram Schneider CommitDate: 2024-02-12 15:44:40 +0000 fix using man(1) with multiple pages PR: 275978 Reported by: Mohamed Akram Fixes: 789480702e490818244af11279868ba4f3dabe6b MFC after: 1 week (cherry picked from commit 1e82d882ed3372bcaf82451bfb865483a409ab1f) --- usr.bin/man/man.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index 6ddeb62a3764..ecc73733b560 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -999,7 +999,7 @@ do_man() { exit 1 fi - for page in "$pages"; do + for page in "$@"; do decho "Searching for \"$page\"" man_find_and_display "$page" done From nobody Mon Feb 12 15:49:38 2024 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 4TYTRQ6Qspz5B35J; Mon, 12 Feb 2024 15:49:38 +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 4TYTRQ3yc4z43kD; Mon, 12 Feb 2024 15:49:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707752978; 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=O7UbtwYGKzcdUEClLPdcgZMIam1JQoQ55WHEuwLZH4k=; b=BXI3fp2lcjk6WSo+1P/26PdrmV9TYfEtME9eRVuvaAQjyhDY1/Qc0/tVLuB0kKADuLm3uc PxjfeYqnwnK3KHS5YrkodB7naEGg//eXmNily84slQzEFtFGif6IQWfMtmDslCggrTdBlv HCcwYr/p3dcoVYe0eHO50Ut2l8a284DVmrgNIgx7MCj9HOrgzFrMbBQ+q2IzWMQe/TdzB3 TQMd27mzsg6hm4ZPZxUsrQI2MjjTSYZLxmjHc6dSgTnjf4uOfUQIVR195WPqAf1li3fQ0R z5nNqrmazFIJ3Orv+cktBZeSDIzhaTbbE65iXMXqasA2uvJnpOdcAOzG3Hkm3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707752978; a=rsa-sha256; cv=none; b=iUtgu8NrqstwTliXH2wU2mRxmGBFwMSITSBW6lqm+BD3plVYRjAESLDxfYpycQDsNa8Viz 0Qk1RghVXKpdhpkkZCST3oBl6Kj4eFn/HQdApmvpXphbvYW7H90hcrDv+nwWl7UFY5ObOD /2NSHBJOkhArSJY8GXy893Vjdn7WeACXL0UHoNsEMGKRh1alUtB/XFcvmJMkmZy1lsm3zK mLG7GU4O0NK+cD1889B0RAk/G8AIwrbe0j5yQoS5AQR5mweedqsvgc3OHxGie0jjSwnprB MmT87+5KdUeG2FfB2R6e3/RJJHcfKf/0IBVpCp7fPAjRZxq9zvPQuOAxZuKsDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707752978; 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=O7UbtwYGKzcdUEClLPdcgZMIam1JQoQ55WHEuwLZH4k=; b=CbhVXFmIdXdpfzoC53eF+ZIVNNL7g04PhZie9r2lqD9wHHTRAwIcnRkKWvWk2uI9DiqAwz hwz17ZvKyLoQQB/8AkI2I18EFKOM+S/dHvI1KA4yJX/olTkeYkVssf2wzGpNsr05VWAY4h WdbYljEgFsgczBLbD99zfOp4tMDXlJnbauMrC6l1w2xOHCMJz9o8E6EmRYFJ2VAEH6AD+k Yq7hIVN6mPGiO8v45WjdjUYH8LPEG0uVjRt/ogpw+cvPvEjpAYsUxN9CQQGswBH5JLbrkL mN8e6uEOBmf2KUH98pjRPlWgFySKUoQK/q3Q/WeRQQiulbghpaWCHV+dI23BBg== 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 4TYTRQ2nrTzYBh; Mon, 12 Feb 2024 15:49:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CFnch4010183; Mon, 12 Feb 2024 15:49:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CFncrj010180; Mon, 12 Feb 2024 15:49:38 GMT (envelope-from git) Date: Mon, 12 Feb 2024 15:49:38 GMT Message-Id: <202402121549.41CFncrj010180@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wolfram Schneider Subject: git: 1024a7c061ed - stable/13 - man(1): support spaces in filenames 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: wosch X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1024a7c061ed5cb34f5f3730f70432b5c01c9a12 Auto-Submitted: auto-generated The branch stable/13 has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=1024a7c061ed5cb34f5f3730f70432b5c01c9a12 commit 1024a7c061ed5cb34f5f3730f70432b5c01c9a12 Author: Wolfram Schneider AuthorDate: 2024-01-13 16:16:55 +0000 Commit: Wolfram Schneider CommitDate: 2024-02-12 15:45:52 +0000 man(1): support spaces in filenames The globbing function in exists() needs to handle white spaces. PR: 275978 Reviewed by: kevans, bapt, emaste Differential Revision: https://reviews.freebsd.org/D43222 MFC after: 1 week (cherry picked from commit e3c7b76fa8105929ae9a785e5ffc44274b1b0a81) (cherry picked from commit 7169c947ab4150a539f2af6c9dcf3ab4344b0033) --- usr.bin/man/man.sh | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index ecc73733b560..8cce52148699 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -191,7 +191,9 @@ decho() { } # Usage: exists glob -# Returns true if glob resolves to a real file. +# +# Returns true if glob resolves to a real file and store the first +# found filename in the variable $found exists() { local IFS @@ -201,14 +203,16 @@ exists() { # Use some globbing tricks in the shell to determine if a file # exists or not. set +f - set -- "$1" $1 + for file in "$1"* + do + if [ -r "$file" ]; then + found="$file" + set -f + return 0 + fi + done set -f - if [ "$1" != "$2" -a -r "$2" ]; then - found="$2" - return 0 - fi - return 1 } @@ -230,10 +234,10 @@ find_file() { fi decho " Searching directory $manroot" 2 - mann="$manroot/$4.$2*" - man0="$manroot/$4.0*" - catn="$catroot/$4.$2*" - cat0="$catroot/$4.0*" + mann="$manroot/$4.$2" + man0="$manroot/$4.0" + catn="$catroot/$4.$2" + cat0="$catroot/$4.0" # This is the behavior as seen by the original man utility. # Let's not change that which doesn't seem broken. @@ -313,7 +317,7 @@ man_check_for_so() { .so*) trim "${line#.so}" decho "$manpage includes $tstr" # Glob and check for the file. - if ! check_man "$path/$tstr*" ""; then + if ! check_man "$path/$tstr" ""; then decho " Unable to find $tstr" return 1 fi From nobody Mon Feb 12 15:49:39 2024 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 4TYTRS0MGyz5B2kH; Mon, 12 Feb 2024 15:49:40 +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 4TYTRR4XY6z43bb; Mon, 12 Feb 2024 15:49:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707752979; 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=uEf4GKz7oV44ZySg0xJNFIZmJf9ohB4iJr5xyQdE3fo=; b=qiuFN8rDAN+dD2o487Al9ryNkpHcmMiDmLopaDZk4qLgRp+elIIhjDlfleR3ABBI+5CSbM x0fjdOH2psTLqD56Q76Ms55GMT6g4w9LPmc+q8Y+3Wrla0FANYt5RFOtTQhggmpKvdSYSi GfU3nDi36p8YvIDW/d0LHnke4IrRX/+DQshrsshe26kLT0Wk3uVAL8cLH/BC2FADNsr5Ss djFtrxefnfA5iJPzx5rbpXI3x3w8AsEKp0ER31Xid8+hi9lH3DDkECacZKJSy8NPyoYzSN 3K6mATXmGYpKYCQcGMLPC77RQ5/0kgJcsJv002vVAtbe1fsJBTIOPLG6rCLZQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707752979; a=rsa-sha256; cv=none; b=rP7jKdSVsD47cDT4nGumdlj2iihXoVnP7ThTCgiA+8XALUTwuDxWcNeoRAhvLB26JBSwvw aH0IINIBvuypAGbeYOIRKD5BdxdMrg1Zl8nnBybIw1QlofMIYoHJzKV2WOLpZ6whu35qvR VnPWJDt9u5sM8c/1TUYOjdjH7DIoulZGxj+mEY247xG+sSmbDJ1lVRFqKGbLgh4eAjYGUp DFDksa1Lj1hnB85fZAWFC/aLFkkTNR3pFzn0fF+bH8B/dRPIWxQduorNxUbO38T+92UaoC rcL1803MuWm91Ly0T9D1WjzAubg99oCZlfbZv6KjJayzf9JNmvhT4cDPLvgU0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707752979; 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=uEf4GKz7oV44ZySg0xJNFIZmJf9ohB4iJr5xyQdE3fo=; b=hptW3LBV85V+9RCrzeAbuaCqpKrK57pddz0P3xtb/A23vxpplDJxbRj50qdoB4gSf5GJJd +NOUp17wuQGVC4oNrVjIZ2s3wghL9aeNIBsrx7Kk8B0qRWDUtAPipeAVEwlVh4IsmR+0YI y9KHvWVrITN666iQX4B3V8b8LplQR2bAa4VUmVTZqoJVq1awk5zrlhqCrfhxOl5KLuyXiE QUpSXl3Fh4snTZa56w30AyI1iwgvNQkBL5KtWl7iHfc0zCMC9CNAmiT1DsXmxT2afj9YXo 36urhrgNbsqbUdcqrGuyarXs0LY+GyYOt29gc4wVE46bRshWM1kEtEUjsZoLSw== 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 4TYTRR3fLczYBj; Mon, 12 Feb 2024 15:49:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CFnd14010230; Mon, 12 Feb 2024 15:49:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CFndL8010227; Mon, 12 Feb 2024 15:49:39 GMT (envelope-from git) Date: Mon, 12 Feb 2024 15:49:39 GMT Message-Id: <202402121549.41CFndL8010227@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wolfram Schneider Subject: git: fedb7575a920 - stable/13 - man: support special characters in filenames 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: wosch X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fedb7575a9202fae644c8499cfa9579d5765e3df Auto-Submitted: auto-generated The branch stable/13 has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=fedb7575a9202fae644c8499cfa9579d5765e3df commit fedb7575a9202fae644c8499cfa9579d5765e3df Author: Wolfram Schneider AuthorDate: 2024-01-25 07:14:06 +0000 Commit: Wolfram Schneider CommitDate: 2024-02-12 15:48:48 +0000 man: support special characters in filenames man.sh needs to handle double quotes and sub shell character as '`' '$' etc. PR: 275967 Reviewed by: bapt MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43453 (cherry picked from commit b8a484ec343d163a40f7cf4a6026e880f992c738) --- usr.bin/man/man.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index 8cce52148699..ca9b002dfc08 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -349,7 +349,7 @@ man_display_page() { decho "Command: $cattool \"$catpage\" | $MANPAGER" ret=0 else - eval "$cattool \"$catpage\" | $MANPAGER" + $cattool "$catpage" | $MANPAGER ret=$? fi fi @@ -374,7 +374,7 @@ man_display_page() { pipeline="mandoc $mandoc_args | $MANPAGER" fi - if ! eval "$cattool \"$manpage\" | $testline" ;then + if ! $cattool "$manpage" | eval "$testline"; then if which -s groff; then man_display_page_groff else @@ -387,10 +387,10 @@ man_display_page() { fi if [ $debug -gt 0 ]; then - decho "Command: $cattool \"$manpage\" | $pipeline" + decho "Command: $cattool \"$manpage\" | eval \"$pipeline\"" ret=0 else - eval "$cattool \"$manpage\" | $pipeline" + $cattool "$manpage" | eval "$pipeline" ret=$? fi } @@ -480,10 +480,10 @@ man_display_page_groff() { fi if [ $debug -gt 0 ]; then - decho "Command: $cattool \"$manpage\" | $pipeline" + decho "Command: $cattool \"$manpage\" | eval \"$pipeline\"" ret=0 else - eval "$cattool \"$manpage\" | $pipeline" + $cattool "$manpage" | eval "$pipeline" ret=$? fi } From nobody Mon Feb 12 16:25:53 2024 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 4TYVFF2LmPz5B5l7; Mon, 12 Feb 2024 16:25:53 +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 4TYVFF1ggrz47lb; Mon, 12 Feb 2024 16:25:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707755153; 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=hnjpIpewbARPr92LvsYNgDOdcDXSRFod7AonqalXfMY=; b=tkjuu2KIf6NBQowT1xrKZ/vzi9QgHBjqTAlKDujNzr5Xh14H0xl/HIAh7b0RicOiasy0aH ayLm8q30GgUK1BSt1eCDQPqijImyVqOWbwwRcemMuJvpCceS+FY9Bujd0KZCJuVaEFgf53 +37c+gjqMX/jp7DE3xtEULLhF02cY/qQCThq8RBlvdmtc4EznNVyjhd3hl0LkLFeJsN4TC Z3Xl5mSWH4RpxATbjKLOXJciq/rqdaeY+y11HMmjKeMmNSLjiWiCrZkm994QSnv+TwEaDw PW/DwG2AhPfnw1r1k6DmIaUMSKLZM4F0AwEI4XgeRtONtRJyML6lERdBSsmllg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707755153; a=rsa-sha256; cv=none; b=aU0H6YzsOZOTOh+MwCEnC+y6aKD5X15B6/0sX9uQYyK00VwvFp0S0cVU4ahpOSWlbuqybJ pvUpgbmd/6/FKM2DKrUs4ijLzVPZllkn5MP2ZWrDCnrpJZcT5B58lsXCLUCsa8veNzkRCo GVEvLkjn+x+ZpM/QSneBNzN/jfxJ5zRHjkkw6MWvAMkUPGHSited6yu5H9m0icyfOhrjrB XSg/fYsQegTXAV6NWVAPl1YNnbDR1ga3joAtFMrT1MD+fDvXDg0QMTm/h8PXL7pKL6YsNO NjhGlp89fNgyDndjHfnOurLN/zRLIqp38h31NMWyFaR5aWi1R63bPb7Oi5eeHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707755153; 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=hnjpIpewbARPr92LvsYNgDOdcDXSRFod7AonqalXfMY=; b=NAYd++aq633nupH3Aw4vfXeVUc0JFhd8pi6pzAy7b6t1p9L6WUCHr8NItNf9VaTtYKEAcq y+E9tSfcHKXGjHMFfFCj9nsp1RckFQSlcuchk1xBE7VFv5lvsJP5X5YdKEcN+c5hMFRmyO Q23hS9lCql+XdZs41ER+R/zC2xV+ZSZOk5NhHHaGslj/kVVhSYUaSCcDJSoZ4l1LcUChUx e1osAM6F5mUjfeaWppRSETPYOCHJVRA06Mv4gm7EktuFk3FQ9+R+GVh4lJMV6RbbCVUY8z HLN6aLKoZu3mpYwDIV8gbuea2Xr5Idm5BVBHIsW7LCsZ4kQ3+PDYzm6RSer1Tw== 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 4TYVFF0jztzZ5s; Mon, 12 Feb 2024 16:25:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CGPrDE077340; Mon, 12 Feb 2024 16:25:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CGPrHK077337; Mon, 12 Feb 2024 16:25:53 GMT (envelope-from git) Date: Mon, 12 Feb 2024 16:25:53 GMT Message-Id: <202402121625.41CGPrHK077337@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: 93c87d96e114 - stable/14 - jail: Fix information leak. 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 93c87d96e11421e425e257354b8fbf2d3ad878eb Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=93c87d96e11421e425e257354b8fbf2d3ad878eb commit 93c87d96e11421e425e257354b8fbf2d3ad878eb Author: Pawel Jakub Dawidek AuthorDate: 2024-01-17 17:43:55 +0000 Commit: Mark Johnston CommitDate: 2024-02-12 16:24:21 +0000 jail: Fix information leak. There is a lack of proper visibility checking in kern.ttys sysctl handler which leads to information leak about processes outside the current jail. This can be demonstrated with pstat -t: when called from within a jail, it will output all terminal devices including process groups and session leader process IDs: jail# pstat -t | grep pts/ | head LINE INQ CAN LIN LOW OUTQ USE LOW COL SESS PGID STATE pts/2 1920 0 0 192 1984 0 199 0 4132 27245 Oi pts/3 1920 0 0 192 1984 0 199 16 24890 33627 Oi pts/5 0 0 0 0 0 0 0 25 17758 0 G pts/16 0 0 0 0 0 0 0 0 52495 0 G pts/15 0 0 0 0 0 0 0 25 53446 0 G pts/17 0 0 0 0 0 0 0 6702 33230 0 G pts/19 0 0 0 0 0 0 0 14 1116 0 G pts/0 0 0 0 0 0 0 0 0 2241 0 G pts/23 0 0 0 0 0 0 0 20 15639 0 G pts/6 0 0 0 0 0 0 0 0 44062 93792 G jail# pstat -t | grep pts/ | wc -l 85 Devfs does the filtering correctly and we get only one entry: jail# ls /dev/pts/ 2 Approved by: mzaborski, secteam MFC after: 1 week Sponsored by: Fudo Security (cherry picked from commit f1d0a0cbecf2c688061f35adea85bfb29c9ec893) --- sys/kern/tty.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 353a3b58846c..6d060d61695c 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -1308,9 +1308,11 @@ static int sysctl_kern_ttys(SYSCTL_HANDLER_ARGS) { unsigned long lsize; + struct thread *td = curthread; struct xtty *xtlist, *xt; struct tty *tp; - int error; + struct proc *p; + int cansee, error; sx_slock(&tty_list_sx); lsize = tty_list_count * sizeof(struct xtty); @@ -1323,13 +1325,28 @@ sysctl_kern_ttys(SYSCTL_HANDLER_ARGS) TAILQ_FOREACH(tp, &tty_list, t_list) { tty_lock(tp); - tty_to_xtty(tp, xt); + if (tp->t_session != NULL) { + p = tp->t_session->s_leader; + PROC_LOCK(p); + cansee = (p_cansee(td, p) == 0); + PROC_UNLOCK(p); + } else { + cansee = !jailed(td->td_ucred); + } + if (cansee) { + tty_to_xtty(tp, xt); + xt++; + } tty_unlock(tp); - xt++; } sx_sunlock(&tty_list_sx); - error = SYSCTL_OUT(req, xtlist, lsize); + lsize = (xt - xtlist) * sizeof(struct xtty); + if (lsize > 0) { + error = SYSCTL_OUT(req, xtlist, lsize); + } else { + error = 0; + } free(xtlist, M_TTY); return (error); } From nobody Mon Feb 12 16:25:54 2024 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 4TYVFG3FDyz5B5jh; Mon, 12 Feb 2024 16:25:54 +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 4TYVFG2cCMz47r5; Mon, 12 Feb 2024 16:25:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707755154; 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=CAAzw8GmlsJFn5zwmf7KiljOSXDZf38sf/N98qkOf84=; b=qgZ/4s/7aH2GpirHH6Ei9ymhcFDlphPi/bbZl+NKhFQXKTod6lwBvvbjXmkAXZuLKi+O7/ 14YBU+80b9fHuSmNHI13SSQm1pODZM5UiVNSJBgBbiDqjcUDVKCTZvkUhzbQwtY7ZLT+i8 W2CQDbwib+M/FS3bsNsFjoXCv6mSxBph15HWffzlDJ3mLQjHV7rq8SeElqLtG0RQE+rS0N fl8Q2UEN9Uj6pJc2ousdc7SE6Ka7E53NC4gXWE+Vvk7le/v3nvV7H+r+SqzLpN3kG8k161 wDco4xUlcETXZxfOh7xers7KQeujqq7//tQ8j4Wes28T+0mulx2kVo64WrRc0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707755154; a=rsa-sha256; cv=none; b=Wb9dAOHdt1M4Wr1/94SzHopmL1CZ7frZeJbQ4IQlHcpoxaGtBrmLz6KR/K9tOwX7e/kDEl RXZAyhNncUpJBwMCdTZhYSD24f+qO7ftyRFAc6A7ZrdsB2opwifkJfjXP5mpozGVYHxgWD 9QmNveF55QJexwp6v1IpRqHYEksPhNIPbiUf9r/CDHV57fIcprsDHAA/+a3ZVWBt0GCmKH 1J7XHLDvqgET141N3hVsHmvtILP9O325+IRNht5+RgnnyKpfwYOMltZNtdBfOpjpHoSHUg wAGZhq4LcDTmPjmxc+0XJUlYKSpBYX9atvTsQcFRQpbQ0MA2WJ102V6gPPLGJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707755154; 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=CAAzw8GmlsJFn5zwmf7KiljOSXDZf38sf/N98qkOf84=; b=aICVM6uLYVfygcnp7MWEpiBVJYEOFCdYu8qF9QDuoX1CscaI8PIqVIr08BL60qAL3NNwAs 2SLLwpPPiqcnZpfUXSV6E3Z1DEk3anWOmcaH/MwCYwHk7HzjRjcs3M2wCP9tR/cD773Dvs ZfkkoB7vKQsejQFy6/imAeQbnUKyNRVVrIYCbxgeIinMVjOJ6PBR36/I9m2a/ZzjfknufB 3lGfkO+Lf2bIsgPxVluHvAxKauDXSJJEO/lHzAeOHPg/XwiRMQXyxJ3ETzgIQXWy1EPuzZ u8X60Ugipph73/Ph7402kgpr44gMjKmE/k0+VJkLwHlyIk1ssTPonjZDVrazCg== 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 4TYVFG1gLZzZ5t; Mon, 12 Feb 2024 16:25:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CGPsvU077385; Mon, 12 Feb 2024 16:25:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CGPsdp077382; Mon, 12 Feb 2024 16:25:54 GMT (envelope-from git) Date: Mon, 12 Feb 2024 16:25:54 GMT Message-Id: <202402121625.41CGPsdp077382@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: 215bb03edc54 - stable/14 - Fix the build. 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 215bb03edc541634ec3fd9b01b55d7396b14d9cf Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=215bb03edc541634ec3fd9b01b55d7396b14d9cf commit 215bb03edc541634ec3fd9b01b55d7396b14d9cf Author: Pawel Jakub Dawidek AuthorDate: 2024-01-17 18:54:43 +0000 Commit: Mark Johnston CommitDate: 2024-02-12 16:24:31 +0000 Fix the build. MFC after: 1 week MFC with: f1d0a0cbecf2c688061f35adea85bfb29c9ec893 (cherry picked from commit 41ac0b4ce00bae061164384f23356a4df6e0e695) --- sys/kern/tty.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 6d060d61695c..eaf6fe98fe2e 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -44,6 +44,7 @@ #ifdef COMPAT_43TTY #include #endif /* COMPAT_43TTY */ +#include #include #include #include From nobody Mon Feb 12 16:27:36 2024 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 4TYVHD2ybXz5B5nT; Mon, 12 Feb 2024 16:27:36 +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 4TYVHD2NdGz48lm; Mon, 12 Feb 2024 16:27:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707755256; 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=I9/FdQIFie1vNCxE+5MjW+PEeRL6Or40HOnp4pjDSLo=; b=eAAbacswBy9RIQdV7DnLCvaPQ+pXBLoLLfd3Beioo5sOliIYGtEK4yruqj4E44B+XwT0Nr FilQlF94LERntzYgEK9jTqPAgBSQF/qh8OEocR7uLgXTm1fTvGTkFGdQi5sdu7PbEJ/jXz wYcrTL1wlGDsfVKArbtKcKX6SNudQc3uJw7h0KETkCV8faHh8yg7g1rJ93QYyGgrOFMzFU UtQHsa8Va6yvul+8/WCQNdR9YB91QF+CoKeio6uxurKoBLZQh2N9dVXQSco1ft/N00v4AY VnpFo94gVZZvmH6Ug6u2exX7EY+GfWqPNtg5uxlsBYEdoIfOc8HcHw/higJ4lQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707755256; a=rsa-sha256; cv=none; b=ypxosHezqio9ZmVXX0w72ecWFtlw1Y0FZUJ5SQEdaMT+6fDTUr7cb94rCfWOIbYdDeNbyl 8nwv4UYJdrPk0o/tNNjHAdSkHYDTVTjs8jugzCXHsBfxUo1aDEcDOxNAJe6++k8XFPx18I dq6Sq5RZEPiHDUJ5/hVZ7y2N0ZoTsSKKmCx9g34/8fEVH0FB7YlPd6Ooy8LLOLDl/wCvel Tmlf+ZWBDjzlmOkci8Z/eVSCBF5FzfvPzNlKZrBbykxn8YCmTA5eWbacsDpu1n/jP6w0lg FYY9xNLYHH87FQdoZlWkNJ5HC+DYa4S1eQVIWzytoI4EeQQ6cx+zan7Mw+XB8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707755256; 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=I9/FdQIFie1vNCxE+5MjW+PEeRL6Or40HOnp4pjDSLo=; b=OPeH4+4aRRXmRF5yX4C7eO0BIQD9IraG/tQ1GVbVCVIAdqltS/IoFmJ3u2rC68JB4AwP24 CJ6KUc04YgBA4Wq6rBuorxTlW+KmKAhgmA37jXl9ItzmY5P8eFrgkPdZG5YARj+NMONkiJ KX8BAMlSDWaoL4ErNUi+OHkMHZPfGnOYwTshUUJa/cCEDcica4rRuz1cu9qQjB2OFFmgPm vPoBuMwGcxEn9Wbk8sxRcNuwUj+Lj1jgSyKeWuT1Mnk2Ba8fkdD3nA6E50wd4gc0MG5+SE n3r4ZQHHD8/kDISz/OZEOq/4NdJCdUQSoRfXTx8x3sUexZ8degdWxz1fBIBggg== 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 4TYVHD1T9JzZPL; Mon, 12 Feb 2024 16:27:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CGRamS077738; Mon, 12 Feb 2024 16:27:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CGRa4R077735; Mon, 12 Feb 2024 16:27:36 GMT (envelope-from git) Date: Mon, 12 Feb 2024 16:27:36 GMT Message-Id: <202402121627.41CGRa4R077735@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: a376108029a2 - stable/13 - jail: Fix information leak. 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/stable/13 X-Git-Reftype: branch X-Git-Commit: a376108029a20f4ce51476d98f2483a7008ce7b5 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a376108029a20f4ce51476d98f2483a7008ce7b5 commit a376108029a20f4ce51476d98f2483a7008ce7b5 Author: Pawel Jakub Dawidek AuthorDate: 2024-01-17 17:43:55 +0000 Commit: Mark Johnston CommitDate: 2024-02-12 16:26:02 +0000 jail: Fix information leak. There is a lack of proper visibility checking in kern.ttys sysctl handler which leads to information leak about processes outside the current jail. This can be demonstrated with pstat -t: when called from within a jail, it will output all terminal devices including process groups and session leader process IDs: jail# pstat -t | grep pts/ | head LINE INQ CAN LIN LOW OUTQ USE LOW COL SESS PGID STATE pts/2 1920 0 0 192 1984 0 199 0 4132 27245 Oi pts/3 1920 0 0 192 1984 0 199 16 24890 33627 Oi pts/5 0 0 0 0 0 0 0 25 17758 0 G pts/16 0 0 0 0 0 0 0 0 52495 0 G pts/15 0 0 0 0 0 0 0 25 53446 0 G pts/17 0 0 0 0 0 0 0 6702 33230 0 G pts/19 0 0 0 0 0 0 0 14 1116 0 G pts/0 0 0 0 0 0 0 0 0 2241 0 G pts/23 0 0 0 0 0 0 0 20 15639 0 G pts/6 0 0 0 0 0 0 0 0 44062 93792 G jail# pstat -t | grep pts/ | wc -l 85 Devfs does the filtering correctly and we get only one entry: jail# ls /dev/pts/ 2 Approved by: mzaborski, secteam MFC after: 1 week Sponsored by: Fudo Security (cherry picked from commit f1d0a0cbecf2c688061f35adea85bfb29c9ec893) --- sys/kern/tty.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/sys/kern/tty.c b/sys/kern/tty.c index d7f9a914166a..be4cc2593fd1 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -1308,9 +1308,11 @@ static int sysctl_kern_ttys(SYSCTL_HANDLER_ARGS) { unsigned long lsize; + struct thread *td = curthread; struct xtty *xtlist, *xt; struct tty *tp; - int error; + struct proc *p; + int cansee, error; sx_slock(&tty_list_sx); lsize = tty_list_count * sizeof(struct xtty); @@ -1323,13 +1325,28 @@ sysctl_kern_ttys(SYSCTL_HANDLER_ARGS) TAILQ_FOREACH(tp, &tty_list, t_list) { tty_lock(tp); - tty_to_xtty(tp, xt); + if (tp->t_session != NULL) { + p = tp->t_session->s_leader; + PROC_LOCK(p); + cansee = (p_cansee(td, p) == 0); + PROC_UNLOCK(p); + } else { + cansee = !jailed(td->td_ucred); + } + if (cansee) { + tty_to_xtty(tp, xt); + xt++; + } tty_unlock(tp); - xt++; } sx_sunlock(&tty_list_sx); - error = SYSCTL_OUT(req, xtlist, lsize); + lsize = (xt - xtlist) * sizeof(struct xtty); + if (lsize > 0) { + error = SYSCTL_OUT(req, xtlist, lsize); + } else { + error = 0; + } free(xtlist, M_TTY); return (error); } From nobody Mon Feb 12 16:27:37 2024 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 4TYVHF5fTTz5B5lJ; Mon, 12 Feb 2024 16:27:37 +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 4TYVHF3LtVz487d; Mon, 12 Feb 2024 16:27:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707755257; 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=kA84sZYzi9rvrG4tH7bizn5ouYIewpXdxebH3H3My2A=; b=W0HMZGyEnS4jbJTr9kkyvx6D0VuAe+PX2iW0ciZth9cE7bz57znV1dn4wO5W4eCZn41k6p qg2jElm1YtEJG3vM/f1sWfkvPj5rmXpcZYdVX/gqw7HCSSxQ+p6SdSYVP5vjvc+1XXGXef Ffyh6bFa1NCJDK6O8/EOA6huCl1Z4p1QirMz9p57oNArL+SK1P7oOeWwxbUcLuCq5O1x87 q8IYj9Mpdtl3ZiDDuCvNyBGlR4IA8WRva8Y3t9Yk59qSUE9BeJN/it6RwazTHIuqz+P97V cjyDjyWM46+vo5uYKmnFdurIW48rsoWNow1ItASOFs5eKY00LxuewXMxTcbrag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707755257; a=rsa-sha256; cv=none; b=cQ7TtqERqs+j0ZI6Graoe9QFZvymsHI1gp2BoZKU4SMgLiyIFhnyxh1gQWr7KG8Nf9fUQL mRFs/0jLxwq0gmtTiNWeCRNo7FHt4PCXs0CMZhe/yv/pNWWjjohfnMNc87ydVTIScA8H5r lO/I+9zv4oxisEWOsONfeFeaadIn1irWwOsm2nlMhYDvg1/sOUKx55K7gYMGu1eauGzLHI amoko+E2s9jM047Aclig/AUGFw+kkaaf8KQY07C7pLQnFAPI/khCGWIpF+nuDrffa2AGNo jpQEvJ3Pua//MQyFyTd4YEz1QH475aoBVHgqQziFIuntIdvNffB3hEuRjhj7ZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707755257; 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=kA84sZYzi9rvrG4tH7bizn5ouYIewpXdxebH3H3My2A=; b=vkpRw7TAzwp1j2gcZKJlSwu8bMZ9ixvN4erWHtHzq1WhPAmKS8AUJKjPUJi0bFI46DKd9X 4/mCKQhDfUyf3REqf63eykYX/q7jTnqVEsVwv8R9Sf3rp6NIyew7jnkki72/2QdC0s1JJ5 ONeqvdd2WOdK61HV86YWqScCqlmt+vtTVG3I5U9sOhqYD6LKZGN3teT1xxwTlitcUJZbzv DU6e/ncTdoeld0jwc+Bl7F/kU1KrB5uw1ZubBACMVKGpuPxeH/B71SS/IWPGcvdXzAyayh S9aHXIBI2S8ATHkyTXn2+waf1vemdcOj/8dnU6RjH0V2aWSDFgC1FIFo2aP5uQ== 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 4TYVHF2RRRzZKD; Mon, 12 Feb 2024 16:27:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CGRbCj077781; Mon, 12 Feb 2024 16:27:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CGRbjA077778; Mon, 12 Feb 2024 16:27:37 GMT (envelope-from git) Date: Mon, 12 Feb 2024 16:27:37 GMT Message-Id: <202402121627.41CGRbjA077778@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: 9bff7ec98354 - stable/13 - Fix the build. 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 9bff7ec98354a76c171905ce9530f85685725ee7 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9bff7ec98354a76c171905ce9530f85685725ee7 commit 9bff7ec98354a76c171905ce9530f85685725ee7 Author: Pawel Jakub Dawidek AuthorDate: 2024-01-17 18:54:43 +0000 Commit: Mark Johnston CommitDate: 2024-02-12 16:26:05 +0000 Fix the build. MFC after: 1 week MFC with: f1d0a0cbecf2c688061f35adea85bfb29c9ec893 (cherry picked from commit 41ac0b4ce00bae061164384f23356a4df6e0e695) --- sys/kern/tty.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/tty.c b/sys/kern/tty.c index be4cc2593fd1..508c0f14b861 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -44,6 +44,7 @@ #ifdef COMPAT_43TTY #include #endif /* COMPAT_43TTY */ +#include #include #include #include From nobody Mon Feb 12 17:43:45 2024 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 4TYWz53rKBz5BDJY; Mon, 12 Feb 2024 17:43:45 +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 4TYWz53Jynz4VRj; Mon, 12 Feb 2024 17:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707759825; 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=jsWpPX2tFIHxfXen1xppNIJ7ITjGgVs2T4kBABiIUzY=; b=NWxnHDCDnkNADkV2ADuOB/lVnwVOhLQk3f5cCRDxfFnFKpLM8LPW3BDC7pFh4YebLJf+lg AWoEvF/3VpeFbhr1gQRsc/Vb+SZt6KWuC6kP4ncgoUqHVQQF+j7PV7oPE4HpmSrLDpxvgd zFx5TvfBsoIMHn5SfkNDv/KUE0j8MK8jAJIXvosCOwNo8ufFl5OlpT+U1LAJFh6ErKo7Jz 6qU84//UDxD2HgqpmsLkZXrDsBzwJId5e23hHlSLiAIoz9Z2h0up98h9lhobROmFupBPvX c3vu+P9mtF086xJoP6KHB2kA79DpotK+IwiS6malfkP8r3T3snl36LMXdfT4rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707759825; a=rsa-sha256; cv=none; b=tQgMHyfeFw/zpUCMO94UtOBNrRcm6in55enZjcL06xZkBgqlYyA54DLWsIOWQmfxubVYxl Vd9nuFZ/IObpnaXjq+xr2EhXt+LseqhPyITWKeZdXma3c9lpYLQC1D9XgpE0LgMzQRj8SK LXnXcY9774cbTxePoeGf5FtT11ZsE57y4j2UwY+/NOkrgYuxX8tfi6JgCHALsOJ3Mv8Nwm RFNoEz4nkUe7yfB0RSBmcvtg97VcJ8MQhnz2K3v6nBwK1WBRAQHbnaNCUoDe6jbdUjBlwN Hx+kjNizab1aHovJw8YMX9YBl+RLCDKIsF+6Gif+fpTRR8IkIwvJIYNpDVisvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707759825; 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=jsWpPX2tFIHxfXen1xppNIJ7ITjGgVs2T4kBABiIUzY=; b=G4+Npn5dkvDFBkDQY81DuNufK/h08l/fRpf3D3szOgRg3sIKQULV8gXVbVoSOl8iCOa2BV kratHf5cn3etqe+sqe8D9b3PXYBgK53D6PJ9ggKLM2zbcALelZOo4LyD/l6IlxMtxx+kyb fyT6wCR5p5YUlj4HP8iN96cx1B6MZb8Bw6ygtf6qYGkdpgzkvEsLfJYnnOMglYHh6CwIm8 J1lQad3BGAeoMPOeZqPRqeBOEh/WGmGAKhGcFoYTolgyvG7djqGhVgYzmJlzaVlNFKXDLx zlxkQyXc5nFLYse9EVIRfXbeuIJG2rANVmS1XHvNi1nzBMd+7OBznhKLLGdeCw== 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 4TYWz52MKrzhFw; Mon, 12 Feb 2024 17:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CHhjAa012173; Mon, 12 Feb 2024 17:43:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CHhj7G012170; Mon, 12 Feb 2024 17:43:45 GMT (envelope-from git) Date: Mon, 12 Feb 2024 17:43:45 GMT Message-Id: <202402121743.41CHhj7G012170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 9826f8eb0cca - stable/14 - fusefs: fix an interaction between copy_file_range and mmap 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9826f8eb0cca1a755d411174c24222c3588881d9 Auto-Submitted: auto-generated The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=9826f8eb0cca1a755d411174c24222c3588881d9 commit 9826f8eb0cca1a755d411174c24222c3588881d9 Author: Alan Somers AuthorDate: 2023-12-31 14:31:16 +0000 Commit: Alan Somers CommitDate: 2024-02-12 17:42:46 +0000 fusefs: fix an interaction between copy_file_range and mmap If a copy_file_range operation tries to read from a page that was previously written via mmap, that page must be flushed first. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D43451 (cherry picked from commit 1c909c300b92601f7690610097ac98126caff835) --- sys/fs/fuse/fuse_vnops.c | 1 + tests/sys/fs/fusefs/copy_file_range.cc | 68 +++++++++++++++++++++++++ tests/sys/fs/fusefs/io.cc | 90 ++++++++++++++++++++++++++++++++-- 3 files changed, 154 insertions(+), 5 deletions(-) diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 9728afb66654..b5e177dac376 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -907,6 +907,7 @@ fuse_vnop_copy_file_range(struct vop_copy_file_range_args *ap) if (err) goto unlock; + vnode_pager_clean_sync(invp); err = fuse_inval_buf_range(outvp, outfilesize, *ap->a_outoffp, *ap->a_outoffp + io.uio_resid); if (err) diff --git a/tests/sys/fs/fusefs/copy_file_range.cc b/tests/sys/fs/fusefs/copy_file_range.cc index 8640780c0b58..17b21b888736 100644 --- a/tests/sys/fs/fusefs/copy_file_range.cc +++ b/tests/sys/fs/fusefs/copy_file_range.cc @@ -27,6 +27,7 @@ extern "C" { #include +#include #include #include @@ -320,6 +321,73 @@ TEST_F(CopyFileRange, fallback) ASSERT_EQ(len, copy_file_range(fd1, &start1, fd2, &start2, len, 0)); } +/* + * Writes via mmap should not conflict with using copy_file_range. Any dirty + * pages that overlap with copy_file_range's input should be flushed before + * FUSE_COPY_FILE_RANGE is sent. + */ +TEST_F(CopyFileRange, mmap_write) +{ + const char FULLPATH[] = "mountpoint/src.txt"; + const char RELPATH[] = "src.txt"; + uint8_t *wbuf, *fbuf; + void *p; + size_t fsize = 0x6000; + size_t wsize = 0x3000; + ssize_t r; + off_t offset2_in = 0; + off_t offset2_out = wsize; + size_t copysize = wsize; + const uint64_t ino = 42; + const uint64_t fh = 0xdeadbeef1a7ebabe; + int fd; + const mode_t mode = 0644; + + fbuf = (uint8_t*)calloc(1, fsize); + wbuf = (uint8_t*)malloc(wsize); + memset(wbuf, 1, wsize); + + expect_lookup(RELPATH, ino, S_IFREG | mode, fsize, 1); + expect_open(ino, 0, 1, fh); + /* This read is initiated by the mmap write */ + expect_read(ino, 0, fsize, fsize, fbuf, -1, fh); + /* This write flushes the buffer filled by the mmap write */ + expect_write(ino, 0, wsize, wsize, wbuf); + + EXPECT_CALL(*m_mock, process( + ResultOf([=](auto in) { + return (in.header.opcode == FUSE_COPY_FILE_RANGE && + (off_t)in.body.copy_file_range.off_in == offset2_in && + (off_t)in.body.copy_file_range.off_out == offset2_out && + in.body.copy_file_range.len == copysize + ); + }, Eq(true)), + _) + ).WillOnce(Invoke(ReturnImmediate([&](auto in __unused, auto& out) { + SET_OUT_HEADER_LEN(out, write); + out.body.write.size = copysize; + }))); + + fd = open(FULLPATH, O_RDWR); + + /* First, write some data via mmap */ + p = mmap(NULL, wsize, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + ASSERT_NE(MAP_FAILED, p) << strerror(errno); + memmove((uint8_t*)p, wbuf, wsize); + ASSERT_EQ(0, munmap(p, wsize)) << strerror(errno); + + /* + * Then copy it around the file via copy_file_range. This should + * trigger a FUSE_WRITE to flush the pages written by mmap. + */ + r = copy_file_range(fd, &offset2_in, fd, &offset2_out, copysize, 0); + ASSERT_EQ(copysize, (size_t)r) << strerror(errno); + + free(wbuf); + free(fbuf); +} + + /* * copy_file_range should send SIGXFSZ and return EFBIG when the operation * would exceed the limit imposed by RLIMIT_FSIZE. diff --git a/tests/sys/fs/fusefs/io.cc b/tests/sys/fs/fusefs/io.cc index fda13a72cc4c..357772c31c2c 100644 --- a/tests/sys/fs/fusefs/io.cc +++ b/tests/sys/fs/fusefs/io.cc @@ -73,7 +73,7 @@ static void compare(const void *tbuf, const void *controlbuf, off_t baseofs, } } -typedef tuple IoParam; +typedef tuple IoParam; class Io: public FuseTest, public WithParamInterface { public: @@ -112,6 +112,7 @@ void SetUp() default: FAIL() << "Unknown cache mode"; } + m_kernel_minor_version = get<3>(GetParam()); m_noatime = true; // To prevent SETATTR for atime on close FuseTest::SetUp(); @@ -120,9 +121,10 @@ void SetUp() if (verbosity > 0) { printf("Test Parameters: init_flags=%#x maxwrite=%#x " - "%sasync cache=%s\n", + "%sasync cache=%s kernel_minor_version=%d\n", m_init_flags, m_maxwrite, m_async? "" : "no", - cache_mode_to_s(get<2>(GetParam()))); + cache_mode_to_s(get<2>(GetParam())), + m_kernel_minor_version); } expect_lookup(RELPATH, ino, S_IFREG | 0644, 0, 1); @@ -195,6 +197,30 @@ void SetUp() }, Eq(true)), _) ).WillRepeatedly(Invoke(ReturnErrno(0))); + EXPECT_CALL(*m_mock, process( + ResultOf([=](auto in) { + return (in.header.opcode == FUSE_COPY_FILE_RANGE && + in.header.nodeid == ino && + in.body.copy_file_range.nodeid_out == ino && + in.body.copy_file_range.flags == 0); + }, Eq(true)), + _) + ).WillRepeatedly(Invoke(ReturnImmediate([=](auto in, auto& out) { + off_t off_in = in.body.copy_file_range.off_in; + off_t off_out = in.body.copy_file_range.off_out; + ASSERT_EQ((ssize_t)in.body.copy_file_range.len, + copy_file_range(m_backing_fd, &off_in, m_backing_fd, + &off_out, in.body.copy_file_range.len, 0)); + SET_OUT_HEADER_LEN(out, write); + out.body.write.size = in.body.copy_file_range.len; + }))); + /* Claim that we don't support FUSE_LSEEK */ + EXPECT_CALL(*m_mock, process( + ResultOf([=](auto in) { + return (in.header.opcode == FUSE_LSEEK); + }, Eq(true)), + _) + ).WillRepeatedly(Invoke(ReturnErrno(ENOSYS))); m_test_fd = open(FULLPATH, O_RDWR ); EXPECT_LE(0, m_test_fd) << strerror(errno); @@ -223,6 +249,31 @@ void do_closeopen() ASSERT_LE(0, m_control_fd) << strerror(errno); } +void do_copy_file_range(off_t off_in, off_t off_out, size_t size) +{ + ssize_t r; + off_t test_off_in = off_in; + off_t test_off_out = off_out; + off_t test_size = size; + off_t control_off_in = off_in; + off_t control_off_out = off_out; + off_t control_size = size; + + while (test_size > 0) { + r = copy_file_range(m_test_fd, &test_off_in, m_test_fd, + &test_off_out, test_size, 0); + ASSERT_GT(r, 0) << strerror(errno); + test_size -= r; + } + while (control_size > 0) { + r = copy_file_range(m_control_fd, &control_off_in, m_control_fd, + &control_off_out, control_size, 0); + ASSERT_GT(r, 0) << strerror(errno); + control_size -= r; + } + m_filesize = std::max(m_filesize, off_out + (off_t)size); +} + void do_ftruncate(off_t offs) { ASSERT_EQ(0, ftruncate(m_test_fd, offs)) << strerror(errno); @@ -345,6 +396,13 @@ virtual void SetUp() { } }; +class IoCopyFileRange: public Io { +public: +virtual void SetUp() { + Io::SetUp(); +} +}; + /* * Extend a file with dirty data in the last page of the last block. * @@ -517,16 +575,38 @@ TEST_P(IoCacheable, vnode_pager_generic_putpage_clean_block_at_eof) do_mapwrite(0x1bbc3, 0x3b4e0); } +/* + * A copy_file_range that follows an mmap write to the input area needs to + * flush the mmap buffer first. + */ +TEST_P(IoCopyFileRange, copy_file_range_from_mapped_write) +{ + do_mapwrite(0x1000, 0); + do_copy_file_range(0, 0x1000, 0x1000); + do_read(0x1000, 0x1000); +} + + INSTANTIATE_TEST_SUITE_P(Io, Io, Combine(Bool(), /* async read */ Values(0x1000, 0x10000, 0x20000), /* m_maxwrite */ - Values(Uncached, Writethrough, Writeback, WritebackAsync) + Values(Uncached, Writethrough, Writeback, WritebackAsync), + Values(28) /* kernel_minor_vers */ ) ); INSTANTIATE_TEST_SUITE_P(Io, IoCacheable, Combine(Bool(), /* async read */ Values(0x1000, 0x10000, 0x20000), /* m_maxwrite */ - Values(Writethrough, Writeback, WritebackAsync) + Values(Writethrough, Writeback, WritebackAsync), + Values(28) /* kernel_minor_vers */ + ) +); + +INSTANTIATE_TEST_SUITE_P(Io, IoCopyFileRange, + Combine(Values(true), /* async read */ + Values(0x10000), /* m_maxwrite */ + Values(Writethrough, Writeback, WritebackAsync), + Values(27, 28) /* kernel_minor_vers */ ) ); From nobody Mon Feb 12 17:43:46 2024 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 4TYWz66G48z5BDYy; Mon, 12 Feb 2024 17:43:46 +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 4TYWz64K0Bz4V8F; Mon, 12 Feb 2024 17:43:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707759826; 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=2RNzQlvvA0St5Cq5EXdoAYXM7cDn1IOGJZjc1V2nmHc=; b=Zzg/mU0JunRqHhwXWZUDd9x1POaCjtDCeVqstXYQpfH5A3C5agjJt72gMx296YZrqSbuAy yK1XNiOhDCv/XbSh0/GMpN0w2A8PPtiMUmg0Q0OqMS1Sk81OqRS/UWCKP2M9R23iEljU93 +eAQTOEPl8yPmzUxzJfC7QqAucXXCVuA4LgDNtjOpMpoTXh2DM1dqKTMj/kJB04Vqc3Cak pSfFFRaLMSIPb7eE5sKcCidLM1CMPaeU7NZQa8+X5UjnLOabcH/OOgo6Ig2buiBsdcer/W +coOH2ft2jP/6YL+twkLmgz2Teku04PjutsImRchkCC7Eq+sxJ8qfzew2CMZoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707759826; a=rsa-sha256; cv=none; b=ho5cC27vBVqlmgS4q/S6CV8W2/0hR2FTskNnq1qw3Wa6NUK8HdHTmkq7R0GLWq5Ha99u9M CuhRT9swhirPwygVOLazSJZVl3997BlD604Vu22QUuNhVT2MsGkj6ceeZaRIa4KOfP9p14 qMd8vXdKLD+mUwhyYopaOd1UdE+T0YP2jzTnn5gW5W3HYF7PWW2HHUtYXbwnrlFQF1YZP6 m+OZbbaZrkvf0GS3ZgIlsMPZMYSM/w8EoFKVDAD/Jw7rXc+rvaG4jlK/z6eXNX1H7OEOKY VabEMFqAxHUzREeiAyC9xRFW6/dWjq/ElSj03gypZMoymUbGhXA3rzxpa5iD4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707759826; 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=2RNzQlvvA0St5Cq5EXdoAYXM7cDn1IOGJZjc1V2nmHc=; b=i5/1fSRNMokjug+pr7MKgzvtQO03WWsUGOhAwFqSSOJSO9HaO3ycm2lXUx16Ky1VvKtbzD BRPSMy5cxTZizdDZPfepWabS4r74iT0IymaiacLJdjBNu3xw1U90RSd4Ftprb8B/but5/7 tNckeKJK4MwInP5Vzs8jUeGQyc3V4w84MzxxVHW4H3sTBm4tfRFISeUTg0c93hAo2M900o ZXom7PSDNY0WsO9kv6Ia8ZRByDQKGyO/nC0NxH0TEu0MIsl6fpuXic94STKhkU5jXmkSkV FXnLhoPKUuVsH0V/IPvgFSIoUhOF1fgjbV9/bQYq1cChRNbRN9LQzZ5ePVkNGg== 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 4TYWz63PYtzhFx; Mon, 12 Feb 2024 17:43:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CHhkM6012221; Mon, 12 Feb 2024 17:43:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CHhkrO012218; Mon, 12 Feb 2024 17:43:46 GMT (envelope-from git) Date: Mon, 12 Feb 2024 17:43:46 GMT Message-Id: <202402121743.41CHhkrO012218@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 31c31be71624 - stable/14 - fusefs: more consistent operand ordering in io.cc 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 31c31be71624ce743fd0474929dbecec39dc125b Auto-Submitted: auto-generated The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=31c31be71624ce743fd0474929dbecec39dc125b commit 31c31be71624ce743fd0474929dbecec39dc125b Author: Alan Somers AuthorDate: 2024-01-15 23:16:40 +0000 Commit: Alan Somers CommitDate: 2024-02-12 17:42:57 +0000 fusefs: more consistent operand ordering in io.cc (cherry picked from commit daf26f9350cf8fb3ae60d4528b60ddf65a56f5cc) --- tests/sys/fs/fusefs/io.cc | 54 +++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/tests/sys/fs/fusefs/io.cc b/tests/sys/fs/fusefs/io.cc index 357772c31c2c..283b601c9e87 100644 --- a/tests/sys/fs/fusefs/io.cc +++ b/tests/sys/fs/fusefs/io.cc @@ -281,7 +281,7 @@ void do_ftruncate(off_t offs) m_filesize = offs; } -void do_mapread(ssize_t size, off_t offs) +void do_mapread(off_t offs, ssize_t size) { void *control_buf, *p; off_t pg_offset, page_mask; @@ -307,7 +307,7 @@ void do_mapread(ssize_t size, off_t offs) free(control_buf); } -void do_read(ssize_t size, off_t offs) +void do_read(off_t offs, ssize_t size) { void *test_buf, *control_buf; ssize_t r; @@ -331,7 +331,7 @@ void do_read(ssize_t size, off_t offs) free(test_buf); } -void do_mapwrite(ssize_t size, off_t offs) +void do_mapwrite(off_t offs, ssize_t size) { char *buf; void *p; @@ -368,7 +368,7 @@ void do_mapwrite(ssize_t size, off_t offs) ASSERT_EQ(0, munmap(p, map_size)) << strerror(errno); } -void do_write(ssize_t size, off_t offs) +void do_write(off_t offs, ssize_t size) { char *buf; long i; @@ -416,9 +416,9 @@ TEST_P(Io, extend_from_dirty_page) ssize_t rsize = 0x9b22; off_t truncsize = 0x28702; - do_write(wsize, wofs); + do_write(wofs, wsize); do_ftruncate(truncsize); - do_read(rsize, rofs); + do_read(rofs, rsize); } /* @@ -428,9 +428,9 @@ TEST_P(Io, extend_from_dirty_page) */ TEST_P(IoCacheable, extend_by_mapwrite) { - do_mapwrite(0x849e, 0x29a3a); /* [0x29a3a, 0x31ed7] */ - do_mapwrite(0x3994, 0x3c7d8); /* [0x3c7d8, 0x4016b] */ - do_read(0xf556, 0x30c16); /* [0x30c16, 0x4016b] */ + do_mapwrite(0x29a3a, 0x849e); /* [0x29a3a, 0x31ed7] */ + do_mapwrite(0x3c7d8, 0x3994); /* [0x3c7d8, 0x4016b] */ + do_read(0x30c16, 0xf556); /* [0x30c16, 0x4016b] */ } /* @@ -442,9 +442,9 @@ TEST_P(IoCacheable, extend_by_mapwrite) */ TEST_P(Io, last_page) { - do_write(0xcc77, 0x1134f); /* [0x1134f, 0x1dfc5] */ - do_write(0xdfa7, 0x2096a); /* [0x2096a, 0x2e910] */ - do_read(0xb5b7, 0x1a3aa); /* [0x1a3aa, 0x25960] */ + do_write(0x1134f, 0xcc77); /* [0x1134f, 0x1dfc5] */ + do_write(0x2096a, 0xdfa7); /* [0x2096a, 0x2e910] */ + do_read(0x1a3aa, 0xb5b7); /* [0x1a3aa, 0x25960] */ } /* @@ -454,8 +454,8 @@ TEST_P(Io, last_page) */ TEST_P(IoCacheable, mapread_hole) { - do_write(0x123b7, 0xf205); /* [0xf205, 0x215bb] */ - do_mapread(0xeeea, 0x2f4c); /* [0x2f4c, 0x11e35] */ + do_write(0xf205, 0x123b7); /* [0xf205, 0x215bb] */ + do_mapread(0x2f4c, 0xeeea); /* [0x2f4c, 0x11e35] */ } /* @@ -470,8 +470,8 @@ TEST_P(Io, read_hole_from_cached_block) off_t rofs = 0x472e; ssize_t rsize = 0xd8d5; - do_write(wsize, wofs); - do_read(rsize, rofs); + do_write(wofs, wsize); + do_read(rofs, rsize); } /* @@ -491,10 +491,10 @@ TEST_P(Io, truncate_into_dirty_buffer) ssize_t rsize = 0x29ff; off_t truncsize1 = 0x152b4; - do_write(wsize0, wofs0); - do_write(wsize1, wofs1); + do_write(wofs0, wsize0); + do_write(wofs1, wsize1); do_ftruncate(truncsize0); - do_read(rsize, rofs); + do_read(rofs, rsize); do_ftruncate(truncsize1); close(m_test_fd); } @@ -523,11 +523,11 @@ TEST_P(Io, truncate_into_dirty_buffer2) * Creates a dirty buffer. The part in lbn 2 doesn't flush * synchronously. */ - do_write(wsize, wofs); + do_write(wofs, wsize); /* Truncates part of the dirty buffer created in step 2 */ do_ftruncate(truncsize1); /* XXX ?I don't know why this is necessary? */ - do_read(rsize2, rofs2); + do_read(rofs2, rsize2); /* Truncates the dirty buffer */ do_ftruncate(truncsize2); close(m_test_fd); @@ -558,10 +558,10 @@ TEST_P(Io, truncate_into_dirty_buffer2) */ TEST_P(Io, resize_a_valid_buffer_while_extending) { - do_write(0x14530, 0x36ee6); /* [0x36ee6, 0x4b415] */ - do_write(0x1507c, 0x33256); /* [0x33256, 0x482d1] */ - do_write(0x175c, 0x4c03d); /* [0x4c03d, 0x4d798] */ - do_read(0xe277, 0x3599c); /* [0x3599c, 0x43c12] */ + do_write(0x36ee6, 0x14530); /* [0x36ee6, 0x4b415] */ + do_write(0x33256, 0x1507c); /* [0x33256, 0x482d1] */ + do_write(0x4c03d, 0x175c); /* [0x4c03d, 0x4d798] */ + do_read(0x3599c, 0xe277); /* [0x3599c, 0x43c12] */ close(m_test_fd); } @@ -572,7 +572,7 @@ TEST_P(Io, resize_a_valid_buffer_while_extending) */ TEST_P(IoCacheable, vnode_pager_generic_putpage_clean_block_at_eof) { - do_mapwrite(0x1bbc3, 0x3b4e0); + do_mapwrite(0x3b4e0, 0x1bbc3); } /* @@ -581,7 +581,7 @@ TEST_P(IoCacheable, vnode_pager_generic_putpage_clean_block_at_eof) */ TEST_P(IoCopyFileRange, copy_file_range_from_mapped_write) { - do_mapwrite(0x1000, 0); + do_mapwrite(0, 0x1000); do_copy_file_range(0, 0x1000, 0x1000); do_read(0x1000, 0x1000); } From nobody Mon Feb 12 17:43:47 2024 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 4TYWz76HQqz5BD4w; Mon, 12 Feb 2024 17:43: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 4TYWz74fqDz4VRn; Mon, 12 Feb 2024 17:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707759827; 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=jGjZjy8Ko+TJvY9JYgI7BsB7mRvupDfKd87EZzwzFjo=; b=jpzh8Enj/76s868djONXsKB5/sHQp77dIEuxyF/kH4qp+NQ1bhYyWe1Lo2XLB+MocJ48Zn RgtfXIf78nIAMxWD5AlfQeYCYP1fBcuYaXOmCQdXQ/RNB84EUFp9NXRqt0Zp4nR0bF/YGX FVn+V73H0DartiNTKfj9Npf/w1HgNTg5AarzlbqvQ+TH7hG976u/x2htx47hj4xmqMkiv3 1fm/jKVInDUVNCDQz3VW+bSVGgUCGABWviYGSZHoqKrHz/KzefcJGz/O8UzHPT4uiQkw46 zWtCTx2VtkjTdB1isYJAgKBJJq0e8XDs+weQYG4ZsH6OcCLAXcYIGD5Q8WpZiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707759827; a=rsa-sha256; cv=none; b=iROnnT9VP8KEYkR42U2QldSavUlcDcEeKMXgtJPwlA/W6/2KKVFn7gbJpNyoQOrhfY88CL MaPxzx00QRyqM6M6rUdY7hYaYdXyTWL5ptxWSHymdy8iMykosfIHYVRuri/rO9Sud9FrWW bamKL6kWGEDSfaQiSpJC1A/QxEt51Ff+wRnFWqoBizZ+eBJVwiqYafU1gcn/KXuyYEyrno V7vMKSDq7+XfFQyug1MzlIc3xTXy1sEGJeAfF1H39z/nobkqmVQnxbiCMX+PRiOOpHd55A RW2OFOyu0I0I5StjN3kzvGVdrAv0J8ME6jVNd6wwI0wdlW82WAo/iNLKnwcGvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707759827; 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=jGjZjy8Ko+TJvY9JYgI7BsB7mRvupDfKd87EZzwzFjo=; b=H0QmPgO1XrdaOVQZ77pjbHHidK7GOHU4SASiOKETMcZMTwD6Xz1hF/9sn5vVfLS1u6XSB6 PyOCg3n6XRWsMiqzJtoNro/50fYUVeqQ3+uafPKMXNMDZKnK710FECjuvhLZpCjTNL0ixl gQMsdrMPXzDFnanb5QJhS30/nm+X9k0A8i3G20OzrEa2K6zS7M/FV0BHsF+hMVIWCiRdDE NsV23j1kW0K8d/Bl5vGAzf1W83EtrrEzzw7AaPev1eQofwrB6dEhq7FuvJUwrVXx5WxCXs iGBV8hHZAy/1AslNF1Aeld05Gt3tg433QEWXoGtQzPWx8ihxASxNBRTDJYkKoQ== 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 4TYWz73l0Vzh4V; Mon, 12 Feb 2024 17:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CHhlMx012265; Mon, 12 Feb 2024 17:43:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CHhlEP012262; Mon, 12 Feb 2024 17:43:47 GMT (envelope-from git) Date: Mon, 12 Feb 2024 17:43:47 GMT Message-Id: <202402121743.41CHhlEP012262@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 8510b8fe2abc - stable/14 - fusefs: prefer new/delete over malloc/free 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8510b8fe2abcae696aefda394b3bcc1368c266e0 Auto-Submitted: auto-generated The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=8510b8fe2abcae696aefda394b3bcc1368c266e0 commit 8510b8fe2abcae696aefda394b3bcc1368c266e0 Author: Alan Somers AuthorDate: 2024-01-15 23:49:47 +0000 Commit: Alan Somers CommitDate: 2024-02-12 17:43:03 +0000 fusefs: prefer new/delete over malloc/free Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D43464 (cherry picked from commit 8bae22bbbe6571da9259e0d43ffa8a56f4b3e171) --- tests/sys/fs/fusefs/bmap.cc | 5 +- tests/sys/fs/fusefs/copy_file_range.cc | 22 ++++---- tests/sys/fs/fusefs/fallocate.cc | 6 +-- tests/sys/fs/fusefs/io.cc | 30 +++++------ tests/sys/fs/fusefs/read.cc | 14 +++-- tests/sys/fs/fusefs/setattr.cc | 23 ++++----- tests/sys/fs/fusefs/write.cc | 94 +++++++++++++++------------------- 7 files changed, 85 insertions(+), 109 deletions(-) diff --git a/tests/sys/fs/fusefs/bmap.cc b/tests/sys/fs/fusefs/bmap.cc index 1ef3dfa00045..4c9edac9360a 100644 --- a/tests/sys/fs/fusefs/bmap.cc +++ b/tests/sys/fs/fusefs/bmap.cc @@ -188,7 +188,7 @@ TEST_P(BmapEof, eof) const off_t filesize = 2 * m_maxbcachebuf; const ino_t ino = 42; mode_t mode = S_IFREG | 0644; - void *buf; + char *buf; int fd; int ngetattrs; @@ -243,11 +243,12 @@ TEST_P(BmapEof, eof) out.body.attr.attr.size = filesize / 2; }))); - buf = calloc(1, filesize); + buf = new char[filesize](); fd = open(FULLPATH, O_RDWR); ASSERT_LE(0, fd) << strerror(errno); read(fd, buf, filesize); + delete[] buf; leak(fd); } diff --git a/tests/sys/fs/fusefs/copy_file_range.cc b/tests/sys/fs/fusefs/copy_file_range.cc index 17b21b888736..806ecf3c3653 100644 --- a/tests/sys/fs/fusefs/copy_file_range.cc +++ b/tests/sys/fs/fusefs/copy_file_range.cc @@ -197,7 +197,7 @@ TEST_F(CopyFileRange, evicts_cache) const char RELPATH1[] = "src.txt"; const char FULLPATH2[] = "mountpoint/dst.txt"; const char RELPATH2[] = "dst.txt"; - void *buf0, *buf1, *buf; + char *buf0, *buf1, *buf; const uint64_t ino1 = 42; const uint64_t ino2 = 43; const uint64_t fh1 = 0xdeadbeef1a7ebabe; @@ -209,7 +209,7 @@ TEST_F(CopyFileRange, evicts_cache) ssize_t len = m_maxbcachebuf; int fd1, fd2; - buf0 = malloc(m_maxbcachebuf); + buf0 = new char[m_maxbcachebuf]; memset(buf0, 42, m_maxbcachebuf); expect_lookup(RELPATH1, ino1, S_IFREG | 0644, fsize1, 1); @@ -240,7 +240,7 @@ TEST_F(CopyFileRange, evicts_cache) fd2 = open(FULLPATH2, O_RDWR); // Prime cache - buf = malloc(m_maxbcachebuf); + buf = new char[m_maxbcachebuf]; ASSERT_EQ(m_maxbcachebuf, pread(fd2, buf, m_maxbcachebuf, start2)) << strerror(errno); EXPECT_EQ(0, memcmp(buf0, buf, m_maxbcachebuf)); @@ -249,7 +249,7 @@ TEST_F(CopyFileRange, evicts_cache) ASSERT_EQ(len, copy_file_range(fd1, &start1, fd2, &start2, len, 0)); // Read again. This should bypass the cache and read direct from server - buf1 = malloc(m_maxbcachebuf); + buf1 = new char[m_maxbcachebuf]; memset(buf1, 69, m_maxbcachebuf); start2 -= len; expect_read(ino2, start2, m_maxbcachebuf, m_maxbcachebuf, buf1, -1, @@ -258,9 +258,9 @@ TEST_F(CopyFileRange, evicts_cache) << strerror(errno); EXPECT_EQ(0, memcmp(buf1, buf, m_maxbcachebuf)); - free(buf1); - free(buf0); - free(buf); + delete[] buf1; + delete[] buf0; + delete[] buf; leak(fd1); leak(fd2); } @@ -343,8 +343,8 @@ TEST_F(CopyFileRange, mmap_write) int fd; const mode_t mode = 0644; - fbuf = (uint8_t*)calloc(1, fsize); - wbuf = (uint8_t*)malloc(wsize); + fbuf = new uint8_t[fsize](); + wbuf = new uint8_t[wsize]; memset(wbuf, 1, wsize); expect_lookup(RELPATH, ino, S_IFREG | mode, fsize, 1); @@ -383,8 +383,8 @@ TEST_F(CopyFileRange, mmap_write) r = copy_file_range(fd, &offset2_in, fd, &offset2_out, copysize, 0); ASSERT_EQ(copysize, (size_t)r) << strerror(errno); - free(wbuf); - free(fbuf); + delete[] wbuf; + delete[] fbuf; } diff --git a/tests/sys/fs/fusefs/fallocate.cc b/tests/sys/fs/fusefs/fallocate.cc index 251552ddc8d0..92e327be5ade 100644 --- a/tests/sys/fs/fusefs/fallocate.cc +++ b/tests/sys/fs/fusefs/fallocate.cc @@ -415,14 +415,14 @@ TEST_F(Fspacectl_7_18, ok) const char FULLPATH[] = "mountpoint/some_file.txt"; const char RELPATH[] = "some_file.txt"; struct spacectl_range rqsr, rmsr; - void *buf; + char *buf; uint64_t ino = 42; uint64_t fsize = 2000; uint64_t offset = 500; uint64_t length = 1000; int fd; - buf = malloc(length); + buf = new char[length]; expect_lookup(RELPATH, ino, S_IFREG | 0644, fsize, 1); expect_open(ino, 0, 1); @@ -437,7 +437,7 @@ TEST_F(Fspacectl_7_18, ok) EXPECT_EQ((off_t)(offset + length), rmsr.r_offset); leak(fd); - free(buf); + delete[] buf; } /* diff --git a/tests/sys/fs/fusefs/io.cc b/tests/sys/fs/fusefs/io.cc index 283b601c9e87..99b5eae34e09 100644 --- a/tests/sys/fs/fusefs/io.cc +++ b/tests/sys/fs/fusefs/io.cc @@ -283,7 +283,8 @@ void do_ftruncate(off_t offs) void do_mapread(off_t offs, ssize_t size) { - void *control_buf, *p; + char *control_buf; + void *p; off_t pg_offset, page_mask; size_t map_size; @@ -295,8 +296,7 @@ void do_mapread(off_t offs, ssize_t size) offs - pg_offset); ASSERT_NE(p, MAP_FAILED) << strerror(errno); - control_buf = malloc(size); - ASSERT_NE(nullptr, control_buf) << strerror(errno); + control_buf = new char[size]; ASSERT_EQ(size, pread(m_control_fd, control_buf, size, offs)) << strerror(errno); @@ -304,18 +304,16 @@ void do_mapread(off_t offs, ssize_t size) compare((void*)((char*)p + pg_offset), control_buf, offs, size); ASSERT_EQ(0, munmap(p, map_size)) << strerror(errno); - free(control_buf); + delete[] control_buf; } void do_read(off_t offs, ssize_t size) { - void *test_buf, *control_buf; + char *test_buf, *control_buf; ssize_t r; - test_buf = malloc(size); - ASSERT_NE(nullptr, test_buf) << strerror(errno); - control_buf = malloc(size); - ASSERT_NE(nullptr, control_buf) << strerror(errno); + test_buf = new char[size]; + control_buf = new char[size]; errno = 0; r = pread(m_test_fd, test_buf, size, offs); @@ -327,8 +325,8 @@ void do_read(off_t offs, ssize_t size) compare(test_buf, control_buf, offs, size); - free(control_buf); - free(test_buf); + delete[] control_buf; + delete[] test_buf; } void do_mapwrite(off_t offs, ssize_t size) @@ -343,8 +341,7 @@ void do_mapwrite(off_t offs, ssize_t size) pg_offset = offs & page_mask; map_size = pg_offset + size; - buf = (char*)malloc(size); - ASSERT_NE(nullptr, buf) << strerror(errno); + buf = new char[size]; for (i=0; i < size; i++) buf[i] = random(); @@ -364,7 +361,7 @@ void do_mapwrite(off_t offs, ssize_t size) ASSERT_EQ(size, pwrite(m_control_fd, buf, size, offs)) << strerror(errno); - free(buf); + delete[] buf; ASSERT_EQ(0, munmap(p, map_size)) << strerror(errno); } @@ -373,8 +370,7 @@ void do_write(off_t offs, ssize_t size) char *buf; long i; - buf = (char*)malloc(size); - ASSERT_NE(nullptr, buf) << strerror(errno); + buf = new char[size]; for (i=0; i < size; i++) buf[i] = random(); @@ -384,7 +380,7 @@ void do_write(off_t offs, ssize_t size) << strerror(errno); m_filesize = std::max(m_filesize, offs + size); - free(buf); + delete[] buf; } }; diff --git a/tests/sys/fs/fusefs/read.cc b/tests/sys/fs/fusefs/read.cc index 3df0420facb9..373f742d4fd3 100644 --- a/tests/sys/fs/fusefs/read.cc +++ b/tests/sys/fs/fusefs/read.cc @@ -1216,8 +1216,7 @@ TEST_F(Read, cache_block) char buf[bufsize]; const char *contents1 = CONTENTS0 + bufsize; - contents = (char*)calloc(1, filesize); - ASSERT_NE(nullptr, contents); + contents = new char[filesize](); memmove(contents, CONTENTS0, strlen(CONTENTS0)); expect_lookup(RELPATH, ino, filesize); @@ -1235,7 +1234,7 @@ TEST_F(Read, cache_block) ASSERT_EQ(bufsize, read(fd, buf, bufsize)) << strerror(errno); ASSERT_EQ(0, memcmp(buf, contents1, bufsize)); leak(fd); - free(contents); + delete[] contents; } /* Reading with sendfile should work (though it obviously won't be 0-copy) */ @@ -1332,10 +1331,9 @@ TEST_P(ReadAhead, readahead) { char *rbuf, *contents; off_t offs; - contents = (char*)malloc(filesize); - ASSERT_NE(nullptr, contents); + contents = new char[filesize]; memset(contents, 'X', filesize); - rbuf = (char*)calloc(1, bufsize); + rbuf = new char[bufsize](); expect_lookup(RELPATH, ino, filesize); expect_open(ino, 0, 1); @@ -1357,8 +1355,8 @@ TEST_P(ReadAhead, readahead) { ASSERT_EQ(0, memcmp(rbuf, contents, bufsize)); leak(fd); - free(rbuf); - free(contents); + delete[] rbuf; + delete[] contents; } INSTANTIATE_TEST_SUITE_P(RA, ReadAhead, diff --git a/tests/sys/fs/fusefs/setattr.cc b/tests/sys/fs/fusefs/setattr.cc index 2502286c3f03..79559db33b12 100644 --- a/tests/sys/fs/fusefs/setattr.cc +++ b/tests/sys/fs/fusefs/setattr.cc @@ -448,7 +448,7 @@ TEST_F(Setattr, truncate) { TEST_F(Setattr, truncate_discards_cached_data) { const char FULLPATH[] = "mountpoint/some_file.txt"; const char RELPATH[] = "some_file.txt"; - void *w0buf, *r0buf, *r1buf, *expected; + char *w0buf, *r0buf, *r1buf, *expected; off_t w0_offset = 0; size_t w0_size = 0x30000; off_t r0_offset = 0; @@ -463,18 +463,13 @@ TEST_F(Setattr, truncate_discards_cached_data) { int fd, r; bool should_have_data = false; - w0buf = malloc(w0_size); - ASSERT_NE(nullptr, w0buf) << strerror(errno); + w0buf = new char[w0_size]; memset(w0buf, 'X', w0_size); - r0buf = malloc(r0_size); - ASSERT_NE(nullptr, r0buf) << strerror(errno); - r1buf = malloc(r1_size); - ASSERT_NE(nullptr, r1buf) << strerror(errno); + r0buf = new char[r0_size]; + r1buf = new char[r1_size]; - expected = malloc(r1_size); - ASSERT_NE(nullptr, expected) << strerror(errno); - memset(expected, 0, r1_size); + expected = new char[r1_size](); expect_lookup(RELPATH, ino, mode, 0, 1); expect_open(ino, O_RDWR, 1); @@ -558,10 +553,10 @@ TEST_F(Setattr, truncate_discards_cached_data) { r = memcmp(expected, r1buf, r1_size); ASSERT_EQ(0, r); - free(expected); - free(r1buf); - free(r0buf); - free(w0buf); + delete[] expected; + delete[] r1buf; + delete[] r0buf; + delete[] w0buf; leak(fd); } diff --git a/tests/sys/fs/fusefs/write.cc b/tests/sys/fs/fusefs/write.cc index 1fb9de70ec6c..f931f350a7c3 100644 --- a/tests/sys/fs/fusefs/write.cc +++ b/tests/sys/fs/fusefs/write.cc @@ -311,10 +311,8 @@ TEST_F(Write, append_to_cached) uint64_t oldsize = m_maxbcachebuf / 2; int fd; - oldcontents = (char*)calloc(1, oldsize); - ASSERT_NE(nullptr, oldcontents) << strerror(errno); - oldbuf = (char*)malloc(oldsize); - ASSERT_NE(nullptr, oldbuf) << strerror(errno); + oldcontents = new char[oldsize](); + oldbuf = new char[oldsize]; expect_lookup(RELPATH, ino, oldsize); expect_open(ino, 0, 1); @@ -332,8 +330,8 @@ TEST_F(Write, append_to_cached) /* Write the new data. There should be no more read operations */ ASSERT_EQ(BUFSIZE, write(fd, CONTENTS, BUFSIZE)) << strerror(errno); leak(fd); - free(oldbuf); - free(oldcontents); + delete[] oldbuf; + delete[] oldcontents; } TEST_F(Write, append_direct_io) @@ -659,7 +657,7 @@ TEST_P(WriteEofDuringVnopStrategy, eof_during_vop_strategy) const char RELPATH[] = "some_file.txt"; Sequence seq; const off_t filesize = 2 * m_maxbcachebuf; - void *contents; + char *contents; uint64_t ino = 42; uint64_t attr_valid = 0; uint64_t attr_valid_nsec = 0; @@ -668,7 +666,7 @@ TEST_P(WriteEofDuringVnopStrategy, eof_during_vop_strategy) int ngetattrs; ngetattrs = GetParam(); - contents = calloc(1, filesize); + contents = new char[filesize](); EXPECT_LOOKUP(FUSE_ROOT_ID, RELPATH) .WillRepeatedly(Invoke( @@ -742,14 +740,12 @@ TEST_F(Write, mmap) void *p; uint64_t offset = 10; size_t len; - void *zeros, *expected; + char *zeros, *expected; len = getpagesize(); - zeros = calloc(1, len); - ASSERT_NE(nullptr, zeros); - expected = calloc(1, len); - ASSERT_NE(nullptr, expected); + zeros = new char[len](); + expected = new char[len](); memmove((uint8_t*)expected + offset, CONTENTS, bufsize); expect_lookup(RELPATH, ino, len); @@ -774,8 +770,8 @@ TEST_F(Write, mmap) ASSERT_EQ(0, munmap(p, len)) << strerror(errno); close(fd); // Write mmap'd data on close - free(expected); - free(zeros); + delete[] expected; + delete[] zeros; leak(fd); } @@ -867,8 +863,7 @@ TEST_F(WriteMaxWrite, write) if (halfbufsize >= m_maxbcachebuf || halfbufsize >= m_maxphys) GTEST_SKIP() << "Must lower m_maxwrite for this test"; bufsize = halfbufsize * 2; - contents = (int*)malloc(bufsize); - ASSERT_NE(nullptr, contents); + contents = new int[bufsize / sizeof(int)]; for (int i = 0; i < (int)bufsize / (int)sizeof(i); i++) { contents[i] = i; } @@ -885,7 +880,7 @@ TEST_F(WriteMaxWrite, write) ASSERT_EQ(bufsize, write(fd, contents, bufsize)) << strerror(errno); leak(fd); - free(contents); + delete[] contents; } TEST_F(Write, write_nothing) @@ -966,15 +961,13 @@ TEST_F(WriteCluster, clustering) const char RELPATH[] = "some_file.txt"; uint64_t ino = 42; int i, fd; - void *wbuf, *wbuf2x; + char *wbuf, *wbuf2x; ssize_t bufsize = m_maxbcachebuf; off_t filesize = 5 * bufsize; - wbuf = malloc(bufsize); - ASSERT_NE(nullptr, wbuf) << strerror(errno); + wbuf = new char[bufsize]; memset(wbuf, 'X', bufsize); - wbuf2x = malloc(2 * bufsize); - ASSERT_NE(nullptr, wbuf2x) << strerror(errno); + wbuf2x = new char[2 * bufsize]; memset(wbuf2x, 'X', 2 * bufsize); expect_lookup(RELPATH, ino, filesize); @@ -997,8 +990,8 @@ TEST_F(WriteCluster, clustering) << strerror(errno); } close(fd); - free(wbuf2x); - free(wbuf); + delete[] wbuf2x; + delete[] wbuf; } /* @@ -1015,12 +1008,11 @@ TEST_F(WriteCluster, cluster_write_err) const char RELPATH[] = "some_file.txt"; uint64_t ino = 42; int i, fd; - void *wbuf; + char *wbuf; ssize_t bufsize = m_maxbcachebuf; off_t filesize = 4 * bufsize; - wbuf = malloc(bufsize); - ASSERT_NE(nullptr, wbuf) << strerror(errno); + wbuf = new char[bufsize]; memset(wbuf, 'X', bufsize); expect_lookup(RELPATH, ino, filesize); @@ -1042,7 +1034,7 @@ TEST_F(WriteCluster, cluster_write_err) << strerror(errno); } close(fd); - free(wbuf); + delete[] wbuf; } /* @@ -1179,11 +1171,11 @@ TEST_F(WriteBack, mmap_direct_io) int fd; size_t len; ssize_t bufsize = strlen(CONTENTS); - void *p, *zeros; + char *zeros; + void *p; len = getpagesize(); - zeros = calloc(1, len); - ASSERT_NE(nullptr, zeros); + zeros = new char[len](); expect_lookup(RELPATH, ino, len); expect_open(ino, FOPEN_DIRECT_IO, 1); @@ -1203,7 +1195,7 @@ TEST_F(WriteBack, mmap_direct_io) ASSERT_EQ(0, munmap(p, len)) << strerror(errno); close(fd); // Write mmap'd data on close - free(zeros); + delete[] zeros; } /* @@ -1252,10 +1244,9 @@ TEST_F(WriteBackAsync, direct_io_ignores_unrelated_cached) ssize_t bufsize = strlen(CONTENTS0) + 1; ssize_t fsize = 2 * m_maxbcachebuf; char readbuf[bufsize]; - void *zeros; + char *zeros; - zeros = calloc(1, m_maxbcachebuf); - ASSERT_NE(nullptr, zeros); + zeros = new char[m_maxbcachebuf](); expect_lookup(RELPATH, ino, fsize); expect_open(ino, 0, 1); @@ -1282,7 +1273,7 @@ TEST_F(WriteBackAsync, direct_io_ignores_unrelated_cached) ASSERT_STREQ(readbuf, CONTENTS0); leak(fd); - free(zeros); + delete[] zeros; } /* @@ -1298,20 +1289,15 @@ TEST_F(WriteBackAsync, direct_io_partially_overlaps_cached_block) int fd; off_t bs = m_maxbcachebuf; ssize_t fsize = 3 * bs; - void *readbuf, *zeros, *ones, *zeroones, *onezeros; - - readbuf = malloc(bs); - ASSERT_NE(nullptr, readbuf) << strerror(errno); - zeros = calloc(1, 3 * bs); - ASSERT_NE(nullptr, zeros); - ones = calloc(1, 2 * bs); - ASSERT_NE(nullptr, ones); + char *readbuf, *zeros, *ones, *zeroones, *onezeros; + + readbuf = new char[bs]; + zeros = new char[3 * bs](); + ones = new char[2 * bs]; memset(ones, 1, 2 * bs); - zeroones = calloc(1, bs); - ASSERT_NE(nullptr, zeroones); + zeroones = new char[bs](); memset((uint8_t*)zeroones + bs / 2, 1, bs / 2); - onezeros = calloc(1, bs); - ASSERT_NE(nullptr, onezeros); + onezeros = new char[bs](); memset(onezeros, 1, bs / 2); expect_lookup(RELPATH, ino, fsize); @@ -1356,11 +1342,11 @@ TEST_F(WriteBackAsync, direct_io_partially_overlaps_cached_block) EXPECT_EQ(0, memcmp(ones, readbuf, bs / 2)); leak(fd); - free(zeroones); - free(onezeros); - free(ones); - free(zeros); - free(readbuf); + delete[] zeroones; + delete[] onezeros; + delete[] ones; + delete[] zeros; + delete[] readbuf; } /* From nobody Mon Feb 12 17:43:48 2024 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 4TYWz913S7z5BD7N; Mon, 12 Feb 2024 17:43:49 +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 4TYWz85hl5z4Vdp; Mon, 12 Feb 2024 17:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707759828; 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=1ocQawsIivLG88C0IUnJnK4NTq/X6PqEXiD+hmI4Ju0=; b=mw9ZCdkrWKk9X0QxdT4rdB7/GfhNciPJIBFE6gILxkBPVqjVMwOiF8bIs6zGBiBpvliTId 6TbwrgjpXoyvmASowgY9DZrvPupFrx7DUsQW3VyLZmoBz6xhnqmPY9rGngPY5EVYVOeqF4 HcJiMiAUOCHQy6Zfifpn2oXler3iXYf3GrLv0PjAZLxdV4rkP34rPpxsBPoBVf9X73Zrex nh6kiUOOz6+NyVQEcpHyPD6ujF91zuQepLXFTV6Imtb9t0pnTpP49azpM03bXceFZ403ac +BXLm5yaqbNZOMgvYN4kkLk56+ELuecHasqCUZmNN8LnbAvKVzPKb86fjh9Lrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707759828; a=rsa-sha256; cv=none; b=LGyVpchep0ErJkIP6nhZBwM/w/UJAttp/J/TqVbCltIOacUjt5hhCuNTxNb93S/Jhz0a8e GTn56WZNpTfKHnQTYrcj2R63gxWYjlTbj9wg5vbdZT7IpxqiQ0Zkqo+o09go3cOMt1W7uZ IoMDCgAdk+YhsjFfLKtQqq52n0YbQbLqK6xNdtft8qsDdVCpAPNKNPeF89yLZMTcKGEb07 z5WNLs597vEhHCSAlyXYsfUJHgTQcg0PCk6ItIt90GhkoFm3LVbLz8HR4Df099NDPhMZpM chL8isRPbc7NYWeZrPBbYbd2M3kqGIwnVIuAkXGsXXfkaVHTC1FUyE5nDD7opQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707759828; 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=1ocQawsIivLG88C0IUnJnK4NTq/X6PqEXiD+hmI4Ju0=; b=IBUAcWqRI+PrMikD5KfbCKVqcvm5WUPvPMPI1+If5aTxj9hGsYLk4hoek31hMmcvcj0on+ l5VhSKHqhbLZaiwR0JXyObTcJdz4h1p8EQuEtGHOJyQnIUlJE9E3hI9MXoCciLUSIqCx+k LsYTbmUfsUhpuD0wVjkhYiu6IAdHXZugALUIzqsVwsrF4XgQL+7UQ1yo9gxiF42YRey5C0 x5kOd8yC1c7xiFtEJziFfsjdPvCybMfGtqrigSiZleHB3y6E1Yc+W0qOvopQj498xz1Icj iXvSGODMmNZO1D9H5wUjo4HmSI5CHl6v4mt3281DYrqxE70QX0szLFh2giLCqw== 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 4TYWz84nzNzh9N; Mon, 12 Feb 2024 17:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CHhmiu012318; Mon, 12 Feb 2024 17:43:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CHhm3v012315; Mon, 12 Feb 2024 17:43:48 GMT (envelope-from git) Date: Mon, 12 Feb 2024 17:43:48 GMT Message-Id: <202402121743.41CHhm3v012315@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 314a881fce0c - stable/14 - fusefs: fix some memory leaks in the tests 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 314a881fce0cd48ee4f67fb924432f53d4de0ea0 Auto-Submitted: auto-generated The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=314a881fce0cd48ee4f67fb924432f53d4de0ea0 commit 314a881fce0cd48ee4f67fb924432f53d4de0ea0 Author: Alan Somers AuthorDate: 2024-01-17 21:13:05 +0000 Commit: Alan Somers CommitDate: 2024-02-12 17:43:07 +0000 fusefs: fix some memory leaks in the tests (cherry picked from commit 39f5d8dd1b2fea7cff0770efb0bc3d6e33e24279) --- tests/sys/fs/fusefs/fallocate.cc | 2 ++ tests/sys/fs/fusefs/mockfs.cc | 1 + 2 files changed, 3 insertions(+) diff --git a/tests/sys/fs/fusefs/fallocate.cc b/tests/sys/fs/fusefs/fallocate.cc index 92e327be5ade..ff5e3eb4f4bb 100644 --- a/tests/sys/fs/fusefs/fallocate.cc +++ b/tests/sys/fs/fusefs/fallocate.cc @@ -302,6 +302,7 @@ TEST_F(Fspacectl, erofs) build_iovec(&iov, &iovlen, "fspath", (void*)statbuf.f_mntonname, -1); build_iovec(&iov, &iovlen, "from", __DECONST(void *, "/dev/fuse"), -1); ASSERT_EQ(0, nmount(iov, iovlen, newflags)) << strerror(errno); + free_iovec(&iov, &iovlen); EXPECT_EQ(-1, fspacectl(fd, SPACECTL_DEALLOC, &rqsr, 0, NULL)); EXPECT_EQ(EROFS, errno); @@ -633,6 +634,7 @@ TEST_F(PosixFallocate, erofs) build_iovec(&iov, &iovlen, "fspath", (void*)statbuf.f_mntonname, -1); build_iovec(&iov, &iovlen, "from", __DECONST(void *, "/dev/fuse"), -1); ASSERT_EQ(0, nmount(iov, iovlen, newflags)) << strerror(errno); + free_iovec(&iov, &iovlen); EXPECT_EQ(EROFS, posix_fallocate(fd, offset, length)); diff --git a/tests/sys/fs/fusefs/mockfs.cc b/tests/sys/fs/fusefs/mockfs.cc index 92fc0c0d97a1..bd7bd1b663f9 100644 --- a/tests/sys/fs/fusefs/mockfs.cc +++ b/tests/sys/fs/fusefs/mockfs.cc @@ -521,6 +521,7 @@ MockFS::MockFS(int max_readahead, bool allow_other, bool default_permissions, if (nmount(iov, iovlen, 0)) throw(std::system_error(errno, std::system_category(), "Couldn't mount filesystem")); + free_iovec(&iov, &iovlen); // Setup default handler ON_CALL(*this, process(_, _)) From nobody Mon Feb 12 17:43:49 2024 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 4TYWzB0qmqz5BDFk; Mon, 12 Feb 2024 17:43:50 +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 4TYWz96nmJz4Vdx; Mon, 12 Feb 2024 17:43:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707759830; 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=U2+n8BJjXbB0TjdH3nHpwHsSCyGn3lVxm5R+bTx3RpE=; b=qrYcSg4Rm/93cqT7rIkD/a3Ksp1KXy1DJI4z/c1x+NfTHV/fsp9l0xPm8cQAgEt38Jq2La tHxO8dtEaz6c1xNluGe6czoUcWULWTzccvUiOjt0ZIyehZQCBrQpU0iM7AqndBjUyGu35f zW6/Q8ZOqWE2h9P64w2MgrtE/DD5uLVU0N2BSNiuUaRY9vLz1oNR3rckCpK1N1NsKALd0W uAisWYVcimhKdk1/AKY/Wa6ohmF/6Ua6OKCyn0MQgNc3g5FyAqG2qQit1Qw1EBwoZXP4tA qlRm3y0eBYV3TcoR7wksawam/UHqbOVKEy3XH1b5yXM1acDnWlKu0Yo/PSWfUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707759830; a=rsa-sha256; cv=none; b=P2A2dmcFtuCzbbfxqr0snR6i0DekXU7vgjt8ed7mFks6GZ9aYxYAlNUadiWubMu06PXuc1 ZOa/lytTloY15eb1RaI7Gx4n2OUUG7QUSQMUqLKdMDsShkMjLe7gRhXAEJkeRLcqrklgOD 5cnlN3UHoLBoBoWI46X4CJ4weZePSdE+GYiPZADXxuj5XvDRxmB3eeZwa3cG+Mn0krzlx+ 1h65Jqd0B0K/GRxbCUxTtGspB6U9YFj8E/+/yNMJTWTObBfBWtF2u/tXRpMH4wpiGYmWhD fTSu269aJR0lt+9BMP1Egkh6pCXLSCWiG8u/+E0uJmN9KPeKrsaxxZxm2SqqyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707759830; 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=U2+n8BJjXbB0TjdH3nHpwHsSCyGn3lVxm5R+bTx3RpE=; b=uoWSeLn1fwTFDmO56ZCFoUYAe7xeMKAP4fgeDsl9NoT33x0WIuTsiEA7DubHBUGN4HhhsT waVCh8DbfztVMFvveuHO/AmJF6jDBhvkMDgd4M7dbsr2K+HGg66bfIznxp/Z1lrXYJ+/Rt JNKbPekzwmFE46uKvMJhHFZK8epDa0nivUcFiKDAiuKPOlCe1et+zZWEHLo67gWOpq479s VyhkLyfqYf7Ch/TVQefg2sbxeJTGaz+kl9ZnTmsIqPQ0lyn42uXtdJ9GtfMrAaM8ZIUFKg fWpPyiqAH4UDOwr43b9QayDn46m4KLGPoLWVzJ0Je4H39F0S7EGIlRUEhPRa6Q== 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 4TYWz95qM4zh9P; Mon, 12 Feb 2024 17:43:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CHhnKi012363; Mon, 12 Feb 2024 17:43:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CHhn4t012360; Mon, 12 Feb 2024 17:43:49 GMT (envelope-from git) Date: Mon, 12 Feb 2024 17:43:49 GMT Message-Id: <202402121743.41CHhn4t012360@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 739488cc21b1 - stable/14 - fusefs: fix invalid value for st_birthtime.tv_nsec 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 739488cc21b1ad08994aa5c36d85b9c11866b29d Auto-Submitted: auto-generated The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=739488cc21b1ad08994aa5c36d85b9c11866b29d commit 739488cc21b1ad08994aa5c36d85b9c11866b29d Author: Alan Somers AuthorDate: 2024-01-25 15:19:37 +0000 Commit: Alan Somers CommitDate: 2024-02-12 17:43:11 +0000 fusefs: fix invalid value for st_birthtime.tv_nsec If a file system's on-disk format does not support st_birthtime, it isn't clear what value it should return in stat(2). Neither our man page nor the OpenGroup specifies. But our convention for UFS and msdosfs is to return { .tv_sec = -1, .tv_nsec = 0 }. fusefs is different. It returns { .tv_sec = -1, .tv_nsec = -1 }. It's done that ever since the initial import in SVN r241519. Most software apparently handles this just fine. It must, because we've had no complaints. But the Rust standard library will panic when reading such a timestamp during std::fs::metadata, even if the caller doesn't care about that particular value. That's a separate bug, and should be fixed. Change our invalid value to match msdosfs and ufs, pacifying the Rust standard library. PR: 276602 Sponsored by: Axcient Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D43590 (cherry picked from commit 55b80e2ca52c4b27c4920d372a6e71ac9ab7da9e) --- sys/fs/fuse/fuse_internal.c | 1 - sys/fs/fuse/fuse_node.c | 7 +++++++ tests/sys/fs/fusefs/getattr.cc | 15 +++++++++------ tests/sys/fs/fusefs/lookup.cc | 15 +++++++++------ 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/sys/fs/fuse/fuse_internal.c b/sys/fs/fuse/fuse_internal.c index e2351e4ac24a..2d1c729a395a 100644 --- a/sys/fs/fuse/fuse_internal.c +++ b/sys/fs/fuse/fuse_internal.c @@ -326,7 +326,6 @@ fuse_internal_cache_attrs(struct vnode *vp, struct fuse_attr *attr, else return; - vattr_null(vp_cache_at); vp_cache_at->va_fsid = mp->mnt_stat.f_fsid.val[0]; vp_cache_at->va_fileid = attr->ino; vp_cache_at->va_mode = attr->mode & ~S_IFMT; diff --git a/sys/fs/fuse/fuse_node.c b/sys/fs/fuse/fuse_node.c index 6a7f2e88831c..1ff67ecf74e4 100644 --- a/sys/fs/fuse/fuse_node.c +++ b/sys/fs/fuse/fuse_node.c @@ -156,7 +156,14 @@ fuse_vnode_init(struct vnode *vp, struct fuse_vnode_data *fvdat, { fvdat->nid = nodeid; LIST_INIT(&fvdat->handles); + vattr_null(&fvdat->cached_attrs); + fvdat->cached_attrs.va_birthtime.tv_sec = -1; + fvdat->cached_attrs.va_birthtime.tv_nsec = 0; + fvdat->cached_attrs.va_fsid = VNOVAL; + fvdat->cached_attrs.va_gen = 0; + fvdat->cached_attrs.va_rdev = NODEV; + if (nodeid == FUSE_ROOT_ID) { vp->v_vflag |= VV_ROOT; } diff --git a/tests/sys/fs/fusefs/getattr.cc b/tests/sys/fs/fusefs/getattr.cc index 1795f29a5d76..98a757fdff94 100644 --- a/tests/sys/fs/fusefs/getattr.cc +++ b/tests/sys/fs/fusefs/getattr.cc @@ -246,12 +246,15 @@ TEST_F(Getattr, ok) EXPECT_EQ(ino, sb.st_ino); EXPECT_EQ(S_IFREG | 0644, sb.st_mode); - //st_birthtim and st_flags are not supported by protocol 7.8. They're - //only supported as OS-specific extensions to OSX. - //EXPECT_EQ(, sb.st_birthtim); - //EXPECT_EQ(, sb.st_flags); - - //FUSE can't set st_blksize until protocol 7.9 + /* + * st_birthtim and st_flags are not supported by the fuse protocol. + * They're only supported as OS-specific extensions to OSX. For + * birthtime, the convention for "not supported" is "negative one + * second". + */ + EXPECT_EQ(-1, sb.st_birthtim.tv_sec); + EXPECT_EQ(0, sb.st_birthtim.tv_nsec); + EXPECT_EQ(0u, sb.st_flags); } /* diff --git a/tests/sys/fs/fusefs/lookup.cc b/tests/sys/fs/fusefs/lookup.cc index 549df0369fa7..6d506c1ab700 100644 --- a/tests/sys/fs/fusefs/lookup.cc +++ b/tests/sys/fs/fusefs/lookup.cc @@ -112,12 +112,15 @@ TEST_F(Lookup, attr_cache) // fuse(4) does not _yet_ support inode generations //EXPECT_EQ(generation, sb.st_gen); - //st_birthtim and st_flags are not supported by protocol 7.8. They're - //only supported as OS-specific extensions to OSX. - //EXPECT_EQ(, sb.st_birthtim); - //EXPECT_EQ(, sb.st_flags); - - //FUSE can't set st_blksize until protocol 7.9 + /* + * st_birthtim and st_flags are not supported by the fuse protocol. + * They're only supported as OS-specific extensions to OSX. For + * birthtime, the convention for "not supported" is "negative one + * second". + */ + EXPECT_EQ(-1, sb.st_birthtim.tv_sec); + EXPECT_EQ(0, sb.st_birthtim.tv_nsec); + EXPECT_EQ(0u, sb.st_flags); } /* From nobody Mon Feb 12 18:03:02 2024 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 4TYXPM1cwHz5BGWN; Mon, 12 Feb 2024 18:03: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 4TYXPM0K9Jz4Zfr; Mon, 12 Feb 2024 18:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707760983; 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=IXzc0chdLiS7001dOBUAPO6QlmekHzN9rjqY3xT0smI=; b=FVONJEChF9DqkZUl8eAq+cifsrD6wq6zoj25aCkQBA34ngzTBH5e5aMJrnqQtbY860zn5q HX2rCG267359yVYsM+3zxAkVj7KcjEGTtlodNULrMhWiE849pqtIOViA53w0HysEYKY9bv /crr3rCrFy8CRaJ1R3YHn0dcaBxRqa4CSJfmMsjwj77PTNjU4bHiXGqIGexiPBFhyecszM K1JMdY8Oe6pNKuLbTU/12mudirok1gDJvLdH1dd2mvorJ9m6xcS1tRlvDvwh3r/wDxAXa/ xmOJ0z/su1hYn7wuLdJXqdJh5dE7tUdVANGLyHZOMx7/IMyXAdbP7wjqYEtnlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707760983; a=rsa-sha256; cv=none; b=cDQlJVxO6r4t72xYb+y5Q1a2BGykGK3ND6+S8Rmt8xx7tK5nDX+AQ6agX8TzaO7pIFpysW Na4CEvLra7gI2FPsvqPpV2pf9BgzpAcuu+Kpgv4632gCQRQw4kYfrraPlOOF80fKgCjWE6 Qx/2+CtwUjqHthP7zVFM/4CEPF7e/u0YsuDrt85TMYDeW6B2anABxcA4eItgZyKMd4Dz8L Rsb4mDEqE1hMwWFeR906oScvy2fRFFKx4UwNMSlSs3WfJapeenSlNj580RhOCxNRmAG4BE BAbk5/8J0+Eva/xImz9eYxEwhwEZX6j2tT4GV0kbqJbfxtJ27+ioglBllR9JIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707760983; 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=IXzc0chdLiS7001dOBUAPO6QlmekHzN9rjqY3xT0smI=; b=dsCLaLDN2qU4wrbVbgjU5m99NdVQ9EBMM4dzO8U/waoanPOO5+zgJK0Lh6M5/6jvUoH2C7 zrYbUQTbVZkgo7H9s6Wo/yHMmpUNbUQbJuBhR0MfZaQjUIDKnsvV73jhTru72uJi69OS+i LNA0fPqNAdq+wiV1H29l3cWMAFW59kpzmr1k+Xzsk/H8oa+gJiavt8BaYX3LU7iU4HsL7r BUWZrZnWWVc+A0+DtGUQNZKeQ7zSwDoGuHV1e2oTLrT0lgtmlHACZ5oC3UgOx2E3NjVksb A4vabMvdBgSIQ3H7iOswBYI4kacHdWvoGP+3s6dQZ/hvTsrwcpPIedZJk09nJA== 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 4TYXPL6WTRzhg5; Mon, 12 Feb 2024 18:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CI32Pw046574; Mon, 12 Feb 2024 18:03:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CI32EC046571; Mon, 12 Feb 2024 18:03:02 GMT (envelope-from git) Date: Mon, 12 Feb 2024 18:03:02 GMT Message-Id: <202402121803.41CI32EC046571@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: f3d5f910d53d - stable/13 - fusefs: more consistent operand ordering in io.cc 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f3d5f910d53df724e81421d3a8ac841c46bfdf81 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=f3d5f910d53df724e81421d3a8ac841c46bfdf81 commit f3d5f910d53df724e81421d3a8ac841c46bfdf81 Author: Alan Somers AuthorDate: 2024-01-15 23:16:40 +0000 Commit: Alan Somers CommitDate: 2024-02-12 18:02:44 +0000 fusefs: more consistent operand ordering in io.cc (cherry picked from commit daf26f9350cf8fb3ae60d4528b60ddf65a56f5cc) --- tests/sys/fs/fusefs/io.cc | 54 +++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/tests/sys/fs/fusefs/io.cc b/tests/sys/fs/fusefs/io.cc index fc648f44d755..77df0ceede64 100644 --- a/tests/sys/fs/fusefs/io.cc +++ b/tests/sys/fs/fusefs/io.cc @@ -281,7 +281,7 @@ void do_ftruncate(off_t offs) m_filesize = offs; } -void do_mapread(ssize_t size, off_t offs) +void do_mapread(off_t offs, ssize_t size) { void *control_buf, *p; off_t pg_offset, page_mask; @@ -307,7 +307,7 @@ void do_mapread(ssize_t size, off_t offs) free(control_buf); } -void do_read(ssize_t size, off_t offs) +void do_read(off_t offs, ssize_t size) { void *test_buf, *control_buf; ssize_t r; @@ -331,7 +331,7 @@ void do_read(ssize_t size, off_t offs) free(test_buf); } -void do_mapwrite(ssize_t size, off_t offs) +void do_mapwrite(off_t offs, ssize_t size) { char *buf; void *p; @@ -368,7 +368,7 @@ void do_mapwrite(ssize_t size, off_t offs) ASSERT_EQ(0, munmap(p, map_size)) << strerror(errno); } -void do_write(ssize_t size, off_t offs) +void do_write(off_t offs, ssize_t size) { char *buf; long i; @@ -416,9 +416,9 @@ TEST_P(Io, extend_from_dirty_page) ssize_t rsize = 0x9b22; off_t truncsize = 0x28702; - do_write(wsize, wofs); + do_write(wofs, wsize); do_ftruncate(truncsize); - do_read(rsize, rofs); + do_read(rofs, rsize); } /* @@ -428,9 +428,9 @@ TEST_P(Io, extend_from_dirty_page) */ TEST_P(IoCacheable, extend_by_mapwrite) { - do_mapwrite(0x849e, 0x29a3a); /* [0x29a3a, 0x31ed7] */ - do_mapwrite(0x3994, 0x3c7d8); /* [0x3c7d8, 0x4016b] */ - do_read(0xf556, 0x30c16); /* [0x30c16, 0x4016b] */ + do_mapwrite(0x29a3a, 0x849e); /* [0x29a3a, 0x31ed7] */ + do_mapwrite(0x3c7d8, 0x3994); /* [0x3c7d8, 0x4016b] */ + do_read(0x30c16, 0xf556); /* [0x30c16, 0x4016b] */ } /* @@ -442,9 +442,9 @@ TEST_P(IoCacheable, extend_by_mapwrite) */ TEST_P(Io, last_page) { - do_write(0xcc77, 0x1134f); /* [0x1134f, 0x1dfc5] */ - do_write(0xdfa7, 0x2096a); /* [0x2096a, 0x2e910] */ - do_read(0xb5b7, 0x1a3aa); /* [0x1a3aa, 0x25960] */ + do_write(0x1134f, 0xcc77); /* [0x1134f, 0x1dfc5] */ + do_write(0x2096a, 0xdfa7); /* [0x2096a, 0x2e910] */ + do_read(0x1a3aa, 0xb5b7); /* [0x1a3aa, 0x25960] */ } /* @@ -454,8 +454,8 @@ TEST_P(Io, last_page) */ TEST_P(IoCacheable, mapread_hole) { - do_write(0x123b7, 0xf205); /* [0xf205, 0x215bb] */ - do_mapread(0xeeea, 0x2f4c); /* [0x2f4c, 0x11e35] */ + do_write(0xf205, 0x123b7); /* [0xf205, 0x215bb] */ + do_mapread(0x2f4c, 0xeeea); /* [0x2f4c, 0x11e35] */ } /* @@ -470,8 +470,8 @@ TEST_P(Io, read_hole_from_cached_block) off_t rofs = 0x472e; ssize_t rsize = 0xd8d5; - do_write(wsize, wofs); - do_read(rsize, rofs); + do_write(wofs, wsize); + do_read(rofs, rsize); } /* @@ -491,10 +491,10 @@ TEST_P(Io, truncate_into_dirty_buffer) ssize_t rsize = 0x29ff; off_t truncsize1 = 0x152b4; - do_write(wsize0, wofs0); - do_write(wsize1, wofs1); + do_write(wofs0, wsize0); + do_write(wofs1, wsize1); do_ftruncate(truncsize0); - do_read(rsize, rofs); + do_read(rofs, rsize); do_ftruncate(truncsize1); close(m_test_fd); } @@ -523,11 +523,11 @@ TEST_P(Io, truncate_into_dirty_buffer2) * Creates a dirty buffer. The part in lbn 2 doesn't flush * synchronously. */ - do_write(wsize, wofs); + do_write(wofs, wsize); /* Truncates part of the dirty buffer created in step 2 */ do_ftruncate(truncsize1); /* XXX ?I don't know why this is necessary? */ - do_read(rsize2, rofs2); + do_read(rofs2, rsize2); /* Truncates the dirty buffer */ do_ftruncate(truncsize2); close(m_test_fd); @@ -558,10 +558,10 @@ TEST_P(Io, truncate_into_dirty_buffer2) */ TEST_P(Io, resize_a_valid_buffer_while_extending) { - do_write(0x14530, 0x36ee6); /* [0x36ee6, 0x4b415] */ - do_write(0x1507c, 0x33256); /* [0x33256, 0x482d1] */ - do_write(0x175c, 0x4c03d); /* [0x4c03d, 0x4d798] */ - do_read(0xe277, 0x3599c); /* [0x3599c, 0x43c12] */ + do_write(0x36ee6, 0x14530); /* [0x36ee6, 0x4b415] */ + do_write(0x33256, 0x1507c); /* [0x33256, 0x482d1] */ + do_write(0x4c03d, 0x175c); /* [0x4c03d, 0x4d798] */ + do_read(0x3599c, 0xe277); /* [0x3599c, 0x43c12] */ close(m_test_fd); } @@ -572,7 +572,7 @@ TEST_P(Io, resize_a_valid_buffer_while_extending) */ TEST_P(IoCacheable, vnode_pager_generic_putpage_clean_block_at_eof) { - do_mapwrite(0x1bbc3, 0x3b4e0); + do_mapwrite(0x3b4e0, 0x1bbc3); } /* @@ -581,7 +581,7 @@ TEST_P(IoCacheable, vnode_pager_generic_putpage_clean_block_at_eof) */ TEST_P(IoCopyFileRange, copy_file_range_from_mapped_write) { - do_mapwrite(0x1000, 0); + do_mapwrite(0, 0x1000); do_copy_file_range(0, 0x1000, 0x1000); do_read(0x1000, 0x1000); } From nobody Mon Feb 12 18:03:03 2024 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 4TYXPN1m0Rz5BGMj; Mon, 12 Feb 2024 18:03:04 +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 4TYXPN1KgHz4ZlY; Mon, 12 Feb 2024 18:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707760984; 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=W5CcNBQQ4eWsDPk/6qQ7k+ilEdGZHhU+Wd6L0s0u+nw=; b=JKha0R4XSct8arkjNyKMe02klGixCYQGTgRjp70RUfzpYIDcx3ZipZ+ejUsgRnQgXeQR2r iYv2AvXy09PcYXdqJP7n10/H3ivMktr9WcPlgJ8fP2r48CrRdiXDzuS3NhsClDn5wQo+B4 BG72M9ljJgk8wqk9A+dWlwsUhdqEbq2eiFXhiomCNi2QE3JFWlDjujmzHHUXnbHdPiiZzl cCoWYO2cicw/Qf0Y/lz/G4rNJzag8rRpKI7nAtr3i9QGdnw17r7vp2/8iZFZ2awUrkusab ZB5x6zpPS3UbW6vLZC+i8kux8t79d6nE3hh7EmpbWbiVpOhqjO1ZIyYbjcV5lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707760984; a=rsa-sha256; cv=none; b=D1sGJGHQtIRRLuoThU9iYz6EmViZWlrvCxO52j6FPrbjToJCvch1UZn4RGErJkIovP/q2H 6EP01r47STH5I2SdcHajZnA6SEanJQ4SvQwLSuLKOPhfU9/xQ/NDP28IpcN3+dcVA6Ec9G 20vnWKuo1ucAaQjCRP0ndda5I/2/5XJdzQSXHvwwrjBjvuxxmExpktHeAG/F7S1O9LhbmV MNvWWme29rfCVj7QVqKyZnWhp++1xeEYzonlXYIHxEnU1wrgBq9ec5PkcxX+qELyxRiz4H kUjS5roJXUQriJFI+4a+5fwJ99P7Z1r5GHliZsEyiXSWpcJOBL85mJfTgyrm3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707760984; 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=W5CcNBQQ4eWsDPk/6qQ7k+ilEdGZHhU+Wd6L0s0u+nw=; b=YEm+C787jWc18Ajl1tXjWoiPwUrPtpfc7NqgvUqt5uLeCGTJFw6giUPQQEKMApjc62Y51V qYzmfABbkULeTlls17TiBUx4R28zIfcToAyiogKn8wMIlbt3WNFh/22bfS18jYUAmtIOGp Hpv43jvhjz4meHNVCAKUQhRJ0d22CcZqvhDPOA4UCiPCTEkllmoS20cmhySd9QHeNzMMe6 m4e0OfGjBG0HW6RYenAeDa/GtPL8JxmyxJhU3x0Ij1Fr73djICtpsegs10YCm6Hw66sRQ4 +bvHWiSQSxx11H4eMy9XeTeJJjHj/hVBsVtJeA60OMU0af9axWen6+wwEtpy/A== 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 4TYXPN0PRBzhVq; Mon, 12 Feb 2024 18:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CI33AW046622; Mon, 12 Feb 2024 18:03:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CI338i046619; Mon, 12 Feb 2024 18:03:03 GMT (envelope-from git) Date: Mon, 12 Feb 2024 18:03:03 GMT Message-Id: <202402121803.41CI338i046619@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 65e25e4a614a - stable/13 - fusefs: fix invalid value for st_birthtime.tv_nsec 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 65e25e4a614a99243e7419279b294e399991dfff Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=65e25e4a614a99243e7419279b294e399991dfff commit 65e25e4a614a99243e7419279b294e399991dfff Author: Alan Somers AuthorDate: 2024-01-25 15:19:37 +0000 Commit: Alan Somers CommitDate: 2024-02-12 18:02:50 +0000 fusefs: fix invalid value for st_birthtime.tv_nsec If a file system's on-disk format does not support st_birthtime, it isn't clear what value it should return in stat(2). Neither our man page nor the OpenGroup specifies. But our convention for UFS and msdosfs is to return { .tv_sec = -1, .tv_nsec = 0 }. fusefs is different. It returns { .tv_sec = -1, .tv_nsec = -1 }. It's done that ever since the initial import in SVN r241519. Most software apparently handles this just fine. It must, because we've had no complaints. But the Rust standard library will panic when reading such a timestamp during std::fs::metadata, even if the caller doesn't care about that particular value. That's a separate bug, and should be fixed. Change our invalid value to match msdosfs and ufs, pacifying the Rust standard library. PR: 276602 Sponsored by: Axcient Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D43590 --- sys/fs/fuse/fuse_internal.c | 1 - sys/fs/fuse/fuse_node.c | 7 +++++++ tests/sys/fs/fusefs/getattr.cc | 15 +++++++++------ tests/sys/fs/fusefs/lookup.cc | 15 +++++++++------ 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/sys/fs/fuse/fuse_internal.c b/sys/fs/fuse/fuse_internal.c index 13d18127d2e6..c851cb2e34f4 100644 --- a/sys/fs/fuse/fuse_internal.c +++ b/sys/fs/fuse/fuse_internal.c @@ -326,7 +326,6 @@ fuse_internal_cache_attrs(struct vnode *vp, struct fuse_attr *attr, else return; - vattr_null(vp_cache_at); vp_cache_at->va_fsid = mp->mnt_stat.f_fsid.val[0]; vp_cache_at->va_fileid = attr->ino; vp_cache_at->va_mode = attr->mode & ~S_IFMT; diff --git a/sys/fs/fuse/fuse_node.c b/sys/fs/fuse/fuse_node.c index a02b41e24ad8..52bd2d92f4da 100644 --- a/sys/fs/fuse/fuse_node.c +++ b/sys/fs/fuse/fuse_node.c @@ -156,7 +156,14 @@ fuse_vnode_init(struct vnode *vp, struct fuse_vnode_data *fvdat, { fvdat->nid = nodeid; LIST_INIT(&fvdat->handles); + vattr_null(&fvdat->cached_attrs); + fvdat->cached_attrs.va_birthtime.tv_sec = -1; + fvdat->cached_attrs.va_birthtime.tv_nsec = 0; + fvdat->cached_attrs.va_fsid = VNOVAL; + fvdat->cached_attrs.va_gen = 0; + fvdat->cached_attrs.va_rdev = NODEV; + if (nodeid == FUSE_ROOT_ID) { vp->v_vflag |= VV_ROOT; } diff --git a/tests/sys/fs/fusefs/getattr.cc b/tests/sys/fs/fusefs/getattr.cc index 1795f29a5d76..98a757fdff94 100644 --- a/tests/sys/fs/fusefs/getattr.cc +++ b/tests/sys/fs/fusefs/getattr.cc @@ -246,12 +246,15 @@ TEST_F(Getattr, ok) EXPECT_EQ(ino, sb.st_ino); EXPECT_EQ(S_IFREG | 0644, sb.st_mode); - //st_birthtim and st_flags are not supported by protocol 7.8. They're - //only supported as OS-specific extensions to OSX. - //EXPECT_EQ(, sb.st_birthtim); - //EXPECT_EQ(, sb.st_flags); - - //FUSE can't set st_blksize until protocol 7.9 + /* + * st_birthtim and st_flags are not supported by the fuse protocol. + * They're only supported as OS-specific extensions to OSX. For + * birthtime, the convention for "not supported" is "negative one + * second". + */ + EXPECT_EQ(-1, sb.st_birthtim.tv_sec); + EXPECT_EQ(0, sb.st_birthtim.tv_nsec); + EXPECT_EQ(0u, sb.st_flags); } /* diff --git a/tests/sys/fs/fusefs/lookup.cc b/tests/sys/fs/fusefs/lookup.cc index 549df0369fa7..6d506c1ab700 100644 --- a/tests/sys/fs/fusefs/lookup.cc +++ b/tests/sys/fs/fusefs/lookup.cc @@ -112,12 +112,15 @@ TEST_F(Lookup, attr_cache) // fuse(4) does not _yet_ support inode generations //EXPECT_EQ(generation, sb.st_gen); - //st_birthtim and st_flags are not supported by protocol 7.8. They're - //only supported as OS-specific extensions to OSX. - //EXPECT_EQ(, sb.st_birthtim); - //EXPECT_EQ(, sb.st_flags); - - //FUSE can't set st_blksize until protocol 7.9 + /* + * st_birthtim and st_flags are not supported by the fuse protocol. + * They're only supported as OS-specific extensions to OSX. For + * birthtime, the convention for "not supported" is "negative one + * second". + */ + EXPECT_EQ(-1, sb.st_birthtim.tv_sec); + EXPECT_EQ(0, sb.st_birthtim.tv_nsec); + EXPECT_EQ(0u, sb.st_flags); } /* From nobody Mon Feb 12 20:17:51 2024 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 4TYbNw0b07z5BWYW; Mon, 12 Feb 2024 20:17:52 +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 4TYbNw03dZz45wQ; Mon, 12 Feb 2024 20:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707769072; 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=j8qcmRVsihBu3uQPRY9GyWjQssVnSBOsKrwlUsCE7ws=; b=ijmtKCR+RN2Pv6WjiCF/jmZIPboIk8OsOVUj15FBsvrVKHjcboeqd/ro3UqQHSOq0xvLeO uykoxndCxSRO57UyLYQs8SPJFlUcp9nxkireedY8DVdsuXDRA7zBk7i28tz7OTOr3ow84+ WHE4j2vGx9vkvTJ+5CmntaQ44Eqo4a83YiHknBI6lvAetcMy3hG9OoflDi+zODzzgsqSDc huTH1lXGn/dWVea/S5hwRtOvt3I+PMRYoOsszRDJI7HU2yrXeU8pyUnrRqEWez/tSv3q+C WnTgnNu2b/6IMnUHe8Oz98K7S9ObK2JUKX8DzpFxOLiez1kR3wjS0rVt+ZAKYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707769072; a=rsa-sha256; cv=none; b=GmiHUk7Xr5vwX5RJS1Vgo1xT3xMAj3Tc4RDzztku6SsWrlv8kQ7zqcswVDlOzTYVqZRfgN dYmRF2vQC/30sFTe24krBZJRMrI4x8YLkW7R8mAYFxERtB/A0EYRSctlohqjsWnlQmRg4u FqYvw6JBPi95x5cwL7sPWPncNEzz5R9gYim+AOFte24wbcG9rN+T6UY/NhjbdQzBoOvmSn lQjavpdnhOZ1742A9bS2mi4n/6yzzIp+lpU0NiWRxtVniK7WNd3E/MmyidiKqsFylRXv9J zOmPZFA3G3LperptWt1y6z2xYjgEedI+dwD/irih7rMT38BchoGNATGNsdCDAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707769072; 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=j8qcmRVsihBu3uQPRY9GyWjQssVnSBOsKrwlUsCE7ws=; b=ysZbuDDZQ9r9UFmlfozHZ4AxtUJ5jI5hyJ0tAuUSK0U18PpAh9QEcqtv1pbAxPWwo1vMDC PzNQt+oU+nqrLs2TF0/x8nprsYzdFNPBdEKC0MjlXJVpUIo8bWH1OeNo8zLqZPh3IrbSdN m4F/+7goctcTEtr9DmV3ueRx74ZkczdK2CpvfZpOhPMEI37IOJpSYCOEG3sa35Dj2bPsHz +xmRnpH4uyhderSqi8senq+mpZPDxlgv+KpvajzM/xj6f0xTqZfRXziZpJurenkE8iWp11 a16sQ4pgkylzfiaESPrZiHF16DxErCh0wmRmopFKoQ+1P2akFgYIB7HWPqVovA== 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 4TYbNv6Djlzlxq; Mon, 12 Feb 2024 20:17:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CKHpQo066340; Mon, 12 Feb 2024 20:17:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CKHp7K066337; Mon, 12 Feb 2024 20:17:51 GMT (envelope-from git) Date: Mon, 12 Feb 2024 20:17:51 GMT Message-Id: <202402122017.41CKHp7K066337@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: f2c72486da30 - releng/13.3 - fusefs: fix invalid value for st_birthtime.tv_nsec 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.3 X-Git-Reftype: branch X-Git-Commit: f2c72486da30eda54f0db1a9b7ca822afc835ecf Auto-Submitted: auto-generated The branch releng/13.3 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=f2c72486da30eda54f0db1a9b7ca822afc835ecf commit f2c72486da30eda54f0db1a9b7ca822afc835ecf Author: Alan Somers AuthorDate: 2024-01-25 15:19:37 +0000 Commit: Alan Somers CommitDate: 2024-02-12 20:17:13 +0000 fusefs: fix invalid value for st_birthtime.tv_nsec If a file system's on-disk format does not support st_birthtime, it isn't clear what value it should return in stat(2). Neither our man page nor the OpenGroup specifies. But our convention for UFS and msdosfs is to return { .tv_sec = -1, .tv_nsec = 0 }. fusefs is different. It returns { .tv_sec = -1, .tv_nsec = -1 }. It's done that ever since the initial import in SVN r241519. Most software apparently handles this just fine. It must, because we've had no complaints. But the Rust standard library will panic when reading such a timestamp during std::fs::metadata, even if the caller doesn't care about that particular value. That's a separate bug, and should be fixed. Change our invalid value to match msdosfs and ufs, pacifying the Rust standard library. PR: 276602 Sponsored by: Axcient Reviewed by: emaste Approved by: re (cperciva) Differential Revision: https://reviews.freebsd.org/D43590 (cherry picked from commit 65e25e4a614a99243e7419279b294e399991dfff) --- sys/fs/fuse/fuse_internal.c | 1 - sys/fs/fuse/fuse_node.c | 7 +++++++ tests/sys/fs/fusefs/getattr.cc | 15 +++++++++------ tests/sys/fs/fusefs/lookup.cc | 15 +++++++++------ 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/sys/fs/fuse/fuse_internal.c b/sys/fs/fuse/fuse_internal.c index 13d18127d2e6..c851cb2e34f4 100644 --- a/sys/fs/fuse/fuse_internal.c +++ b/sys/fs/fuse/fuse_internal.c @@ -326,7 +326,6 @@ fuse_internal_cache_attrs(struct vnode *vp, struct fuse_attr *attr, else return; - vattr_null(vp_cache_at); vp_cache_at->va_fsid = mp->mnt_stat.f_fsid.val[0]; vp_cache_at->va_fileid = attr->ino; vp_cache_at->va_mode = attr->mode & ~S_IFMT; diff --git a/sys/fs/fuse/fuse_node.c b/sys/fs/fuse/fuse_node.c index a02b41e24ad8..52bd2d92f4da 100644 --- a/sys/fs/fuse/fuse_node.c +++ b/sys/fs/fuse/fuse_node.c @@ -156,7 +156,14 @@ fuse_vnode_init(struct vnode *vp, struct fuse_vnode_data *fvdat, { fvdat->nid = nodeid; LIST_INIT(&fvdat->handles); + vattr_null(&fvdat->cached_attrs); + fvdat->cached_attrs.va_birthtime.tv_sec = -1; + fvdat->cached_attrs.va_birthtime.tv_nsec = 0; + fvdat->cached_attrs.va_fsid = VNOVAL; + fvdat->cached_attrs.va_gen = 0; + fvdat->cached_attrs.va_rdev = NODEV; + if (nodeid == FUSE_ROOT_ID) { vp->v_vflag |= VV_ROOT; } diff --git a/tests/sys/fs/fusefs/getattr.cc b/tests/sys/fs/fusefs/getattr.cc index 1795f29a5d76..98a757fdff94 100644 --- a/tests/sys/fs/fusefs/getattr.cc +++ b/tests/sys/fs/fusefs/getattr.cc @@ -246,12 +246,15 @@ TEST_F(Getattr, ok) EXPECT_EQ(ino, sb.st_ino); EXPECT_EQ(S_IFREG | 0644, sb.st_mode); - //st_birthtim and st_flags are not supported by protocol 7.8. They're - //only supported as OS-specific extensions to OSX. - //EXPECT_EQ(, sb.st_birthtim); - //EXPECT_EQ(, sb.st_flags); - - //FUSE can't set st_blksize until protocol 7.9 + /* + * st_birthtim and st_flags are not supported by the fuse protocol. + * They're only supported as OS-specific extensions to OSX. For + * birthtime, the convention for "not supported" is "negative one + * second". + */ + EXPECT_EQ(-1, sb.st_birthtim.tv_sec); + EXPECT_EQ(0, sb.st_birthtim.tv_nsec); + EXPECT_EQ(0u, sb.st_flags); } /* diff --git a/tests/sys/fs/fusefs/lookup.cc b/tests/sys/fs/fusefs/lookup.cc index 549df0369fa7..6d506c1ab700 100644 --- a/tests/sys/fs/fusefs/lookup.cc +++ b/tests/sys/fs/fusefs/lookup.cc @@ -112,12 +112,15 @@ TEST_F(Lookup, attr_cache) // fuse(4) does not _yet_ support inode generations //EXPECT_EQ(generation, sb.st_gen); - //st_birthtim and st_flags are not supported by protocol 7.8. They're - //only supported as OS-specific extensions to OSX. - //EXPECT_EQ(, sb.st_birthtim); - //EXPECT_EQ(, sb.st_flags); - - //FUSE can't set st_blksize until protocol 7.9 + /* + * st_birthtim and st_flags are not supported by the fuse protocol. + * They're only supported as OS-specific extensions to OSX. For + * birthtime, the convention for "not supported" is "negative one + * second". + */ + EXPECT_EQ(-1, sb.st_birthtim.tv_sec); + EXPECT_EQ(0, sb.st_birthtim.tv_nsec); + EXPECT_EQ(0u, sb.st_flags); } /* From nobody Tue Feb 13 17:52:28 2024 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 4TZ86h4Vzhz59NFb; Tue, 13 Feb 2024 17:52:28 +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 4TZ86h46SDz42Gp; Tue, 13 Feb 2024 17:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707846748; 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=3Y7tPVPwcrH3kDd3/TAnQw5QjI1g5t/n0fuuj3hLPaA=; b=Y1Hnz2UyNoNj8G0x3lgKa0kmmxlaZ3H6Hleei/JSTgryfWaYwMnWD2hI3Jxp2EDLksxq6j DSdayQeXlhZsP9Jyobnsbfr5xbHbjepNAQK1rIT97S+u8egF26Xk6y5b4XYh4z78Uj/Rkw nBfl1aa1ehSMRf8KB6v2ssetGbEjOYThGKbs9jKsmbR5Rsf/heIVY5Zzz/M2/IqkM80gwn UDUlRuK955DBYv75s/Z/+vOzzL1nHKBIhsytg2jO1iOvwlpZe4AapVQS/ziBTCQueAD4B9 OHPC7tDbYgnvLa4uY10XnHJ4Tr1EjDKB+kyqi/ooGGKt/YYD0gwgv2LRkVLCAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707846748; a=rsa-sha256; cv=none; b=Mfr68CuKOh0PsYX8pXAGY6fWCMdyBXG4CXia57MCS2Ee+5A7neTGM8odjCfhO3WhYQDo2O mRweKK9ZBbQi81NTLasgxqXRrr6rLSx3nPQFXc/q5Wqo1JeNLgF9Zq8M970D3HDYjekaL7 QvMtSRgJKFJ9f3e4Ryg+G1nsN6zXWe/eowAY9M0e88kxsEgIoMNlRMHCabIrUTsw5fRwWf QQJn1F+K3SEjwg4vyVEWpCs5V14m0FoHL9BBlH+mwzX0Fq+8jUytonvTlNK5WQnfJwa/Qg 9FCUxyHmACfElA0sAHOWZWvwNq97T1T+yQC7AXLyGhG4LQDMN+QIBiZXcrdJNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707846748; 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=3Y7tPVPwcrH3kDd3/TAnQw5QjI1g5t/n0fuuj3hLPaA=; b=yB62xzVLiL6yzpkhCrsJ2hvjgj/VPnwnL7zIiE1KssGaE5TUgZVip40B1G84BQyZ4W2sc9 1Z/Zy1CZrtqdwSfDtdGUEr607080zRTZi26w5c0x0KlZulaI79w9W5qSSo0Yk/TdqbUfPl +CjHR9uxajyyGGo5c5d11iv+9pk6fGIncGK3vN4r+WiNJesGe+12JaqfHPvXUhwreBxo+a jawueQAe5hCeWQ1cc4AFBNvVX60ml8Zyospxeph2FBJgUYn+m5iyFoSbHCCplcaDyc3xnJ 6RU+HY30XBVozMmp8VFE21kpBSzIP4eMYwmqvT6AGiRGaUVwiT2fF/Ewt5urNA== 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 4TZ86h38tczPqr; Tue, 13 Feb 2024 17:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41DHqSGK052852; Tue, 13 Feb 2024 17:52:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DHqSZi052849; Tue, 13 Feb 2024 17:52:28 GMT (envelope-from git) Date: Tue, 13 Feb 2024 17:52:28 GMT Message-Id: <202402131752.41DHqSZi052849@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 24b0131793cc - stable/14 - Merge commit f577bfb99528 from llvm-project (by Alexander Potapenko): 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 24b0131793ccf493d6beb4c43b23076a6bcddac5 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=24b0131793ccf493d6beb4c43b23076a6bcddac5 commit 24b0131793ccf493d6beb4c43b23076a6bcddac5 Author: Dimitry Andric AuthorDate: 2024-02-08 19:19:27 +0000 Commit: Dimitry Andric CommitDate: 2024-02-13 17:51:25 +0000 Merge commit f577bfb99528 from llvm-project (by Alexander Potapenko): [sanitizer][msan] fix AArch64 vararg support for KMSAN (#70660) Cast StackSaveAreaPtr, GrRegSaveAreaPtr, VrRegSaveAreaPtr to pointers to fix assertions in getShadowOriginPtrKernel(). Fixes: https://github.com/llvm/llvm-project/issues/69738 Patch by Mark Johnston. Requested by: markj MFC after: 3 days (cherry picked from commit cf675768528f22b4a9d8c70897b9ebf51da8061e) --- .../lib/Transforms/Instrumentation/MemorySanitizer.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp b/contrib/llvm-project/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp index 83d90049abc3..de266590ad92 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp @@ -1718,6 +1718,12 @@ struct MemorySanitizerVisitor : public InstVisitor { std::pair getShadowOriginPtrUserspace(Value *Addr, IRBuilder<> &IRB, Type *ShadowTy, MaybeAlign Alignment) { + VectorType *VectTy = dyn_cast(Addr->getType()); + if (!VectTy) { + assert(Addr->getType()->isPointerTy()); + } else { + assert(VectTy->getElementType()->isPointerTy()); + } Type *IntptrTy = ptrToIntPtrType(Addr->getType()); Value *ShadowOffset = getShadowPtrOffset(Addr, IRB); Value *ShadowLong = ShadowOffset; @@ -5262,21 +5268,25 @@ struct VarArgAArch64Helper : public VarArgHelper { // we need to adjust the offset for both GR and VR fields based on // the __{gr,vr}_offs value (since they are stores based on incoming // named arguments). + Type *RegSaveAreaPtrTy = IRB.getInt8PtrTy(); // Read the stack pointer from the va_list. - Value *StackSaveAreaPtr = getVAField64(IRB, VAListTag, 0); + Value *StackSaveAreaPtr = + IRB.CreateIntToPtr(getVAField64(IRB, VAListTag, 0), RegSaveAreaPtrTy); // Read both the __gr_top and __gr_off and add them up. Value *GrTopSaveAreaPtr = getVAField64(IRB, VAListTag, 8); Value *GrOffSaveArea = getVAField32(IRB, VAListTag, 24); - Value *GrRegSaveAreaPtr = IRB.CreateAdd(GrTopSaveAreaPtr, GrOffSaveArea); + Value *GrRegSaveAreaPtr = IRB.CreateIntToPtr( + IRB.CreateAdd(GrTopSaveAreaPtr, GrOffSaveArea), RegSaveAreaPtrTy); // Read both the __vr_top and __vr_off and add them up. Value *VrTopSaveAreaPtr = getVAField64(IRB, VAListTag, 16); Value *VrOffSaveArea = getVAField32(IRB, VAListTag, 28); - Value *VrRegSaveAreaPtr = IRB.CreateAdd(VrTopSaveAreaPtr, VrOffSaveArea); + Value *VrRegSaveAreaPtr = IRB.CreateIntToPtr( + IRB.CreateAdd(VrTopSaveAreaPtr, VrOffSaveArea), RegSaveAreaPtrTy); // It does not know how many named arguments is being used and, on the // callsite all the arguments were saved. Since __gr_off is defined as From nobody Tue Feb 13 17:52:29 2024 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 4TZ86j6M6cz59NN7; Tue, 13 Feb 2024 17:52:29 +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 4TZ86j50JLz42KL; Tue, 13 Feb 2024 17:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707846749; 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=B6Axnl6K1oFGQrKCad9JiD5CaQpJa61FNsl62h/kSv4=; b=t//lA5xj03vp8i9QllQSHqNcU0s4YpN5FKXIZMTt+cpYMIeILjQA5ewHNkc++qDltzTuaC hX6UGEcE30e+jbVjM0EhfYy80+Q0cqnBbDN3ovjE2h1CjoyS0abL/Pj4IR+jXLGGJpL2te 6hRB+SLZrsg5zGM0NNdFHsUc8rF4Os54iO/5QVHicUqJzAqfTTN3W295SvJn88JCzeluX0 CcAodvN4qoFn4d+euhp1FgcukVEE8pQy5mbMKGU4ysZAc9EoFpOM2K+GhC9vAV1L+zsUzZ +WUFyTFjEykSZ7elAobC+qYwqEchTdI1BpklC9gd/oDswEwQGnR6w5l//vL/rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707846749; a=rsa-sha256; cv=none; b=Vt7JmRztXgmdMkgarff4zT02h4OQMvvoeQhPn2/kXSGHSbWi4cS3EIRsg57mit4x1kg1fK cM0dX8kLMlYHrPwrMzJtM+DphUuJIGUECKgfRbCC1D4bFvbpnjSn6L/ddnz9foBDULHGSu 4jUy9gC8lUADBprLJPcVi6avFjiJe88Z4PBNMygGA3KNyj3jjmyCRsqCNP9RfT0D1XR8tp hiXGsNveoG9+Srz2ekrx7xn8n10h14mORyxJ6TdK3zyMkisdetQcdyzOSIn4F411iNv46q eUesG50Oh2UkHGXe/kgVEh/pYbdI39njwL7czEMpvoJV53b8Q7lXdJhV0ji8uQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707846749; 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=B6Axnl6K1oFGQrKCad9JiD5CaQpJa61FNsl62h/kSv4=; b=bqXALBVoSv+U27s82SS+0h6twpV06DdXEWryqyC8IHzzBaqigukxX1x/NLjfxQZHWdtXFL 1WNOlL1S9nBLFbG8vO8RG71FmpsbohVh77pjah8aItZY45oRg93zw7FVOplIk6iV6Ncq6O SjeOihl1aOG+CiNCPW4KeZDV+L+hPlrLEjBqXkzbXk/somSp8thLcodzi+wLBN6dAE0Y6d CReHvSitmbvPqxqXCvkrXDWWkLBVqqoQL6pMpwRE3j+5/5LLEu46C609T+E/S2YKb4e2A8 mDUg29CHli5qi2x8ctcCQwVNEn3YvsjcWNbXW9ENl4T0D3yogWCdLS5twLPjPA== 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 4TZ86j44thzQ4d; Tue, 13 Feb 2024 17:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41DHqTkv052889; Tue, 13 Feb 2024 17:52:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DHqT60052886; Tue, 13 Feb 2024 17:52:29 GMT (envelope-from git) Date: Tue, 13 Feb 2024 17:52:29 GMT Message-Id: <202402131752.41DHqT60052886@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 5fe7f76dd681 - stable/14 - Remove usr.bin/clang/llvm-ar/llvm-cxxfilt-driver.cpp file 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5fe7f76dd681bc3008464c83324d8eb927c6d599 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5fe7f76dd681bc3008464c83324d8eb927c6d599 commit 5fe7f76dd681bc3008464c83324d8eb927c6d599 Author: Dimitry Andric AuthorDate: 2024-02-10 21:00:05 +0000 Commit: Dimitry Andric CommitDate: 2024-02-13 17:51:33 +0000 Remove usr.bin/clang/llvm-ar/llvm-cxxfilt-driver.cpp file I accidentally copied this to the wrong place, or by accident to two places, during the merge of llvmorg-17-init-19304-gd0b54bb50e51. Fixes: 06c3fb2749bd MFC after: 3 days (cherry picked from commit 4015c064200e643ab110cdf831064c3c73f31b73) --- usr.bin/clang/llvm-ar/llvm-cxxfilt-driver.cpp | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/usr.bin/clang/llvm-ar/llvm-cxxfilt-driver.cpp b/usr.bin/clang/llvm-ar/llvm-cxxfilt-driver.cpp deleted file mode 100644 index 3ed6f501327f..000000000000 --- a/usr.bin/clang/llvm-ar/llvm-cxxfilt-driver.cpp +++ /dev/null @@ -1,16 +0,0 @@ -//===-- driver-template.cpp -----------------------------------------------===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#include "llvm/Support/LLVMDriver.h" -#include "llvm/ADT/ArrayRef.h" - -int llvm_cxxfilt_main(int argc, char **, const llvm::ToolContext &); - -int main(int argc, char **argv) { - return llvm_cxxfilt_main(argc, argv, {argv[0], nullptr, false}); -} From nobody Tue Feb 13 17:52:44 2024 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 4TZ87044qVz59NCb; Tue, 13 Feb 2024 17:52:44 +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 4TZ8702F3gz4365; Tue, 13 Feb 2024 17:52:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707846764; 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=EyDoax6b0GjrD7hausg4bv3VOAkEJB9pmkeRAW0+LCU=; b=bdxn0vHS5fPPVDMfV4cVJbtSzcfrYEALQEFnyuU638JlylpXIKPMig/M9FtPRx8W5YQRQE khx8awoc2ZJMUHR51CNYbIhHkjCaqUevI3tyxvK95QEK6fUDOtiW+ZY/S6pCNgrkb2xgmj 0/KBgD6AJWQJyIYxq3xP6hvvbl388pSn1DgZBpr/is0xADOaORBlwQoMaYzI7pr2M5Ri12 8QH3+d0ZSIzS8BAjxkU8nARW9UcS1b7eZ/iWrS2ILBqdVoXIUA7d3Pbbc+tR/a4GT6d+uI fcz8z3My3VjD0AVwXNX2glN7bTD9wXgiXKG1emWN2KwSKLsJz//NydIq9Asptg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707846764; a=rsa-sha256; cv=none; b=bB0ek1gI+pMklXwaGAVJGV1VLcO/tzCNHhPNkprvJjcCz7Ol9nANYMInY7q7ftJm1qvNGs X4XlDxloZ2QtDyTYdHi8rBck53VTrjalR1DCYDkgfH93ytTAzGeWVK8nGbnRtDnOj0bdXa gyTVIPCtWgVDwlQmCl6wNIE4E0NiEwG1pgf5tFHcSN7KbZWjiXelyKX2s03d7WQX5nkx85 2PPn4eIxHxESnOHa86OWHi7YbgBrzLHrRfLAagUj+8ZXvdzNil9OgRyEwkCLV0LxCjEBdU fsnLbALfiVKTizYTqD/A34xO7DOjYUedjb2gm8Ao1K49vbjG5RvKQ4MZBEF7Nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707846764; 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=EyDoax6b0GjrD7hausg4bv3VOAkEJB9pmkeRAW0+LCU=; b=uFHY4Fw//NlgV6A/hCXAVqt0AK7KVW5X3kyur0t2TanEvgGgGoCdOw2kv02NsXPQ+DZKPp MJdonCTDXxOv5SaBZq28ExxkEb7okGtXqzCerDO4zJ59EJv1iNcbKAaWHDI1Qh5FNZkchc vlycyyoM8/n3a7Z20ZYyTQ8i/NHSVTozsHODSAnj+aOdwMahlv3kjcyvYgWRGLLL6S7/6w NTd1dkninyNFOwYoo1x8xzH3bbCBKqjkHv0F969ASvgO9d+dUY8mNwg8PztMR9ty9biZfK OxnlrHYYIQO0B/WshPeiLKbvn2enEqCBp2ZCFHyx1OHLYaM4MZQDLhJgHTN/mg== 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 4TZ8701KwyzPX8; Tue, 13 Feb 2024 17:52:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41DHqiba054301; Tue, 13 Feb 2024 17:52:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DHqi8k054297; Tue, 13 Feb 2024 17:52:44 GMT (envelope-from git) Date: Tue, 13 Feb 2024 17:52:44 GMT Message-Id: <202402131752.41DHqi8k054297@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 2292dffacfc5 - stable/13 - Merge commit f577bfb99528 from llvm-project (by Alexander Potapenko): 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2292dffacfc56af7515830171a84f8651cc34a72 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2292dffacfc56af7515830171a84f8651cc34a72 commit 2292dffacfc56af7515830171a84f8651cc34a72 Author: Dimitry Andric AuthorDate: 2024-02-08 19:19:27 +0000 Commit: Dimitry Andric CommitDate: 2024-02-13 17:51:47 +0000 Merge commit f577bfb99528 from llvm-project (by Alexander Potapenko): [sanitizer][msan] fix AArch64 vararg support for KMSAN (#70660) Cast StackSaveAreaPtr, GrRegSaveAreaPtr, VrRegSaveAreaPtr to pointers to fix assertions in getShadowOriginPtrKernel(). Fixes: https://github.com/llvm/llvm-project/issues/69738 Patch by Mark Johnston. Requested by: markj MFC after: 3 days (cherry picked from commit cf675768528f22b4a9d8c70897b9ebf51da8061e) --- .../lib/Transforms/Instrumentation/MemorySanitizer.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp b/contrib/llvm-project/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp index 83d90049abc3..de266590ad92 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp @@ -1718,6 +1718,12 @@ struct MemorySanitizerVisitor : public InstVisitor { std::pair getShadowOriginPtrUserspace(Value *Addr, IRBuilder<> &IRB, Type *ShadowTy, MaybeAlign Alignment) { + VectorType *VectTy = dyn_cast(Addr->getType()); + if (!VectTy) { + assert(Addr->getType()->isPointerTy()); + } else { + assert(VectTy->getElementType()->isPointerTy()); + } Type *IntptrTy = ptrToIntPtrType(Addr->getType()); Value *ShadowOffset = getShadowPtrOffset(Addr, IRB); Value *ShadowLong = ShadowOffset; @@ -5262,21 +5268,25 @@ struct VarArgAArch64Helper : public VarArgHelper { // we need to adjust the offset for both GR and VR fields based on // the __{gr,vr}_offs value (since they are stores based on incoming // named arguments). + Type *RegSaveAreaPtrTy = IRB.getInt8PtrTy(); // Read the stack pointer from the va_list. - Value *StackSaveAreaPtr = getVAField64(IRB, VAListTag, 0); + Value *StackSaveAreaPtr = + IRB.CreateIntToPtr(getVAField64(IRB, VAListTag, 0), RegSaveAreaPtrTy); // Read both the __gr_top and __gr_off and add them up. Value *GrTopSaveAreaPtr = getVAField64(IRB, VAListTag, 8); Value *GrOffSaveArea = getVAField32(IRB, VAListTag, 24); - Value *GrRegSaveAreaPtr = IRB.CreateAdd(GrTopSaveAreaPtr, GrOffSaveArea); + Value *GrRegSaveAreaPtr = IRB.CreateIntToPtr( + IRB.CreateAdd(GrTopSaveAreaPtr, GrOffSaveArea), RegSaveAreaPtrTy); // Read both the __vr_top and __vr_off and add them up. Value *VrTopSaveAreaPtr = getVAField64(IRB, VAListTag, 16); Value *VrOffSaveArea = getVAField32(IRB, VAListTag, 28); - Value *VrRegSaveAreaPtr = IRB.CreateAdd(VrTopSaveAreaPtr, VrOffSaveArea); + Value *VrRegSaveAreaPtr = IRB.CreateIntToPtr( + IRB.CreateAdd(VrTopSaveAreaPtr, VrOffSaveArea), RegSaveAreaPtrTy); // It does not know how many named arguments is being used and, on the // callsite all the arguments were saved. Since __gr_off is defined as From nobody Tue Feb 13 17:52:45 2024 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 4TZ8713zt9z59NCc; Tue, 13 Feb 2024 17:52:45 +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 4TZ871384Yz42y9; Tue, 13 Feb 2024 17:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707846765; 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=dgtdOtUwhYsHSDGfSDiIMY+/F96XQBr6yEGijteX0Bk=; b=oixy1iZk2gCWbznZWQR7Ekkd9OKu3oWh1ECZ7wvmJch8xIagl/VCR1KQFB3WXnZ12JA5E3 ksQtvks2a2FlKBgrMfQiZtwjB04aV20smgLzuiuJQnELXIJkdYAp7xekMq5IwLpe6/e4of LxvYHbnGcqxwm9MOyFEce10/0ObZWdZCqe0mq91AOxK9RbegQ6XCrKXLHPVDo57WKMeaO5 7v9TjUsFxF9hmKFWoX8WjLG8yhEkFoe88eN11K05B5BVEg45tni+k4ZDI3BPTgdmvxL7Wc y6RVFDArJFv2cUFFfxNiLGZJty6aE4eCD2xqWYuyb7P5gb7A/M6C13ScViyGhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707846765; a=rsa-sha256; cv=none; b=Pkl8p+S/GMpdiuzGaF3MGrTDphWWpPyZmge1wNo8DUk6AiXKjYFuwkE6JkMZlnAQ8ZrNQr shqcevw1lAptCMXQ3+RQVIJTNW49gwhq/Wl5FiymOvTDTTcB2ky14p37oGFI0N0vL80bAl 3VsgPEitlRdlb2dHx5kBxtDQCxdrP2NjC7X0eoD0qYpjelEUIbnObvdj3fqhN7hlBAqlg0 GuA/wM+jQMjZiL+f/17f7R5+pZ9II9hyeBXjQcwPmMTjaNLeZKFeDe/nuHyJsnxmIZn7dz NT19+G3xUvMWZZbCwt1eXqcHgwHSUP9k3z9ZKejaERQ0cIMVl2cPH4nJwV3uMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707846765; 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=dgtdOtUwhYsHSDGfSDiIMY+/F96XQBr6yEGijteX0Bk=; b=Xnpka+GLUyugRjgY7VC0MSy7AWjKZtnHwh2Lpap1CvcziBBVzzTKOo0n189ekIcRfHOEcb 2jZLdQXwAHgMhIxpFjsT3aP0AzPHnSGfP7dr68nen6yUmBl8RxNr5DCakLL1kMOBLsna6p 5sL9sOJDDx7q1ImAsH0e36RZg23uYECreCiLHpbZRbWj4nMfVk6kScNLVaVEHieAx+TgZp 3/NN0h0tXEBMLFCKEaH0ok5VR1PxORI73phcqPBBpJ2cd05Q7VsS9f0w5CZ8pNjLHJyeum aoBboxZNODQey9BMS59PLf6qAOMnRObAWD5a/Q5qn1OPDTBbXz3TogCpb1MyFg== 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 4TZ8712Br3zPYg; Tue, 13 Feb 2024 17:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41DHqjQV054341; Tue, 13 Feb 2024 17:52:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DHqjxK054338; Tue, 13 Feb 2024 17:52:45 GMT (envelope-from git) Date: Tue, 13 Feb 2024 17:52:45 GMT Message-Id: <202402131752.41DHqjxK054338@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: e9c00a656573 - stable/13 - Remove usr.bin/clang/llvm-ar/llvm-cxxfilt-driver.cpp file 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e9c00a6565735d5580f3f191fc964efb1361a4e2 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e9c00a6565735d5580f3f191fc964efb1361a4e2 commit e9c00a6565735d5580f3f191fc964efb1361a4e2 Author: Dimitry Andric AuthorDate: 2024-02-10 21:00:05 +0000 Commit: Dimitry Andric CommitDate: 2024-02-13 17:51:53 +0000 Remove usr.bin/clang/llvm-ar/llvm-cxxfilt-driver.cpp file I accidentally copied this to the wrong place, or by accident to two places, during the merge of llvmorg-17-init-19304-gd0b54bb50e51. Fixes: 06c3fb2749bd MFC after: 3 days (cherry picked from commit 4015c064200e643ab110cdf831064c3c73f31b73) --- usr.bin/clang/llvm-ar/llvm-cxxfilt-driver.cpp | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/usr.bin/clang/llvm-ar/llvm-cxxfilt-driver.cpp b/usr.bin/clang/llvm-ar/llvm-cxxfilt-driver.cpp deleted file mode 100644 index 3ed6f501327f..000000000000 --- a/usr.bin/clang/llvm-ar/llvm-cxxfilt-driver.cpp +++ /dev/null @@ -1,16 +0,0 @@ -//===-- driver-template.cpp -----------------------------------------------===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#include "llvm/Support/LLVMDriver.h" -#include "llvm/ADT/ArrayRef.h" - -int llvm_cxxfilt_main(int argc, char **, const llvm::ToolContext &); - -int main(int argc, char **argv) { - return llvm_cxxfilt_main(argc, argv, {argv[0], nullptr, false}); -} From nobody Tue Feb 13 19:15:21 2024 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 4TZ9yK2GgFz59YH8; Tue, 13 Feb 2024 19:15:21 +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 4TZ9yK1zmPz4Flc; Tue, 13 Feb 2024 19:15:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707851721; 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=x/sbLhALpM9ICCFJrKm81kRjMIh5T1MDBP+oWQJK2Ao=; b=KQoSAkIqsdNNp6fGqfYoDHLAHee8p070ih29/UEt/UUvixo9KhAlno0tQbpMqtMDOwGkw6 6/A3Sppy5Dh2CN1B6KGEvYdvZpWBx29pFIvQO0oSM84MaP2iunZQF+IqbY9mdbKDREFobn flIgmFt071sFKelKmMkXaZ/PhRp4FMtSeMeeQJZLZA/zRTwXvx+WzqvLZXyhpVWciIyqj6 s3sHhGMC/AUKs7zCJCSZ2hL0QNck03qyExS654qu2ebGVGLam1LC4jF7OuFGROxm8WKmBy gCYje+ku7fwVuBoHRhfNLBwMnBY47EkT+uJrisxA35S+JJXEbSW1rDYAfzWoIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707851721; a=rsa-sha256; cv=none; b=FjoKyrqaw+ToCvYSg3sIbFNNLXIklU601y+pD/1txlDW0wi9DkdHyuwkFGpTFydOpdBN/0 mcC+pQUVhwZKTHJyvqDxPbSnmETpdtGS1o0G3MwZuAnVsMFYZAd9O5E/IntD+/k4OwmQcM AtVcYF32Bks+RylVe53PjKuFTo59PRRB4bCPXgdo+15G0mNvas1/Lj6KSk7Z89DojDouk7 6w3qvLDds5wqcdYf5dn4sDTpeRAbfVtAOHntu7knDqkldrfkf0anSKat3tOB+lCX4jxLDC lgffw7u8aaDwTXEQmI8HSJJUQGOKhZFiPMU7b7/h8xdbLEGlXInb6tZojIW1IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707851721; 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=x/sbLhALpM9ICCFJrKm81kRjMIh5T1MDBP+oWQJK2Ao=; b=sCOtmIIaclZtF5ownEQTAfatuPykLem4umfV3EXE2RGXSwaU0UaD065sH0ADKO6QGgaDUd +cundz6pXJCbh0Ghu3juogm/0YmCbMVwYZw/3luaB2jNy8HsR3wLU+sjpI7XcBdPzl1ECM +hm//NOP114/ERiLVxeUR3mxdikhDutwJqGy4m6Ux4ebKKrnfqePUsrswm0phcQ08IM3lS apK3zUmo1oWj7UHKyo6oDWFqJA8kyuNcFQKl/egONk1USL2mTnNOZ+ltcqbfLdDzkGOoMi hMpTw8OgxNSRygBxqi6p1qjv1tSpFdLemhgwGeF/zjwCwohbX3M4r5mCoq1lVw== 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 4TZ9yK12WdzRmC; Tue, 13 Feb 2024 19:15:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41DJFLu9090284; Tue, 13 Feb 2024 19:15:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DJFLcH090281; Tue, 13 Feb 2024 19:15:21 GMT (envelope-from git) Date: Tue, 13 Feb 2024 19:15:21 GMT Message-Id: <202402131915.41DJFLcH090281@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 9fc1d78e39d5 - stable/14 - caroot: routine update 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9fc1d78e39d5a56e3041e11898b14cfb9a3e8a47 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=9fc1d78e39d5a56e3041e11898b14cfb9a3e8a47 commit 9fc1d78e39d5a56e3041e11898b14cfb9a3e8a47 Author: Kyle Evans AuthorDate: 2024-02-11 06:33:12 +0000 Commit: Kyle Evans CommitDate: 2024-02-13 19:14:51 +0000 caroot: routine update Changes: - One (1) modified - Eight (8) added - One (1) expired, now untrusted MFC after: 3 days (cherry picked from commit 0d3b2bdbf719ac6b5719a47387558ca9c34a4b2c) --- ObsoleteFiles.inc | 3 + ...ertificacion_Firmaprofesional_CIF_A62634068.pem | 118 +++++++++--------- .../trusted/CommScope_Public_Trust_ECC_Root-01.pem | 67 ++++++++++ .../trusted/CommScope_Public_Trust_ECC_Root-02.pem | 67 ++++++++++ .../trusted/CommScope_Public_Trust_RSA_Root-01.pem | 134 ++++++++++++++++++++ .../trusted/CommScope_Public_Trust_RSA_Root-02.pem | 134 ++++++++++++++++++++ .../trusted/Telekom_Security_TLS_ECC_Root_2020.pem | 68 ++++++++++ .../trusted/Telekom_Security_TLS_RSA_Root_2023.pem | 138 +++++++++++++++++++++ .../caroot/trusted/TrustAsia_Global_Root_CA_G3.pem | 138 +++++++++++++++++++++ .../caroot/trusted/TrustAsia_Global_Root_CA_G4.pem | 70 +++++++++++ .../Security_Communication_Root_CA.pem | 0 11 files changed, 878 insertions(+), 59 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index cace8b72a03e..5b8d36122a5c 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20240213: caroot bundle updated +OLD_FILES+=usr/share/certs/trusted/Security_Communication_Root_CA.pem + # 20240117: replaced NetBSD tests for uniq with our own OLD_FILES+=usr/tests/usr.bin/uniq/d_basic.in OLD_FILES+=usr/tests/usr.bin/uniq/d_basic.out diff --git a/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem b/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem index 7eeb715ac674..ceae80a3e6d8 100644 --- a/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem +++ b/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem @@ -14,12 +14,12 @@ Certificate: Data: Version: 3 (0x2) - Serial Number: 6047274297262753887 (0x53ec3beefbb2485f) - Signature Algorithm: sha1WithRSAEncryption + Serial Number: 1977337328857672817 (0x1b70e9d2ffae6c71) + Signature Algorithm: sha256WithRSAEncryption Issuer: C = ES, CN = Autoridad de Certificacion Firmaprofesional CIF A62634068 Validity - Not Before: May 20 08:38:15 2009 GMT - Not After : Dec 31 08:38:15 2030 GMT + Not Before: Sep 23 15:22:07 2014 GMT + Not After : May 5 15:22:07 2036 GMT Subject: C = ES, CN = Autoridad de Certificacion Firmaprofesional CIF A62634068 Subject Public Key Info: Public Key Algorithm: rsaEncryption @@ -62,54 +62,54 @@ Certificate: 92:30:bb Exponent: 65537 (0x10001) X509v3 extensions: - X509v3 Basic Constraints: critical - CA:TRUE, pathlen:1 - X509v3 Key Usage: critical - Certificate Sign, CRL Sign X509v3 Subject Key Identifier: 65:CD:EB:AB:35:1E:00:3E:7E:D5:74:C0:1C:B4:73:47:0E:1A:64:2F + X509v3 Basic Constraints: critical + CA:TRUE, pathlen:1 X509v3 Certificate Policies: Policy: X509v3 Any Policy CPS: http://www.firmaprofesional.com/cps User Notice: Explicit Text: - Signature Algorithm: sha1WithRSAEncryption + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + Signature Algorithm: sha256WithRSAEncryption Signature Value: - 17:7d:a0:f9:b4:dd:c5:c5:eb:ad:4b:24:b5:a1:02:ab:dd:a5: - 88:4a:b2:0f:55:4b:2b:57:8c:3b:e5:31:dd:fe:c4:32:f1:e7: - 5b:64:96:36:32:18:ec:a5:32:77:d7:e3:44:b6:c0:11:2a:80: - b9:3d:6a:6e:7c:9b:d3:ad:fc:c3:d6:a3:e6:64:29:7c:d1:e1: - 38:1e:82:2b:ff:27:65:af:fb:16:15:c4:2e:71:84:e5:b5:ff: - fa:a4:47:bd:64:32:bb:f6:25:84:a2:27:42:f5:20:b0:c2:13: - 10:11:cd:10:15:ba:42:90:2a:d2:44:e1:96:26:eb:31:48:12: - fd:2a:da:c9:06:cf:74:1e:a9:4b:d5:87:28:f9:79:34:92:3e: - 2e:44:e8:f6:8f:4f:8f:35:3f:25:b3:39:dc:63:2a:90:6b:20: - 5f:c4:52:12:4e:97:2c:2a:ac:9d:97:de:48:f2:a3:66:db:c2: - d2:83:95:a6:66:a7:9e:25:0f:e9:0b:33:91:65:0a:5a:c3:d9: - 54:12:dd:af:c3:4e:0e:1f:26:5e:0d:dc:b3:8d:ec:d5:81:70: - de:d2:4f:24:05:f3:6c:4e:f5:4c:49:66:8d:d1:ff:d2:0b:25: - 41:48:fe:51:84:c6:42:af:80:04:cf:d0:7e:64:49:e4:f2:df: - a2:ec:b1:4c:c0:2a:1d:e7:b4:b1:65:a2:c4:bc:f1:98:f4:aa: - 70:07:63:b4:b8:da:3b:4c:fa:40:22:30:5b:11:a6:f0:05:0e: - c6:02:03:48:ab:86:9b:85:dd:db:dd:ea:a2:76:80:73:7d:f5: - 9c:04:c4:45:8d:e7:b9:1c:8b:9e:ea:d7:75:d1:72:b1:de:75: - 44:e7:42:7d:e2:57:6b:7d:dc:99:bc:3d:83:28:ea:80:93:8d: - c5:4c:65:c1:70:81:b8:38:fc:43:31:b2:f6:03:34:47:b2:ac: - fb:22:06:cb:1e:dd:17:47:1c:5f:66:b9:d3:1a:a2:da:11:b1: - a4:bc:23:c9:e4:be:87:ff:b9:94:b6:f8:5d:20:4a:d4:5f:e7: - bd:68:7b:65:f2:15:1e:d2:3a:a9:2d:e9:d8:6b:24:ac:97:58: - 44:47:ad:59:18:f1:21:65:70:de:ce:34:60:a8:40:f1:f3:3c: - a4:c3:28:23:8c:fe:27:33:43:40:a0:17:3c:eb:ea:3b:b0:72: - a6:a3:b9:4a:4b:5e:16:48:f4:b2:bc:c8:8c:92:c5:9d:9f:ac: - 72:36:bc:34:80:34:6b:a9:8b:92:c0:b8:17:ed:ec:76:53:f5: - 24:01:8c:b3:22:e8:4b:7c:55:c6:9d:fa:a3:14:bb:65:85:6e: - 6e:4f:12:7e:0a:3c:9d:95 -SHA1 Fingerprint=AE:C5:FB:3F:C8:E1:BF:C4:E5:4F:03:07:5A:9A:E8:00:B7:F7:B6:FA + 74:87:28:02:2b:77:1f:66:89:64:ed:8f:74:2e:46:1c:bb:a8: + f8:f8:0b:1d:83:b6:3a:a7:e8:45:8a:07:b7:e0:3e:20:cb:e1: + 08:db:13:08:f8:28:a1:35:b2:80:b3:0b:51:c0:d3:56:9a:8d: + 33:45:49:af:49:f0:e0:3d:07:7a:45:13:5a:ff:c8:97:d8:d3: + 18:2c:7d:96:f8:dd:a2:65:43:70:93:90:15:ba:90:df:e8:19: + b0:db:2c:8a:60:0f:b7:6f:94:07:1e:1d:a6:c9:85:f6:bd:34: + f8:40:78:62:10:70:3a:be:7d:4b:39:81:a9:10:d4:96:41:bb: + f8:5f:1c:0b:1d:08:f2:b1:b0:89:7a:f2:f7:a0:e0:c4:8f:8b: + 78:b5:3b:58:a5:23:8e:4f:55:fe:36:3b:e0:0c:b7:ca:2a:30: + 41:20:b4:80:cd:ae:fc:76:66:73:a8:ae:6e:e1:7c:da:03:e8: + 94:20:e6:22:a3:d0:1f:90:5d:20:53:14:26:57:da:54:97:df: + 16:44:10:01:1e:88:66:8f:72:38:93:dd:20:b7:34:be:d7:f1: + ee:63:8e:47:79:28:06:fc:f3:59:45:25:60:22:33:1b:a3:5f: + a8:ba:2a:da:1a:3d:cd:40:ea:8c:ee:05:15:95:d5:a5:2c:20: + 2f:a7:98:28:ee:45:fc:f1:b8:88:00:2c:8f:42:da:51:d5:9c: + e5:13:68:71:45:43:8b:9e:0b:21:3c:4b:5c:05:dc:1a:9f:98: + 8e:da:bd:22:9e:72:cd:ad:0a:cb:cc:a3:67:9b:28:74:c4:9b: + d7:1a:3c:04:58:a6:82:9d:ad:c7:7b:6f:ff:80:96:e9:f8:8d: + 6a:bd:18:90:1d:ff:49:1a:90:52:37:93:2f:3c:02:5d:82:76: + 0b:51:e7:16:c7:57:f8:38:f9:a7:cd:9b:22:54:ef:63:b0:15: + 6d:53:65:03:4a:5e:4a:a0:b2:a7:8e:49:00:59:38:d5:c7:f4: + 80:64:f5:6e:95:50:b8:11:7e:15:70:38:4a:b0:7f:d0:c4:32: + 70:c0:19:ff:c9:38:2d:14:2c:66:f4:42:44:e6:55:76:1b:80: + 15:57:ff:c0:a7:a7:aa:39:aa:d8:d3:70:d0:2e:ba:eb:94:6a: + fa:5f:34:86:e7:62:b5:fd:8a:f0:30:85:94:c9:af:24:02:2f: + 6f:d6:dd:67:fe:e3:b0:55:4f:04:98:4f:a4:41:56:e2:93:d0: + 6a:e8:d6:f3:fb:65:e0:ce:75:c4:31:59:0c:ee:82:c8:0c:60: + 33:4a:19:ba:84:67:27:0f:bc:42:5d:bd:24:54:0d:ec:1d:70: + 06:5f:a4:bc:fa:20:7c:55 +SHA1 Fingerprint=0B:BE:C2:27:22:49:CB:39:AA:DB:35:5C:53:E3:8C:AE:78:FF:B6:FE -----BEGIN CERTIFICATE----- -MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UE +MIIGFDCCA/ygAwIBAgIIG3Dp0v+ubHEwDQYJKoZIhvcNAQELBQAwUTELMAkGA1UE BhMCRVMxQjBABgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1h -cHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEy -MzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUg +cHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODAeFw0xNDA5MjMxNTIyMDdaFw0zNjA1 +MDUxNTIyMDdaMFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUg Q2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBBNjI2MzQwNjgwggIi MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDDUtd9 thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQM @@ -122,21 +122,21 @@ Z/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirja EbsXLZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/T KI8xWVvTyQKmtFLKbpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF 6NkBiDkal4ZkQdU7hwxu+g/GvUgUvzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVh -OSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD -VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNHDhpkLzCBpgYD -VR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp -cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBv -ACAAZABlACAAbABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBl -AGwAbwBuAGEAIAAwADgAMAAxADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF -661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx51tkljYyGOylMnfX40S2wBEqgLk9 -am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qkR71kMrv2JYSiJ0L1 -ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaPT481 -PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS -3a/DTg4fJl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5k -SeTy36LssUzAKh3ntLFlosS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF -3dvd6qJ2gHN99ZwExEWN57kci57q13XRcrHedUTnQn3iV2t93Jm8PYMo6oCTjcVM -ZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoRsaS8I8nkvof/uZS2+F0g -StRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTDKCOM/icz -Q0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQB -jLMi6Et8Vcad+qMUu2WFbm5PEn4KPJ2V +OSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMB0GA1UdDgQWBBRlzeurNR4APn7VdMAc +tHNHDhpkLzASBgNVHRMBAf8ECDAGAQH/AgEBMIGmBgNVHSAEgZ4wgZswgZgGBFUd +IAAwgY8wLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuZmlybWFwcm9mZXNpb25hbC5j +b20vY3BzMFwGCCsGAQUFBwICMFAeTgBQAGEAcwBlAG8AIABkAGUAIABsAGEAIABC +AG8AbgBhAG4AbwB2AGEAIAA0ADcAIABCAGEAcgBjAGUAbABvAG4AYQAgADAAOAAw +ADEANzAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggIBAHSHKAIrdx9m +iWTtj3QuRhy7qPj4Cx2Dtjqn6EWKB7fgPiDL4QjbEwj4KKE1soCzC1HA01aajTNF +Sa9J8OA9B3pFE1r/yJfY0xgsfZb43aJlQ3CTkBW6kN/oGbDbLIpgD7dvlAceHabJ +hfa9NPhAeGIQcDq+fUs5gakQ1JZBu/hfHAsdCPKxsIl68veg4MSPi3i1O1ilI45P +Vf42O+AMt8oqMEEgtIDNrvx2ZnOorm7hfNoD6JQg5iKj0B+QXSBTFCZX2lSX3xZE +EAEeiGaPcjiT3SC3NL7X8e5jjkd5KAb881lFJWAiMxujX6i6KtoaPc1A6ozuBRWV +1aUsIC+nmCjuRfzxuIgALI9C2lHVnOUTaHFFQ4ueCyE8S1wF3BqfmI7avSKecs2t +CsvMo2ebKHTEm9caPARYpoKdrcd7b/+Alun4jWq9GJAd/0kakFI3ky88Al2CdgtR +5xbHV/g4+afNmyJU72OwFW1TZQNKXkqgsqeOSQBZONXH9IBk9W6VULgRfhVwOEqw +f9DEMnDAGf/JOC0ULGb0QkTmVXYbgBVX/8Cnp6o5qtjTcNAuuuuUavpfNIbnYrX9 +ivAwhZTJryQCL2/W3Wf+47BVTwSYT6RBVuKT0Gro1vP7ZeDOdcQxWQzugsgMYDNK +GbqEZycPvEJdvSRUDewdcAZfpLz6IHxV -----END CERTIFICATE----- diff --git a/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-01.pem b/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-01.pem new file mode 100644 index 000000000000..41e8a409ac3c --- /dev/null +++ b/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-01.pem @@ -0,0 +1,67 @@ +## +## CommScope Public Trust ECC Root-01 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 43:70:82:77:cf:4d:5d:34:f1:ca:ae:32:2f:37:f7:f4:7f:75:a0:9e + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = US, O = CommScope, CN = CommScope Public Trust ECC Root-01 + Validity + Not Before: Apr 28 17:35:43 2021 GMT + Not After : Apr 28 17:35:42 2046 GMT + Subject: C = US, O = CommScope, CN = CommScope Public Trust ECC Root-01 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:4b:36:e9:ae:57:5e:a8:70:d7:d0:8f:74:62:77: + c3:5e:7a:aa:e5:b6:a2:f1:78:fd:02:7e:57:dd:91: + 79:9c:6c:b9:52:88:54:bc:2f:04:be:b8:cd:f6:10: + d1:29:ec:b5:d0:a0:c3:f0:89:70:19:bb:51:65:c5: + 43:9c:c3:9b:63:9d:20:83:3e:06:0b:a6:42:44:85: + 11:a7:4a:3a:2d:e9:d6:68:2f:48:4e:53:2b:07:3f: + 4d:bd:b9:ac:77:39:57 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + 8E:07:62:C0:50:DD:C6:19:06:00:46:74:04:F7:F3:AE:7D:75:4D:30 + Signature Algorithm: ecdsa-with-SHA384 + Signature Value: + 30:65:02:31:00:9c:33:df:41:e3:23:a8:42:36:26:97:35:5c: + 7b:eb:db:4b:f8:aa:8b:73:55:15:5c:ac:78:29:0f:ba:21:d8: + c4:a0:d8:d1:03:dd:6d:d1:39:3d:c4:93:60:d2:e3:72:b2:02: + 30:7c:c5:7e:88:d3:50:f5:1e:25:e8:fa:4e:75:e6:58:96:a4: + 35:5f:1b:65:ea:61:9a:70:23:b5:0d:a3:9b:92:52:6f:69:a0: + 8c:8d:4a:d0:ee:8b:0e:cb:47:8e:d0:8d:11 +SHA1 Fingerprint=07:86:C0:D8:DD:8E:C0:80:98:06:98:D0:58:7A:EF:DE:A6:CC:A2:5D +-----BEGIN CERTIFICATE----- +MIICHTCCAaOgAwIBAgIUQ3CCd89NXTTxyq4yLzf39H91oJ4wCgYIKoZIzj0EAwMw +TjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwiQ29t +bVNjb3BlIFB1YmxpYyBUcnVzdCBFQ0MgUm9vdC0wMTAeFw0yMTA0MjgxNzM1NDNa +Fw00NjA0MjgxNzM1NDJaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21tU2Nv +cGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgRUNDIFJvb3QtMDEw +djAQBgcqhkjOPQIBBgUrgQQAIgNiAARLNumuV16ocNfQj3Rid8NeeqrltqLxeP0C +flfdkXmcbLlSiFS8LwS+uM32ENEp7LXQoMPwiXAZu1FlxUOcw5tjnSCDPgYLpkJE +hRGnSjot6dZoL0hOUysHP029uax3OVejQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD +VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSOB2LAUN3GGQYARnQE9/OufXVNMDAKBggq +hkjOPQQDAwNoADBlAjEAnDPfQeMjqEI2Jpc1XHvr20v4qotzVRVcrHgpD7oh2MSg +2NED3W3ROT3Ek2DS43KyAjB8xX6I01D1HiXo+k515liWpDVfG2XqYZpwI7UNo5uS +Um9poIyNStDuiw7LR47QjRE= +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-02.pem b/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-02.pem new file mode 100644 index 000000000000..f547954704be --- /dev/null +++ b/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-02.pem @@ -0,0 +1,67 @@ +## +## CommScope Public Trust ECC Root-02 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 28:fd:99:60:41:47:a6:01:3a:ca:14:7b:1f:ef:f9:68:08:83:5d:7d + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = US, O = CommScope, CN = CommScope Public Trust ECC Root-02 + Validity + Not Before: Apr 28 17:44:54 2021 GMT + Not After : Apr 28 17:44:53 2046 GMT + Subject: C = US, O = CommScope, CN = CommScope Public Trust ECC Root-02 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:78:30:81:e8:63:1e:e5:eb:71:51:0f:f7:07:07: + ca:39:99:7c:4e:d5:0f:cc:30:30:0b:8f:66:93:3e: + cf:bd:c5:86:bd:f9:b1:b7:b4:3e:b4:07:c8:f3:96: + 31:f3:ed:a4:4f:f8:a3:4e:8d:29:15:58:b8:d5:6f: + 7f:ee:6c:22:b5:b0:af:48:45:0a:bd:a8:49:94:bf: + 84:43:b0:db:84:4a:03:23:19:67:6a:6f:c1:6e:bc: + 06:39:37:d1:88:22:f7 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + E6:18:75:FF:EF:60:DE:84:A4:F5:46:C7:DE:4A:55:E3:32:36:79:F5 + Signature Algorithm: ecdsa-with-SHA384 + Signature Value: + 30:64:02:30:26:73:49:7a:b6:ab:e6:49:f4:7d:52:3f:d4:41: + 04:ae:80:43:83:65:75:b9:85:80:38:3b:d6:6f:e4:93:86:ab: + 8f:e7:89:c8:7f:9b:7e:6b:0a:12:55:61:aa:11:e0:79:02:30: + 77:e8:31:71:ac:3c:71:03:d6:84:26:1e:14:b8:f3:3b:3b:de: + ed:59:fc:6b:4c:30:7f:59:ce:45:e9:73:60:15:9a:4c:f0:e6: + 5e:25:22:15:6d:c2:87:59:d0:b2:8e:6a +SHA1 Fingerprint=3C:3F:EF:57:0F:FE:65:93:86:9E:A0:FE:B0:F6:ED:8E:D1:13:C7:E5 +-----BEGIN CERTIFICATE----- +MIICHDCCAaOgAwIBAgIUKP2ZYEFHpgE6yhR7H+/5aAiDXX0wCgYIKoZIzj0EAwMw +TjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwiQ29t +bVNjb3BlIFB1YmxpYyBUcnVzdCBFQ0MgUm9vdC0wMjAeFw0yMTA0MjgxNzQ0NTRa +Fw00NjA0MjgxNzQ0NTNaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21tU2Nv +cGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgRUNDIFJvb3QtMDIw +djAQBgcqhkjOPQIBBgUrgQQAIgNiAAR4MIHoYx7l63FRD/cHB8o5mXxO1Q/MMDAL +j2aTPs+9xYa9+bG3tD60B8jzljHz7aRP+KNOjSkVWLjVb3/ubCK1sK9IRQq9qEmU +v4RDsNuESgMjGWdqb8FuvAY5N9GIIvejQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD +VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTmGHX/72DehKT1RsfeSlXjMjZ59TAKBggq +hkjOPQQDAwNnADBkAjAmc0l6tqvmSfR9Uj/UQQSugEODZXW5hYA4O9Zv5JOGq4/n +ich/m35rChJVYaoR4HkCMHfoMXGsPHED1oQmHhS48zs73u1Z/GtMMH9ZzkXpc2AV +mkzw5l4lIhVtwodZ0LKOag== +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-01.pem b/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-01.pem new file mode 100644 index 000000000000..2f144760f93c --- /dev/null +++ b/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-01.pem @@ -0,0 +1,134 @@ +## +## CommScope Public Trust RSA Root-01 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 3e:03:49:81:75:16:74:31:8e:4c:ab:d5:c5:90:29:96:c5:39:10:dd + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = US, O = CommScope, CN = CommScope Public Trust RSA Root-01 + Validity + Not Before: Apr 28 16:45:54 2021 GMT + Not After : Apr 28 16:45:53 2046 GMT + Subject: C = US, O = CommScope, CN = CommScope Public Trust RSA Root-01 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (4096 bit) + Modulus: + 00:b0:48:65:a3:0d:1d:42:e3:91:6d:9d:84:a4:61: + 96:12:c2:ed:c3:da:23:34:19:76:f6:ea:fd:55:5a: + f6:55:01:53:0f:f2:cc:8c:97:4f:b9:50:cb:b3:01: + 44:56:96:fd:9b:28:ec:7b:74:0b:e7:42:6b:55:ce: + c9:61:b2:e8:ad:40:3c:ba:b9:41:0a:05:4f:1b:26: + 85:8f:43:b5:40:b5:85:d1:d4:71:dc:83:41:f3:f6: + 45:c7:80:a2:84:50:97:46:ce:a0:0c:c4:60:56:04: + 1d:07:5b:46:a5:0e:b2:4b:a4:0e:a5:7c:ee:f8:d4: + 62:03:b9:93:6a:8a:14:b8:70:f8:2e:82:46:38:23: + 0e:74:c7:6b:41:b7:d0:29:a3:9d:80:b0:7e:77:93: + 63:42:fb:34:83:3b:73:a3:5a:21:36:eb:47:fa:18: + 17:d9:ba:66:c2:93:a4:8f:fc:5d:a4:ad:fc:50:6a: + 95:ac:bc:24:33:d1:bd:88:7f:86:f5:f5:b2:73:2a: + 8f:7c:af:08:f2:1a:98:3f:a9:81:65:3f:c1:8c:89: + c5:96:30:9a:0a:cf:f4:d4:c8:34:ed:9d:2f:bc:8d: + 38:86:53:ee:97:9f:a9:b2:63:94:17:8d:0f:dc:66: + 2a:7c:52:51:75:cb:99:8e:e8:3d:5c:bf:9e:3b:28: + 8d:83:02:0f:a9:9f:72:e2:2c:2b:b3:dc:66:97:00: + 40:d0:a4:54:8e:9b:5d:7b:45:36:26:d6:72:43:eb: + cf:c0:ea:0d:dc:ce:12:e6:7d:38:9f:05:27:a8:97: + 3e:e9:51:c6:6c:05:28:c1:02:0f:e9:18:6d:ec:bd: + 9c:06:d4:a7:49:f4:54:05:6b:6c:30:f1:eb:03:d5: + ea:3d:6a:76:c2:cb:1a:28:49:4d:7f:64:e0:fa:2b: + da:73:83:81:ff:91:03:bd:94:bb:e4:b8:8e:9c:32: + 63:cd:9f:bb:68:81:b1:84:5b:af:36:bf:77:ee:1d: + 7f:f7:49:9b:52:ec:d2:77:5a:7d:91:9d:4d:c2:39: + 2d:e4:ba:82:f8:6f:f2:4e:1e:0f:4e:e6:3f:59:a5: + 23:dc:3d:87:a8:28:58:28:d1:f1:1b:36:db:4f:c4: + ff:e1:8c:5b:72:8c:c7:26:03:27:a3:39:0a:01:aa: + c0:b2:31:60:83:22:a1:4f:12:09:01:11:af:34:d4: + cf:d7:ae:62:d3:05:07:b4:31:75:e0:0d:6d:57:4f: + 69:87:f9:57:a9:ba:15:f6:c8:52:6d:a1:cb:9c:1f: + e5:fc:78:a8:35:9a:9f:41:14:ce:a5:b4:ce:94:08: + 1c:09:ad:56:e5:da:b6:49:9a:4a:ea:63:18:53:9c: + 2c:2e:c3 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + 37:5D:A6:9A:74:32:C2:C2:F9:C7:A6:15:10:59:B8:E4:FD:E5:B8:6D + Signature Algorithm: sha256WithRSAEncryption + Signature Value: + af:a7:cf:de:ff:e0:bd:42:8d:4d:e5:22:96:df:68:ea:7d:4d: + 2a:7d:d0:ad:3d:16:5c:43:e7:7d:c0:86:e8:7a:35:63:f1:cc: + 81:c8:c6:0b:e8:2e:52:35:a4:a6:49:90:63:51:ac:34:ac:05: + 3b:57:00:e9:d3:62:d3:d9:29:d5:54:be:1c:10:91:9c:b2:6d: + fe:59:fd:79:f7:ea:56:d0:9e:68:54:42:8f:26:52:e2:4c:df: + 2f:97:a6:2f:d2:07:98:a8:f3:60:5d:4b:9a:58:57:88:ef:82: + e5:fa:af:6c:81:4b:92:8f:40:9a:93:46:59:cb:5f:78:16:b1: + 67:3e:42:0b:df:28:d9:b0:ad:98:20:be:43:7c:d1:5e:1a:09: + 17:24:8d:7b:5d:95:e9:ab:c1:60:ab:5b:18:64:80:fb:ad:e0: + 06:7d:1d:ca:59:b8:f3:78:29:67:c6:56:1d:af:b6:b5:74:2a: + 76:a1:3f:fb:75:30:9f:94:5e:3b:a5:60:f3:cb:5c:0c:e2:0e: + c9:60:f8:c9:1f:16:8a:26:dd:e7:27:7f:eb:25:a6:8a:bd:b8: + 2d:36:10:9a:b1:58:4d:9a:68:4f:60:54:e5:f6:46:13:8e:88: + ac:bc:21:42:12:ad:c6:4a:89:7d:9b:c1:d8:2d:e9:96:03:f4: + a2:74:0c:bc:00:1d:bf:d6:37:25:67:b4:72:8b:af:85:bd:ea: + 2a:03:8f:cc:fb:3c:44:24:82:e2:01:a5:0b:59:b6:34:8d:32: + 0b:12:0d:eb:27:c2:fd:41:d7:40:3c:72:46:29:c0:8c:ea:ba: + 0f:f1:06:93:2e:f7:9c:a8:f4:60:3e:a3:f1:38:5e:8e:13:c1: + b3:3a:97:87:3f:92:ca:78:a9:1c:af:d0:b0:1b:26:1e:be:70: + ec:7a:f5:33:98:ea:5c:ff:2b:0b:04:4e:43:dd:63:7e:0e:a7: + 4e:78:03:95:3e:d4:2d:30:95:11:10:28:2e:bf:a0:02:3e:ff: + 5e:59:d3:05:0e:95:5f:53:45:ef:6b:87:d5:48:cd:16:a6:96: + 83:e1:df:b3:06:f3:c1:14:db:a7:ec:1c:8b:5d:90:90:0d:72: + 51:e7:61:f9:14:ca:af:83:8f:bf:af:b1:0a:59:5d:dc:5c:d7: + e4:96:ad:5b:60:1d:da:ae:97:b2:39:d9:06:f5:76:00:13:f8: + 68:4c:21:b0:35:c4:dc:55:b2:c9:c1:41:5a:1c:89:c0:8c:6f: + 74:a0:6b:33:4d:b5:01:28:fd:ad:ad:89:17:3b:a6:9a:84:bc: + eb:8c:ea:c4:71:24:a8:ba:29:f9:08:b2:27:56:35:32:5f:ea: + 39:fb:31:9a:d5:19:cc:f0 +SHA1 Fingerprint=6D:0A:5F:F7:B4:23:06:B4:85:B3:B7:97:64:FC:AC:75:F5:33:F2:93 +-----BEGIN CERTIFICATE----- +MIIFbDCCA1SgAwIBAgIUPgNJgXUWdDGOTKvVxZAplsU5EN0wDQYJKoZIhvcNAQEL +BQAwTjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwi +Q29tbVNjb3BlIFB1YmxpYyBUcnVzdCBSU0EgUm9vdC0wMTAeFw0yMTA0MjgxNjQ1 +NTRaFw00NjA0MjgxNjQ1NTNaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21t +U2NvcGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgUlNBIFJvb3Qt +MDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwSGWjDR1C45FtnYSk +YZYSwu3D2iM0GXb26v1VWvZVAVMP8syMl0+5UMuzAURWlv2bKOx7dAvnQmtVzslh +suitQDy6uUEKBU8bJoWPQ7VAtYXR1HHcg0Hz9kXHgKKEUJdGzqAMxGBWBB0HW0al +DrJLpA6lfO741GIDuZNqihS4cPgugkY4Iw50x2tBt9Apo52AsH53k2NC+zSDO3Oj +WiE260f6GBfZumbCk6SP/F2krfxQapWsvCQz0b2If4b19bJzKo98rwjyGpg/qYFl +P8GMicWWMJoKz/TUyDTtnS+8jTiGU+6Xn6myY5QXjQ/cZip8UlF1y5mO6D1cv547 +KI2DAg+pn3LiLCuz3GaXAEDQpFSOm117RTYm1nJD68/A6g3czhLmfTifBSeolz7p +UcZsBSjBAg/pGG3svZwG1KdJ9FQFa2ww8esD1eo9anbCyxooSU1/ZOD6K9pzg4H/ +kQO9lLvkuI6cMmPNn7togbGEW682v3fuHX/3SZtS7NJ3Wn2RnU3COS3kuoL4b/JO +Hg9O5j9ZpSPcPYeoKFgo0fEbNttPxP/hjFtyjMcmAyejOQoBqsCyMWCDIqFPEgkB +Ea801M/XrmLTBQe0MXXgDW1XT2mH+VepuhX2yFJtocucH+X8eKg1mp9BFM6ltM6U +CBwJrVbl2rZJmkrqYxhTnCwuwwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G +A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUN12mmnQywsL5x6YVEFm45P3luG0wDQYJ +KoZIhvcNAQELBQADggIBAK+nz97/4L1CjU3lIpbfaOp9TSp90K09FlxD533Ahuh6 +NWPxzIHIxgvoLlI1pKZJkGNRrDSsBTtXAOnTYtPZKdVUvhwQkZyybf5Z/Xn36lbQ +nmhUQo8mUuJM3y+Xpi/SB5io82BdS5pYV4jvguX6r2yBS5KPQJqTRlnLX3gWsWc+ +QgvfKNmwrZggvkN80V4aCRckjXtdlemrwWCrWxhkgPut4AZ9HcpZuPN4KWfGVh2v +trV0KnahP/t1MJ+UXjulYPPLXAziDslg+MkfFoom3ecnf+slpoq9uC02EJqxWE2a +aE9gVOX2RhOOiKy8IUISrcZKiX2bwdgt6ZYD9KJ0DLwAHb/WNyVntHKLr4W96ioD +j8z7PEQkguIBpQtZtjSNMgsSDesnwv1B10A8ckYpwIzqug/xBpMu95yo9GA+o/E4 +Xo4TwbM6l4c/ksp4qRyv0LAbJh6+cOx69TOY6lz/KwsETkPdY34Op054A5U+1C0w +lREQKC6/oAI+/15Z0wUOlV9TRe9rh9VIzRamloPh37MG88EU26fsHItdkJANclHn +YfkUyq+Dj7+vsQpZXdxc1+SWrVtgHdqul7I52Qb1dgAT+GhMIbA1xNxVssnBQVoc +icCMb3SgazNNtQEo/a2tiRc7ppqEvOuM6sRxJKi6KfkIsidWNTJf6jn7MZrVGczw +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-02.pem b/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-02.pem new file mode 100644 index 000000000000..b343c7765878 --- /dev/null +++ b/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-02.pem @@ -0,0 +1,134 @@ +## +## CommScope Public Trust RSA Root-02 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 54:16:bf:3b:7e:39:95:71:8d:d1:aa:00:a5:86:0d:2b:8f:7a:05:4e + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = US, O = CommScope, CN = CommScope Public Trust RSA Root-02 + Validity + Not Before: Apr 28 17:16:43 2021 GMT + Not After : Apr 28 17:16:42 2046 GMT + Subject: C = US, O = CommScope, CN = CommScope Public Trust RSA Root-02 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (4096 bit) + Modulus: + 00:e1:fa:0e:fb:68:00:12:c8:4d:d5:ac:22:c4:35: + 01:3b:c5:54:e5:59:76:63:a5:7f:eb:c1:c4:6a:98: + bd:32:8d:17:80:eb:5d:ba:d1:62:3d:25:23:19:35: + 14:e9:7f:89:a7:1b:62:3c:d6:50:e7:34:95:03:32: + b1:b4:93:22:3d:a7:e2:b1:ed:e6:7b:4e:2e:87:9b: + 0d:33:75:0a:de:aa:35:e7:7e:e5:36:98:a2:ae:25: + 9e:95:b3:32:96:a4:2b:58:1e:ef:3f:fe:62:34:48: + 51:d1:b4:8d:42:ad:60:da:49:6a:95:70:dd:d2:00: + e2:cc:57:63:02:7b:96:dd:49:97:5b:92:4e:95:d3: + f9:cb:29:1f:18:4a:f8:01:2a:d2:63:09:6e:24:e9: + 89:d2:e5:c7:22:4c:dc:73:86:47:00:aa:0d:88:8e: + ae:85:7d:4a:e9:bb:33:4f:0e:52:70:9d:95:e3:7c: + 6d:96:5b:2d:3d:5f:a1:83:46:5d:b6:e3:25:b8:7c: + a7:19:80:1c:ea:65:43:dc:91:79:36:2c:74:7c:f2: + 67:06:c9:89:c9:db:bf:da:68:bf:23:ed:dc:6b:ad: + 28:83:79:2f:ec:38:a5:0d:37:01:67:27:9a:e9:33: + d9:33:5f:37:a1:c5:f0:ab:3d:fa:78:b0:e7:2c:9f: + f6:3e:9f:60:e0:ef:48:e9:90:45:1e:05:51:78:1a: + 2c:12:2c:5c:28:ac:0d:a2:23:9e:34:8f:05:e6:a2: + 33:ce:11:77:13:d4:0e:a4:1e:42:1f:86:cd:70:fe: + d9:2e:15:3d:1d:bb:b8:f2:53:57:db:cc:c6:74:29: + 9c:18:b3:36:75:38:2e:0f:54:a1:f8:92:1f:89:96: + 4f:bb:d4:ee:9d:e9:3b:36:42:b5:0a:3b:2a:d4:64: + 79:36:10:e1:f9:91:03:2b:7b:20:54:cd:0d:19:1a: + c8:41:32:34:d1:b0:99:e1:90:1e:01:40:36:b5:b7: + fa:a9:e5:77:75:a4:22:81:5d:b0:8b:e4:27:12:0f: + 54:88:c6:db:85:74:e6:b7:c0:d7:a6:29:fa:db:de: + f3:93:97:27:04:55:2f:0a:6f:37:c5:3d:13:af:0a: + 00:a9:2c:8b:1c:81:28:d7:ef:86:31:a9:ae:f2:6e: + b8:ca:6a:2c:54:47:d8:2a:88:2e:af:c1:07:10:78: + ac:11:a2:2f:42:f0:37:c5:f2:b8:56:dd:0e:62:2d: + ce:2d:56:7e:55:f2:a7:44:f6:2b:32:f4:23:a8:47: + e8:d4:2a:01:78:cf:6a:c3:37:a8:9e:65:d2:2c:e5: + fa:ba:33:c1:06:44:f6:e6:cf:a5:0d:a7:66:08:34: + 8a:2c:f3 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + 47:D0:E7:B1:22:FF:9D:2C:F5:D9:57:60:B3:B1:B1:70:95:EF:61:7A + Signature Algorithm: sha256WithRSAEncryption + Signature Value: + 86:69:b1:4d:2f:e9:9f:4f:22:93:68:8e:e4:21:99:a3:ce:45: + 53:1b:73:44:53:00:81:61:cd:31:e3:08:ba:81:28:28:7a:92: + b9:b6:a8:c8:43:9e:c7:13:26:4d:c2:d8:e5:55:9c:92:5d:50: + d8:c2:2b:db:fe:e6:a8:97:cf:52:3a:24:c3:65:64:5c:47:31: + a3:65:35:13:c3:93:b9:f7:f9:51:97:bb:a4:f0:62:87:c5:d6: + 06:d3:97:83:20:a9:7e:bb:b6:21:c2:a5:0d:84:00:e1:f2:27: + 10:83:ba:dd:03:81:d5:dd:68:c3:66:10:c8:d1:76:b4:b3:6f: + 29:9e:00:f9:c2:29:f5:b1:93:19:52:69:1a:2c:4c:a0:8b:e0: + 15:9a:31:2f:d3:88:95:59:6e:e5:c4:b3:50:c8:14:08:4a:9b: + 8b:13:83:b1:a4:72:b2:3b:76:33:41:dc:dc:aa:a6:07:6f:1d: + 24:12:9f:c8:76:bd:2f:d9:8e:f4:2c:ee:b7:d2:38:10:24:36: + 51:2f:e3:5c:5d:81:21:a7:da:bb:4e:ff:e6:07:a8:fe:b9:0d: + 27:6c:bb:70:5a:55:7a:13:e9:f1:2a:49:69:c7:5f:87:57:4c: + 43:79:6d:3a:65:e9:30:5c:41:ee:eb:77:a5:73:12:88:e8:bf: + 7d:ae:e5:c4:a8:1f:0d:8e:1c:6d:50:02:4f:26:18:43:de:8f: + 55:85:b1:0b:37:05:60:c9:55:39:12:04:a1:2a:cf:71:16:9f: + 36:51:49:bf:70:3b:9e:67:9c:fb:7b:79:c9:39:1c:78:ac:77: + 91:54:9a:b8:75:0a:81:52:97:e3:66:61:6b:ed:3e:38:1e:96: + 61:55:e1:91:54:8c:ed:8c:24:1f:81:c9:10:9a:73:99:2b:16: + 4e:72:00:3f:54:1b:f8:8d:ba:8b:e7:14:d6:b6:45:4f:60:ec: + 96:ae:c3:2f:02:4e:5d:9d:96:49:72:00:b2:ab:75:5c:0f:68: + 5b:1d:65:c2:5f:33:0f:1e:0f:f0:3b:86:f5:b0:4e:bb:9c:f7: + ea:25:05:dc:ad:a2:9b:4b:17:01:be:42:df:35:21:1d:ad:ab: + ae:f4:bf:ae:1f:1b:d3:e2:3b:fc:b3:72:73:1c:9b:28:90:89: + 13:3d:1d:c1:00:47:09:96:9a:38:1b:dd:b1:cf:0d:c2:b4:44: + f3:96:95:ce:32:3a:8f:34:9c:e0:17:c7:5e:ce:ae:0d:db:87: + 38:e5:3f:5b:fd:9b:19:e1:31:41:7a:70:aa:23:6b:01:e1:45: + 4c:cd:94:ce:3b:9e:2d:e7:88:02:22:f4:6e:e8:c8:ec:d6:3c: + f3:b9:b2:d7:77:7a:ac:7b +SHA1 Fingerprint=EA:B0:E2:52:1B:89:93:4C:11:68:F2:D8:9A:AC:22:4C:A3:8A:57:AE +-----BEGIN CERTIFICATE----- +MIIFbDCCA1SgAwIBAgIUVBa/O345lXGN0aoApYYNK496BU4wDQYJKoZIhvcNAQEL +BQAwTjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwi +Q29tbVNjb3BlIFB1YmxpYyBUcnVzdCBSU0EgUm9vdC0wMjAeFw0yMTA0MjgxNzE2 +NDNaFw00NjA0MjgxNzE2NDJaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21t +U2NvcGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgUlNBIFJvb3Qt +MDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDh+g77aAASyE3VrCLE +NQE7xVTlWXZjpX/rwcRqmL0yjReA61260WI9JSMZNRTpf4mnG2I81lDnNJUDMrG0 +kyI9p+Kx7eZ7Ti6Hmw0zdQreqjXnfuU2mKKuJZ6VszKWpCtYHu8//mI0SFHRtI1C +rWDaSWqVcN3SAOLMV2MCe5bdSZdbkk6V0/nLKR8YSvgBKtJjCW4k6YnS5cciTNxz +hkcAqg2Ijq6FfUrpuzNPDlJwnZXjfG2WWy09X6GDRl224yW4fKcZgBzqZUPckXk2 +LHR88mcGyYnJ27/aaL8j7dxrrSiDeS/sOKUNNwFnJ5rpM9kzXzehxfCrPfp4sOcs +n/Y+n2Dg70jpkEUeBVF4GiwSLFworA2iI540jwXmojPOEXcT1A6kHkIfhs1w/tku +FT0du7jyU1fbzMZ0KZwYszZ1OC4PVKH4kh+Jlk+71O6d6Ts2QrUKOyrUZHk2EOH5 +kQMreyBUzQ0ZGshBMjTRsJnhkB4BQDa1t/qp5Xd1pCKBXbCL5CcSD1SIxtuFdOa3 +wNemKfrb3vOTlycEVS8KbzfFPROvCgCpLIscgSjX74Yxqa7ybrjKaixUR9gqiC6v +wQcQeKwRoi9C8DfF8rhW3Q5iLc4tVn5V8qdE9isy9COoR+jUKgF4z2rDN6ieZdIs +5fq6M8EGRPbmz6UNp2YINIos8wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G +A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUR9DnsSL/nSz12Vdgs7GxcJXvYXowDQYJ +KoZIhvcNAQELBQADggIBAIZpsU0v6Z9PIpNojuQhmaPORVMbc0RTAIFhzTHjCLqB +KCh6krm2qMhDnscTJk3C2OVVnJJdUNjCK9v+5qiXz1I6JMNlZFxHMaNlNRPDk7n3 ++VGXu6TwYofF1gbTl4MgqX67tiHCpQ2EAOHyJxCDut0DgdXdaMNmEMjRdrSzbyme +APnCKfWxkxlSaRosTKCL4BWaMS/TiJVZbuXEs1DIFAhKm4sTg7GkcrI7djNB3Nyq +pgdvHSQSn8h2vS/ZjvQs7rfSOBAkNlEv41xdgSGn2rtO/+YHqP65DSdsu3BaVXoT +6fEqSWnHX4dXTEN5bTpl6TBcQe7rd6VzEojov32u5cSoHw2OHG1QAk8mGEPej1WF +sQs3BWDJVTkSBKEqz3EWnzZRSb9wO55nnPt7eck5HHisd5FUmrh1CoFSl+NmYWvt +PjgelmFV4ZFUjO2MJB+ByRCac5krFk5yAD9UG/iNuovnFNa2RU9g7Jauwy8CTl2d +lklyALKrdVwPaFsdZcJfMw8eD/A7hvWwTruc9+olBdytoptLFwG+Qt81IR2tq670 +v64fG9PiO/yzcnMcmyiQiRM9HcEARwmWmjgb3bHPDcK0RPOWlc4yOo80nOAXx17O +rg3bhzjlP1v9mxnhMUF6cKojawHhRUzNlM47ni3niAIi9G7oyOzWPPO5std3eqx7 +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/Telekom_Security_TLS_ECC_Root_2020.pem b/secure/caroot/trusted/Telekom_Security_TLS_ECC_Root_2020.pem new file mode 100644 index 000000000000..da5285d26633 --- /dev/null +++ b/secure/caroot/trusted/Telekom_Security_TLS_ECC_Root_2020.pem @@ -0,0 +1,68 @@ +## +## Telekom Security TLS ECC Root 2020 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 36:3a:96:8c:c9:5c:b2:58:cd:d0:01:5d:c5:e5:57:00 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = DE, O = Deutsche Telekom Security GmbH, CN = Telekom Security TLS ECC Root 2020 + Validity + Not Before: Aug 25 07:48:20 2020 GMT + Not After : Aug 25 23:59:59 2045 GMT + Subject: C = DE, O = Deutsche Telekom Security GmbH, CN = Telekom Security TLS ECC Root 2020 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:ce:bf:fe:57:a8:bf:d5:aa:f7:10:9a:cd:bc:d1: + 11:a2:bd:67:42:cc:90:eb:15:18:90:d9:a2:cd:0c: + 2a:25:eb:3e:4f:ce:b5:d2:8f:0f:f3:35:da:43:8b: + 02:80:be:6f:51:24:1d:0f:6b:2b:ca:9f:c2:6f:50: + 32:e5:37:20:b6:20:ff:88:0d:0f:6d:49:bb:db:06: + a4:87:90:92:94:f4:09:d0:cf:7f:c8:80:0b:c1:97: + b3:bb:35:27:c9:c2:1b + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Subject Key Identifier: + E3:72:CC:6E:95:99:47:B1:E6:B3:61:4C:D1:CB:AB:E3:BA:CD:DE:9F + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + Signature Algorithm: ecdsa-with-SHA384 + Signature Value: + 30:64:02:30:75:52:8b:b7:a4:10:4f:ae:4a:10:8b:b2:84:5b: + 42:e1:e6:2a:36:02:da:a0:6e:19:3f:25:bf:da:59:32:8e:e4: + fb:90:dc:93:64:ce:ad:b4:41:47:60:e2:cf:a7:cb:1e:02:30: + 37:41:8c:66:df:41:6b:d6:83:00:41:fd:2f:5a:f7:50:b4:67: + d1:2c:a8:71:d7:43:ca:9c:27:24:91:83:48:0d:cf:cd:f7:54: + 81:af:ec:7f:e4:67:db:b8:90:ee:dd:25 +SHA1 Fingerprint=C0:F8:96:C5:A9:3B:01:06:21:07:DA:18:42:48:BC:E9:9D:88:D5:EC +-----BEGIN CERTIFICATE----- +MIICQjCCAcmgAwIBAgIQNjqWjMlcsljN0AFdxeVXADAKBggqhkjOPQQDAzBjMQsw +CQYDVQQGEwJERTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0eSBH +bWJIMSswKQYDVQQDDCJUZWxla29tIFNlY3VyaXR5IFRMUyBFQ0MgUm9vdCAyMDIw +MB4XDTIwMDgyNTA3NDgyMFoXDTQ1MDgyNTIzNTk1OVowYzELMAkGA1UEBhMCREUx +JzAlBgNVBAoMHkRldXRzY2hlIFRlbGVrb20gU2VjdXJpdHkgR21iSDErMCkGA1UE +AwwiVGVsZWtvbSBTZWN1cml0eSBUTFMgRUNDIFJvb3QgMjAyMDB2MBAGByqGSM49 +AgEGBSuBBAAiA2IABM6//leov9Wq9xCazbzREaK9Z0LMkOsVGJDZos0MKiXrPk/O +tdKPD/M12kOLAoC+b1EkHQ9rK8qfwm9QMuU3ILYg/4gND21Ju9sGpIeQkpT0CdDP +f8iAC8GXs7s1J8nCG6NCMEAwHQYDVR0OBBYEFONyzG6VmUex5rNhTNHLq+O6zd6f +MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMAoGCCqGSM49BAMDA2cA +MGQCMHVSi7ekEE+uShCLsoRbQuHmKjYC2qBuGT8lv9pZMo7k+5Dck2TOrbRBR2Di +z6fLHgIwN0GMZt9Ba9aDAEH9L1r3ULRn0SyocddDypwnJJGDSA3PzfdUga/sf+Rn +27iQ7t0l +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/Telekom_Security_TLS_RSA_Root_2023.pem b/secure/caroot/trusted/Telekom_Security_TLS_RSA_Root_2023.pem new file mode 100644 index 000000000000..69bbcdd0e322 --- /dev/null +++ b/secure/caroot/trusted/Telekom_Security_TLS_RSA_Root_2023.pem @@ -0,0 +1,138 @@ +## +## Telekom Security TLS RSA Root 2023 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 21:9c:54:2d:e8:f6:ec:71:77:fa:4e:e8:c3:70:57:97 + Signature Algorithm: sha384WithRSAEncryption + Issuer: C = DE, O = Deutsche Telekom Security GmbH, CN = Telekom Security TLS RSA Root 2023 + Validity + Not Before: Mar 28 12:16:45 2023 GMT + Not After : Mar 27 23:59:59 2048 GMT + Subject: C = DE, O = Deutsche Telekom Security GmbH, CN = Telekom Security TLS RSA Root 2023 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (4096 bit) + Modulus: + 00:ed:35:a1:81:80:f3:cb:4a:69:5b:c2:fb:51:83: + ae:26:fd:e1:6e:f3:81:12:7d:71:40:ff:87:75:42: + 29:21:ed:81:52:2c:df:12:c1:19:84:89:c1:bd:c5: + 28:d5:d5:4b:6c:44:d6:4c:db:07:96:4a:55:7a:ca: + 36:82:04:36:a8:a5:fc:27:f6:49:f1:d5:72:9e:91: + f9:23:d6:70:7b:bb:f5:9b:c1:ec:93:cf:19:ea:65: + 7e:88:70:a0:73:fc:f6:ff:b5:56:62:e1:73:6a:34: + 98:3e:82:b8:ac:95:53:f4:01:a0:27:07:72:a3:00: + 53:a0:e4:b2:ab:83:38:57:33:25:94:9f:be:48:1d: + 98:e1:a3:ba:9e:5c:cd:04:71:51:7d:75:78:ab:f3: + 59:aa:c4:e0:60:be:8f:83:52:b8:75:1a:41:35:ed: + bc:f3:3a:63:e9:a9:14:45:d7:e6:52:d1:6e:d2:de: + bc:e3:f5:0b:3b:e6:e0:c4:bd:43:64:13:a6:ce:f4: + 98:37:6c:8a:95:a8:97:c8:47:0f:f0:5e:10:8b:e7: + 1d:1c:fe:b1:3b:a0:05:33:68:05:41:82:c1:03:2b: + 01:c8:e7:8f:4d:ab:e8:b5:f6:cd:6b:44:b5:e7:dd: + 8b:ec:ea:25:b4:00:22:57:4d:b0:b1:b2:31:c1:16: + ce:ff:fd:14:84:b7:47:fa:b2:f1:70:de:db:8b:6c: + 36:58:a4:7c:b3:11:d1:c3:77:7f:5f:b6:25:e0:0d: + c5:d2:b3:f9:b8:b8:77:db:37:71:71:47:e3:60:18: + 4f:24:b6:75:37:78:b9:a3:62:af:bd:c9:72:8e:2f: + cc:bb:ae:db:e4:15:52:19:07:33:fb:6a:b7:2d:4b: + 90:28:82:73:fe:18:8b:35:8d:db:a7:04:6a:be:ea: + c1:4d:36:3b:16:36:91:32:ef:b6:40:89:91:43:e0: + f2:a2:ab:04:2e:e6:f2:4c:0e:16:34:20:ac:87:c1: + 2d:7e:c9:66:47:17:14:11:a4:f3:f7:a1:24:89:ab: + d8:1a:c8:a1:5c:b1:a3:f7:8c:6d:c8:01:c9:4f:c9: + ec:c4:fc:ac:51:33:d1:c8:83:d1:c9:9f:1d:d4:47: + 34:29:3e:cb:b0:0e:fa:83:0b:28:58:e5:29:dc:3f: + 7c:a8:9f:c9:b6:0a:bb:a6:e8:46:16:0f:96:e5:7b: + e4:6a:7a:48:6d:76:98:05:a5:dc:6d:1e:42:1e:42: + da:1a:e0:52:f7:b5:83:c0:1a:7b:78:35:2c:38:f5: + 1f:fd:49:a3:2e:d2:59:63:bf:80:b0:8c:93:73:cb: + 35:a6:99:95:22:61:65:03:60:fb:2f:93:4b:fa:9a: + 9c:80:3b + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + B6:A7:97:82:3D:74:85:9B:F7:3C:9F:93:9A:95:79:75:52:8C:6D:47 + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Authority Key Identifier: + B6:A7:97:82:3D:74:85:9B:F7:3C:9F:93:9A:95:79:75:52:8C:6D:47 + Signature Algorithm: sha384WithRSAEncryption + Signature Value: + a8:cc:61:a6:be:75:9e:15:50:a4:6b:fb:a8:70:45:7c:ba:7e: + b1:5a:fc:5b:23:fa:0a:77:f8:98:71:82:0c:6d:e0:5e:46:aa: + 93:f4:1e:a0:c3:e1:93:db:4b:ad:b2:a6:5d:ab:b0:d4:62:cb: + 5e:bb:66:f5:2d:ee:97:40:3c:62:eb:5e:d6:14:d6:8c:e2:96: + 8b:41:69:93:35:e6:b9:99:6b:62:b4:a1:17:66:34:a6:6b:63: + c6:b9:4e:f2:22:e9:58:0d:56:41:d1:fa:0c:4a:f0:33:cd:3b: + bb:6d:21:3a:ae:8e:72:b5:c3:4a:fb:e9:7d:e5:b1:9b:86:ee: + e2:e0:7d:b4:f7:32:fd:22:84:f1:85:c9:37:79:e9:b5:3f:bf: + 5c:e4:74:b2:8f:11:62:00:dd:18:66:a1:d9:7b:23:5f:f1:8e: + d5:67:e8:54:da:5b:3a:6b:36:6f:f9:81:b1:33:47:33:77:40: + f9:52:aa:dd:d4:83:cf:85:78:99:9a:93:b9:73:67:42:46:11: + 21:ea:fe:0a:a9:1b:1a:65:69:b3:8f:ae:16:b6:f6:4b:56:b2: + 2d:f9:a5:c8:ec:3b:62:a3:ed:6b:d0:4e:d5:40:09:a4:1f:98: + d7:3a:a5:92:59:20:e4:b0:7d:cd:5b:73:68:bd:6d:c4:a2:13: + 0e:67:19:b8:8d:42:7e:6c:0c:9a:6e:a0:24:2d:d5:45:1b:dc: + c4:02:14:fe:85:5b:65:97:ca:4e:90:50:08:7a:42:35:f9:ea: + c2:66:d4:f8:01:ae:1e:b4:be:c3:a8:ef:fe:76:9a:a2:a6:1f: + 46:f6:84:ed:fc:db:ce:c4:02:ce:77:48:2c:8c:b2:ec:c3:00: + a3:ec:2c:55:18:c1:7e:19:ee:e1:2f:f2:ad:83:9b:9e:ab:19: + df:c6:8a:2f:8c:77:e5:b7:05:ec:3b:c1:ec:be:86:b3:86:bc: + c0:f7:dc:e7:ea:5b:ae:b2:cc:b5:35:86:4b:d0:e2:3f:b6:d8: + f8:0e:00:ee:5d:e3:f7:8d:58:ff:cf:8b:37:e9:63:5f:6e:f7: + 09:71:36:c2:12:5d:57:f2:c8:b4:cd:f3:ee:02:df:11:dc:6a: + b9:57:84:1d:59:4d:8c:ce:c8:0e:23:c2:b7:26:9a:10:14:71: + fe:93:b2:8a:b8:80:f0:0e:10:9e:d3:a8:50:0c:37:82:2f:ea: + e0:8a:9d:e1:2c:39:ff:b5:b4:73:00:e4:f7:48:a6:73:ac:bf: + b2:de:77:04:87:b4:a3:cd:9b:35:24:37:fa:90:93:13:81:42: + c6:98:26:75:37:66:41:10:ac:bb:f5:94:e3:c2:31:2b:ad:e7: + 23:56:cc:35:25:92:b3:50 +SHA1 Fingerprint=54:D3:AC:B3:BD:57:56:F6:85:9D:CE:E5:C3:21:E2:D4:AD:83:D0:93 +-----BEGIN CERTIFICATE----- +MIIFszCCA5ugAwIBAgIQIZxULej27HF3+k7ow3BXlzANBgkqhkiG9w0BAQwFADBj +MQswCQYDVQQGEwJERTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0 +eSBHbWJIMSswKQYDVQQDDCJUZWxla29tIFNlY3VyaXR5IFRMUyBSU0EgUm9vdCAy +MDIzMB4XDTIzMDMyODEyMTY0NVoXDTQ4MDMyNzIzNTk1OVowYzELMAkGA1UEBhMC +REUxJzAlBgNVBAoMHkRldXRzY2hlIFRlbGVrb20gU2VjdXJpdHkgR21iSDErMCkG +A1UEAwwiVGVsZWtvbSBTZWN1cml0eSBUTFMgUlNBIFJvb3QgMjAyMzCCAiIwDQYJ +KoZIhvcNAQEBBQADggIPADCCAgoCggIBAO01oYGA88tKaVvC+1GDrib94W7zgRJ9 +cUD/h3VCKSHtgVIs3xLBGYSJwb3FKNXVS2xE1kzbB5ZKVXrKNoIENqil/Cf2SfHV +cp6R+SPWcHu79ZvB7JPPGeplfohwoHP89v+1VmLhc2o0mD6CuKyVU/QBoCcHcqMA +U6DksquDOFczJZSfvkgdmOGjup5czQRxUX11eKvzWarE4GC+j4NSuHUaQTXtvPM6 +Y+mpFEXX5lLRbtLevOP1Czvm4MS9Q2QTps70mDdsipWol8hHD/BeEIvnHRz+sTug +BTNoBUGCwQMrAcjnj02r6LX2zWtEtefdi+zqJbQAIldNsLGyMcEWzv/9FIS3R/qy +8XDe24tsNlikfLMR0cN3f1+2JeANxdKz+bi4d9s3cXFH42AYTyS2dTd4uaNir73J +co4vzLuu2+QVUhkHM/tqty1LkCiCc/4YizWN26cEar7qwU02OxY2kTLvtkCJkUPg +8qKrBC7m8kwOFjQgrIfBLX7JZkcXFBGk8/ehJImr2BrIoVyxo/eMbcgByU/J7MT8 +rFEz0ciD0cmfHdRHNCk+y7AO+oMLKFjlKdw/fKifybYKu6boRhYPluV75Gp6SG12 +mAWl3G0eQh5C2hrgUve1g8Aae3g1LDj1H/1Joy7SWWO/gLCMk3PLNaaZlSJhZQNg ++y+TS/qanIA7AgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtqeX +gj10hZv3PJ+TmpV5dVKMbUcwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS2 +p5eCPXSFm/c8n5OalXl1UoxtRzANBgkqhkiG9w0BAQwFAAOCAgEAqMxhpr51nhVQ +pGv7qHBFfLp+sVr8WyP6Cnf4mHGCDG3gXkaqk/QeoMPhk9tLrbKmXauw1GLLXrtm +9S3ul0A8Yute1hTWjOKWi0FpkzXmuZlrYrShF2Y0pmtjxrlO8iLpWA1WQdH6DErw +M807u20hOq6OcrXDSvvpfeWxm4bu4uB9tPcy/SKE8YXJN3nptT+/XOR0so8RYgDd +GGah2XsjX/GO1WfoVNpbOms2b/mBsTNHM3dA+VKq3dSDz4V4mZqTuXNnQkYRIer+ +CqkbGmVps4+uFrb2S1ayLfmlyOw7YqPta9BO1UAJpB+Y1zqlklkg5LB9zVtzaL1t +xKITDmcZuI1CfmwMmm6gJC3VRRvcxAIU/oVbZZfKTpBQCHpCNfnqwmbU+AGuHrS+ +w6jv/naaoqYfRvaE7fzbzsQCzndILIyy7MMAo+wsVRjBfhnu4S/yrYObnqsZ38aK +L4x35bcF7DvB7L6Gs4a8wPfc5+pbrrLMtTWGS9DiP7bY+A4A7l3j941Y/8+LN+lj +X273CXE2whJdV/LItM3z7gLfEdxquVeEHVlNjM7IDiPCtyaaEBRx/pOyiriA8A4Q +ntOoUAw3gi/q4Iqd4Sw5/7W0cwDk90imc6y/st53BIe0o82bNSQ3+pCTE4FCxpgm +dTdmQRCsu/WU48IxK63nI1bMNSWSs1A= +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/TrustAsia_Global_Root_CA_G3.pem b/secure/caroot/trusted/TrustAsia_Global_Root_CA_G3.pem new file mode 100644 index 000000000000..72e8d614f96a --- /dev/null +++ b/secure/caroot/trusted/TrustAsia_Global_Root_CA_G3.pem @@ -0,0 +1,138 @@ +## +## TrustAsia Global Root CA G3 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 64:f6:0e:65:77:61:6a:ab:3b:b4:ea:85:84:bb:b1:89:b8:71:93:0f + Signature Algorithm: sha384WithRSAEncryption + Issuer: C = CN, O = "TrustAsia Technologies, Inc.", CN = TrustAsia Global Root CA G3 + Validity + Not Before: May 20 02:10:19 2021 GMT + Not After : May 19 02:10:19 2046 GMT + Subject: C = CN, O = "TrustAsia Technologies, Inc.", CN = TrustAsia Global Root CA G3 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (4096 bit) + Modulus: + 00:c0:31:82:61:92:e4:94:1b:0a:2a:65:d0:be:06: + a9:87:3b:51:12:ea:70:41:ae:e2:fb:74:ea:0a:8d: + b9:b3:4c:dc:8f:b7:13:52:4f:54:18:e1:2c:73:95: + 91:c5:66:3b:6a:cf:ac:63:6d:87:53:f0:f7:f1:39: + b7:a0:43:63:b0:c4:03:5d:57:a9:e7:44:ce:c4:a1: + 83:65:f6:50:3e:b1:7e:16:b8:3a:8a:02:d0:96:1f: + 00:cd:05:21:ef:06:6d:dd:21:9c:19:43:45:a1:c5: + e8:80:ca:c2:ad:40:62:17:06:c6:aa:bc:f3:d6:e6: + fc:50:7e:66:42:1f:3c:8b:a6:79:79:86:40:35:9f: + 20:ef:3f:eb:8b:47:1f:8f:8e:c5:d4:8e:b6:2c:c9: + 44:04:e3:d4:43:75:3f:d5:3f:af:1c:cc:7e:46:5f: + ac:df:64:10:8a:ef:46:f0:90:f0:0f:2d:f4:88:0b: + b1:29:aa:af:85:aa:49:58:a8:bf:63:a0:38:91:e6: + b3:e6:77:68:c4:f9:2a:19:84:bb:0e:e1:f5:af:89: + ec:a5:2f:50:20:74:1e:12:41:73:1e:24:d9:ca:ce: + 2c:a1:59:35:c0:c8:1d:46:27:61:5a:8f:f9:4d:d3: + 72:79:66:1e:9f:15:90:21:2d:fd:ed:8b:56:70:03: + 4a:49:3e:7f:69:31:12:69:c7:1e:5c:ca:7a:13:8b: + e8:e6:f5:60:0f:cc:93:2c:84:7f:f1:fc:6a:fc:9b: + 47:9d:db:ad:88:3d:f3:76:75:33:d7:4b:a4:c8:8b: + f9:f5:43:58:4f:cb:c8:03:54:8f:a5:85:78:04:1a: + f3:73:f2:d7:87:1d:41:9f:e7:d8:17:ce:1a:9c:0f: + 4a:fc:dc:44:68:54:68:e2:41:3c:fe:2c:84:86:37: + 3c:cd:3f:2f:a2:db:e7:f7:54:03:5f:59:d3:f7:91: + 78:c7:8b:77:6a:16:e5:49:85:90:45:72:70:2f:91: + 5d:f8:3e:65:40:0b:19:99:c9:26:20:5a:68:c1:35: + bf:4f:a7:51:f1:d8:11:2b:5b:e0:9a:9e:28:3b:0a: + 3a:0a:1f:c1:81:e5:2e:f0:a6:b9:69:a5:88:94:e6: + 6b:13:7f:d1:64:3f:3d:9c:70:46:e5:a2:85:7b:58: + 84:27:dc:c4:80:3e:67:9a:9a:c7:9a:31:0e:30:ec: + e6:17:40:95:d9:45:ed:01:96:aa:bf:0c:f3:4b:d1: + 63:f7:13:58:c0:b8:f3:fa:67:dd:9b:7d:6d:4a:ff: + 32:4c:b5:25:3b:ff:1c:67:0f:85:22:59:05:91:91: + 41:77:81:d0:85:4c:87:10:71:ff:9e:43:1b:ae:95: + 75:2d:81 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Authority Key Identifier: + 40:E4:E4:F2:23:EF:38:CA:B0:AE:57:7F:F2:21:30:16:34:DB:BC:92 + X509v3 Subject Key Identifier: + 40:E4:E4:F2:23:EF:38:CA:B0:AE:57:7F:F2:21:30:16:34:DB:BC:92 + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + Signature Algorithm: sha384WithRSAEncryption + Signature Value: + 26:3b:51:e1:4d:38:f3:32:18:b4:b4:5e:e1:65:5e:c4:94:4f: + d4:a7:61:a3:f8:c0:cf:33:01:02:e9:c3:aa:35:0f:f1:94:13: + 77:77:35:9e:2d:56:51:44:6e:e1:c6:2e:28:1e:ff:da:ec:47: + cd:97:44:17:f7:e0:4c:c2:e1:7c:7c:32:7a:66:c8:5a:b6:5c: + 53:45:57:5a:45:d4:05:99:2f:2e:23:55:ee:63:68:df:d3:1b: + 78:a7:12:94:06:00:75:0d:72:84:e9:2e:bc:5a:6a:d5:de:2f: + 59:c7:a3:ec:d2:87:66:db:b7:54:b5:24:ab:f4:43:78:db:4b: + 04:c4:6f:dd:e6:3e:66:3e:29:f2:4b:68:71:22:87:a0:f8:b1: + 33:63:76:e3:0d:85:72:44:22:55:3f:1c:7c:e9:fc:b8:15:e8: + 52:fa:aa:3e:a3:21:39:35:74:89:a6:6a:c2:39:fa:78:cf:b6: + ac:e7:e7:d6:56:ff:23:92:2e:50:0b:a9:b5:07:33:f4:38:5f: + a4:49:a6:cb:65:70:76:e8:0a:85:80:4b:36:3d:33:f7:95:54: + 75:25:da:ac:c4:73:82:65:e9:52:f5:5c:fd:38:95:02:6a:69: + 30:c5:1c:0a:57:07:ae:22:a4:2c:f9:c5:41:b7:b8:ec:9f:4f: + 48:00:f9:01:04:55:cc:ac:f9:32:31:c4:75:95:06:a0:7f:d1: + 8d:27:dd:b3:a9:a4:72:87:fe:59:8b:9a:7a:74:16:dd:16:a5: + 62:29:eb:3a:96:dc:8b:a7:68:59:d3:eb:77:91:39:f8:d7:cb: + d9:8f:5f:5a:27:01:7d:5d:68:19:62:d8:c8:cd:f4:b7:72:47: + be:5b:97:ce:f2:ad:a2:99:93:ad:94:cb:93:f6:12:09:95:b6: + ab:d7:3b:d0:3f:11:cb:30:16:2e:79:80:e4:67:81:2d:5d:ed: + 70:78:b6:60:59:ac:e1:5d:45:63:8f:c8:df:72:68:5b:ea:1d: + b8:01:f1:7e:fb:e7:8a:b3:e3:54:a0:38:09:e0:3c:de:42:f2: + c2:ed:2e:9b:f3:1f:35:b6:36:d8:e3:80:a1:8b:cd:99:64:0f: + c2:aa:ab:b1:ca:f5:6f:9e:43:8d:84:54:99:b3:6e:c0:12:66: + d8:70:10:f1:06:35:33:43:a8:9c:2e:ba:14:31:ce:10:7f:1c: + 86:e3:8f:d2:d5:f8:77:ec:9b:ab:f1:2f:63:d9:42:5f:e0:67: + 81:64:91:f1:97:2f:fc:6e:26:f6:33:f8:d3:b5:f8:c4:62:ab: + 31:51:25:02:7a:f8:dd:6b:65:d5:6d:4d:30:c8:65:ba:68:14: + 65:ac:27:0b:74:8a:f2:87 +SHA1 Fingerprint=63:CF:B6:C1:27:2B:56:E4:88:8E:1C:23:9A:B6:2E:81:47:24:C3:C7 +-----BEGIN CERTIFICATE----- +MIIFpTCCA42gAwIBAgIUZPYOZXdhaqs7tOqFhLuxibhxkw8wDQYJKoZIhvcNAQEM +BQAwWjELMAkGA1UEBhMCQ04xJTAjBgNVBAoMHFRydXN0QXNpYSBUZWNobm9sb2dp +ZXMsIEluYy4xJDAiBgNVBAMMG1RydXN0QXNpYSBHbG9iYWwgUm9vdCBDQSBHMzAe +Fw0yMTA1MjAwMjEwMTlaFw00NjA1MTkwMjEwMTlaMFoxCzAJBgNVBAYTAkNOMSUw +IwYDVQQKDBxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSQwIgYDVQQDDBtU +cnVzdEFzaWEgR2xvYmFsIFJvb3QgQ0EgRzMwggIiMA0GCSqGSIb3DQEBAQUAA4IC +DwAwggIKAoICAQDAMYJhkuSUGwoqZdC+BqmHO1ES6nBBruL7dOoKjbmzTNyPtxNS +T1QY4SxzlZHFZjtqz6xjbYdT8PfxObegQ2OwxANdV6nnRM7EoYNl9lA+sX4WuDqK +AtCWHwDNBSHvBm3dIZwZQ0WhxeiAysKtQGIXBsaqvPPW5vxQfmZCHzyLpnl5hkA1 +nyDvP+uLRx+PjsXUjrYsyUQE49RDdT/VP68czH5GX6zfZBCK70bwkPAPLfSIC7Ep +qq+FqklYqL9joDiR5rPmd2jE+SoZhLsO4fWvieylL1AgdB4SQXMeJNnKziyhWTXA +yB1GJ2Faj/lN03J5Zh6fFZAhLf3ti1ZwA0pJPn9pMRJpxx5cynoTi+jm9WAPzJMs +hH/x/Gr8m0ed262IPfN2dTPXS6TIi/n1Q1hPy8gDVI+lhXgEGvNz8teHHUGf59gX +zhqcD0r83ERoVGjiQTz+LISGNzzNPy+i2+f3VANfWdP3kXjHi3dqFuVJhZBFcnAv +kV34PmVACxmZySYgWmjBNb9Pp1Hx2BErW+Canig7CjoKH8GB5S7wprlppYiU5msT +f9FkPz2ccEblooV7WIQn3MSAPmeamseaMQ4w7OYXQJXZRe0Blqq/DPNL0WP3E1jA +uPP6Z92bfW1K/zJMtSU7/xxnD4UiWQWRkUF3gdCFTIcQcf+eQxuulXUtgQIDAQAB +o2MwYTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFEDk5PIj7zjKsK5Xf/Ih +MBY027ySMB0GA1UdDgQWBBRA5OTyI+84yrCuV3/yITAWNNu8kjAOBgNVHQ8BAf8E +BAMCAQYwDQYJKoZIhvcNAQEMBQADggIBACY7UeFNOPMyGLS0XuFlXsSUT9SnYaP4 +wM8zAQLpw6o1D/GUE3d3NZ4tVlFEbuHGLige/9rsR82XRBf34EzC4Xx8MnpmyFq2 +XFNFV1pF1AWZLy4jVe5jaN/TG3inEpQGAHUNcoTpLrxaatXeL1nHo+zSh2bbt1S1 +JKv0Q3jbSwTEb93mPmY+KfJLaHEih6D4sTNjduMNhXJEIlU/HHzp/LgV6FL6qj6j +ITk1dImmasI5+njPtqzn59ZW/yOSLlALqbUHM/Q4X6RJpstlcHboCoWASzY9M/eV +VHUl2qzEc4Jl6VL1XP04lQJqaTDFHApXB64ipCz5xUG3uOyfT0gA+QEEVcys+TIx +xHWVBqB/0Y0n3bOppHKH/lmLmnp0Ft0WpWIp6zqW3IunaFnT63eROfjXy9mPX1on +AX1daBli2MjN9LdyR75bl87yraKZk62Uy5P2EgmVtqvXO9A/EcswFi55gORngS1d +7XB4tmBZrOFdRWOPyN9yaFvqHbgB8X7754qz41SgOAngPN5C8sLtLpvzHzW2Ntjj +gKGLzZlkD8Kqq7HK9W+eQ42EVJmzbsASZthwEPEGNTNDqJwuuhQxzhB/HIbjj9LV ++Hfsm6vxL2PZQl/gZ4FkkfGXL/xuJvYz+NO1+MRiqzFRJQJ6+N1rZdVtTTDIZbpo *** 82 LINES SKIPPED *** From nobody Tue Feb 13 19:15:27 2024 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 4TZ9yR529Mz59Y2L; Tue, 13 Feb 2024 19:15:27 +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 4TZ9yR1vZFz4Fdj; Tue, 13 Feb 2024 19:15:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707851727; 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=G9GOff3dP3ZpDgzx3uoAXaS8oTQeVqT2UkhsceNCSsw=; b=fig8sKWSmAx3ARof5sADeDwBrilEKHJoFYv2Dwdiu7KklgCVOWTWVIWfOURbRI1Fw4yRg+ arzNyAx1TZmJKurn3s+y+C+Ytcr7Pm4zMLjVO3HeTwSPhGvXabdNBhzzwsYf2Uq9hbTH0i VjmSyc1cusFLqv5vQqofx69r3EDeE0jjQy0wyXPKMUefDWU9rULys2FIMynjcslmMQjBIY IT5vzaOS5qjCx6U1+k9mttFd3Pf901/hKlpbklp7bRx5RO8z11MfEbA7hW0v3yQANRU4nV hQEEE6hok4Eb1VHf/7ov4fDb3UemE6wFgtnwCSI1fL1gOqdXlPd13eitJ/ZWqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707851727; a=rsa-sha256; cv=none; b=BnQAVrwkZDwF1XT3BiyYuqvk8MeCGBvT1Uvk+fkwsudqTeVMzCHtyPA5tAY+qW7SH3vSNb zEZkIq7RdCOIyfJ1x7RrKqqTyHEeFiLR+LjlzTaeWIk1fBhId9H7P+6J6Dbc4PfwzRltA1 tHpgiK0Zy6kD85rPab77Dbdibw+COA+UIFknh+K1LxXk+0w83DKEVa2HMGovYXBfLzvmO8 /CiXuQJ0m0UVm7yRLJEGOQ2bGyrZTCnXUzyfy0M3zk8Ev0cmpyifHzlBmJslEj8PpPVAxO Vr/07/Tbf/vjJrID6u7v6L8cMZd+7RBqnbPH0TWReOjmY/YbVyUwHuGgBepJWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707851727; 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=G9GOff3dP3ZpDgzx3uoAXaS8oTQeVqT2UkhsceNCSsw=; b=C7X/IoI6nF/5IQZMioXn/UuH96jVRL+77RTds6aQwbqBDXKfypwPoXGxFoCEpUA5J7iTZ2 Fyt8Bl53dupwZqeBbFjcTSwkJAjCx6qVbs3A9THX6r8HmZfOOkVjSwBNpzwj2rUq1gcCZK ADcBUAEaZI/PQdGjYMW4BXZHD24atNIpXdngI4AQbKOhU5FrR7MPeRsfiXvTzW1Zek3bGu aMfRBTr95MbeLog1N8BWxjallOq+bdPDCJM7TEN9Uf7LTS2iL9E54XlgvY27HBRXQ+SB5G xOD/4aJuQOeatv+Lv/Ugv07BuPnK+CKAlk2b2EMJ7RAIHVAkqRN8bxCJVfXFZw== 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 4TZ9yR10GwzRmD; Tue, 13 Feb 2024 19:15:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41DJFRDP090422; Tue, 13 Feb 2024 19:15:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DJFReb090419; Tue, 13 Feb 2024 19:15:27 GMT (envelope-from git) Date: Tue, 13 Feb 2024 19:15:27 GMT Message-Id: <202402131915.41DJFReb090419@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 9b7611d9c7b4 - stable/13 - caroot: routine update 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9b7611d9c7b48e68f017c43ec67d4182a4bc11c4 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=9b7611d9c7b48e68f017c43ec67d4182a4bc11c4 commit 9b7611d9c7b48e68f017c43ec67d4182a4bc11c4 Author: Kyle Evans AuthorDate: 2024-02-11 06:33:12 +0000 Commit: Kyle Evans CommitDate: 2024-02-13 19:15:13 +0000 caroot: routine update Changes: - One (1) modified - Eight (8) added - One (1) expired, now untrusted MFC after: 3 days (cherry picked from commit 0d3b2bdbf719ac6b5719a47387558ca9c34a4b2c) --- ObsoleteFiles.inc | 3 + .../Security_Communication_Root_CA.pem | 0 ...ertificacion_Firmaprofesional_CIF_A62634068.pem | 118 +++++++++--------- .../trusted/CommScope_Public_Trust_ECC_Root-01.pem | 67 ++++++++++ .../trusted/CommScope_Public_Trust_ECC_Root-02.pem | 67 ++++++++++ .../trusted/CommScope_Public_Trust_RSA_Root-01.pem | 134 ++++++++++++++++++++ .../trusted/CommScope_Public_Trust_RSA_Root-02.pem | 134 ++++++++++++++++++++ .../trusted/Telekom_Security_TLS_ECC_Root_2020.pem | 68 ++++++++++ .../trusted/Telekom_Security_TLS_RSA_Root_2023.pem | 138 +++++++++++++++++++++ .../caroot/trusted/TrustAsia_Global_Root_CA_G3.pem | 138 +++++++++++++++++++++ .../caroot/trusted/TrustAsia_Global_Root_CA_G4.pem | 70 +++++++++++ 11 files changed, 878 insertions(+), 59 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 73435961164c..9e1006e21e51 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20240213: caroot bundle updated +OLD_FILES+=usr/share/certs/trusted/Security_Communication_Root_CA.pem + # 20240112: replaced NetBSD tests for uniq with our own OLD_FILES+=usr/tests/usr.bin/uniq/d_basic.in OLD_FILES+=usr/tests/usr.bin/uniq/d_basic.out diff --git a/secure/caroot/trusted/Security_Communication_Root_CA.pem b/secure/caroot/blacklisted/Security_Communication_Root_CA.pem similarity index 100% rename from secure/caroot/trusted/Security_Communication_Root_CA.pem rename to secure/caroot/blacklisted/Security_Communication_Root_CA.pem diff --git a/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem b/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem index 7eeb715ac674..ceae80a3e6d8 100644 --- a/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem +++ b/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem @@ -14,12 +14,12 @@ Certificate: Data: Version: 3 (0x2) - Serial Number: 6047274297262753887 (0x53ec3beefbb2485f) - Signature Algorithm: sha1WithRSAEncryption + Serial Number: 1977337328857672817 (0x1b70e9d2ffae6c71) + Signature Algorithm: sha256WithRSAEncryption Issuer: C = ES, CN = Autoridad de Certificacion Firmaprofesional CIF A62634068 Validity - Not Before: May 20 08:38:15 2009 GMT - Not After : Dec 31 08:38:15 2030 GMT + Not Before: Sep 23 15:22:07 2014 GMT + Not After : May 5 15:22:07 2036 GMT Subject: C = ES, CN = Autoridad de Certificacion Firmaprofesional CIF A62634068 Subject Public Key Info: Public Key Algorithm: rsaEncryption @@ -62,54 +62,54 @@ Certificate: 92:30:bb Exponent: 65537 (0x10001) X509v3 extensions: - X509v3 Basic Constraints: critical - CA:TRUE, pathlen:1 - X509v3 Key Usage: critical - Certificate Sign, CRL Sign X509v3 Subject Key Identifier: 65:CD:EB:AB:35:1E:00:3E:7E:D5:74:C0:1C:B4:73:47:0E:1A:64:2F + X509v3 Basic Constraints: critical + CA:TRUE, pathlen:1 X509v3 Certificate Policies: Policy: X509v3 Any Policy CPS: http://www.firmaprofesional.com/cps User Notice: Explicit Text: - Signature Algorithm: sha1WithRSAEncryption + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + Signature Algorithm: sha256WithRSAEncryption Signature Value: - 17:7d:a0:f9:b4:dd:c5:c5:eb:ad:4b:24:b5:a1:02:ab:dd:a5: - 88:4a:b2:0f:55:4b:2b:57:8c:3b:e5:31:dd:fe:c4:32:f1:e7: - 5b:64:96:36:32:18:ec:a5:32:77:d7:e3:44:b6:c0:11:2a:80: - b9:3d:6a:6e:7c:9b:d3:ad:fc:c3:d6:a3:e6:64:29:7c:d1:e1: - 38:1e:82:2b:ff:27:65:af:fb:16:15:c4:2e:71:84:e5:b5:ff: - fa:a4:47:bd:64:32:bb:f6:25:84:a2:27:42:f5:20:b0:c2:13: - 10:11:cd:10:15:ba:42:90:2a:d2:44:e1:96:26:eb:31:48:12: - fd:2a:da:c9:06:cf:74:1e:a9:4b:d5:87:28:f9:79:34:92:3e: - 2e:44:e8:f6:8f:4f:8f:35:3f:25:b3:39:dc:63:2a:90:6b:20: - 5f:c4:52:12:4e:97:2c:2a:ac:9d:97:de:48:f2:a3:66:db:c2: - d2:83:95:a6:66:a7:9e:25:0f:e9:0b:33:91:65:0a:5a:c3:d9: - 54:12:dd:af:c3:4e:0e:1f:26:5e:0d:dc:b3:8d:ec:d5:81:70: - de:d2:4f:24:05:f3:6c:4e:f5:4c:49:66:8d:d1:ff:d2:0b:25: - 41:48:fe:51:84:c6:42:af:80:04:cf:d0:7e:64:49:e4:f2:df: - a2:ec:b1:4c:c0:2a:1d:e7:b4:b1:65:a2:c4:bc:f1:98:f4:aa: - 70:07:63:b4:b8:da:3b:4c:fa:40:22:30:5b:11:a6:f0:05:0e: - c6:02:03:48:ab:86:9b:85:dd:db:dd:ea:a2:76:80:73:7d:f5: - 9c:04:c4:45:8d:e7:b9:1c:8b:9e:ea:d7:75:d1:72:b1:de:75: - 44:e7:42:7d:e2:57:6b:7d:dc:99:bc:3d:83:28:ea:80:93:8d: - c5:4c:65:c1:70:81:b8:38:fc:43:31:b2:f6:03:34:47:b2:ac: - fb:22:06:cb:1e:dd:17:47:1c:5f:66:b9:d3:1a:a2:da:11:b1: - a4:bc:23:c9:e4:be:87:ff:b9:94:b6:f8:5d:20:4a:d4:5f:e7: - bd:68:7b:65:f2:15:1e:d2:3a:a9:2d:e9:d8:6b:24:ac:97:58: - 44:47:ad:59:18:f1:21:65:70:de:ce:34:60:a8:40:f1:f3:3c: - a4:c3:28:23:8c:fe:27:33:43:40:a0:17:3c:eb:ea:3b:b0:72: - a6:a3:b9:4a:4b:5e:16:48:f4:b2:bc:c8:8c:92:c5:9d:9f:ac: - 72:36:bc:34:80:34:6b:a9:8b:92:c0:b8:17:ed:ec:76:53:f5: - 24:01:8c:b3:22:e8:4b:7c:55:c6:9d:fa:a3:14:bb:65:85:6e: - 6e:4f:12:7e:0a:3c:9d:95 -SHA1 Fingerprint=AE:C5:FB:3F:C8:E1:BF:C4:E5:4F:03:07:5A:9A:E8:00:B7:F7:B6:FA + 74:87:28:02:2b:77:1f:66:89:64:ed:8f:74:2e:46:1c:bb:a8: + f8:f8:0b:1d:83:b6:3a:a7:e8:45:8a:07:b7:e0:3e:20:cb:e1: + 08:db:13:08:f8:28:a1:35:b2:80:b3:0b:51:c0:d3:56:9a:8d: + 33:45:49:af:49:f0:e0:3d:07:7a:45:13:5a:ff:c8:97:d8:d3: + 18:2c:7d:96:f8:dd:a2:65:43:70:93:90:15:ba:90:df:e8:19: + b0:db:2c:8a:60:0f:b7:6f:94:07:1e:1d:a6:c9:85:f6:bd:34: + f8:40:78:62:10:70:3a:be:7d:4b:39:81:a9:10:d4:96:41:bb: + f8:5f:1c:0b:1d:08:f2:b1:b0:89:7a:f2:f7:a0:e0:c4:8f:8b: + 78:b5:3b:58:a5:23:8e:4f:55:fe:36:3b:e0:0c:b7:ca:2a:30: + 41:20:b4:80:cd:ae:fc:76:66:73:a8:ae:6e:e1:7c:da:03:e8: + 94:20:e6:22:a3:d0:1f:90:5d:20:53:14:26:57:da:54:97:df: + 16:44:10:01:1e:88:66:8f:72:38:93:dd:20:b7:34:be:d7:f1: + ee:63:8e:47:79:28:06:fc:f3:59:45:25:60:22:33:1b:a3:5f: + a8:ba:2a:da:1a:3d:cd:40:ea:8c:ee:05:15:95:d5:a5:2c:20: + 2f:a7:98:28:ee:45:fc:f1:b8:88:00:2c:8f:42:da:51:d5:9c: + e5:13:68:71:45:43:8b:9e:0b:21:3c:4b:5c:05:dc:1a:9f:98: + 8e:da:bd:22:9e:72:cd:ad:0a:cb:cc:a3:67:9b:28:74:c4:9b: + d7:1a:3c:04:58:a6:82:9d:ad:c7:7b:6f:ff:80:96:e9:f8:8d: + 6a:bd:18:90:1d:ff:49:1a:90:52:37:93:2f:3c:02:5d:82:76: + 0b:51:e7:16:c7:57:f8:38:f9:a7:cd:9b:22:54:ef:63:b0:15: + 6d:53:65:03:4a:5e:4a:a0:b2:a7:8e:49:00:59:38:d5:c7:f4: + 80:64:f5:6e:95:50:b8:11:7e:15:70:38:4a:b0:7f:d0:c4:32: + 70:c0:19:ff:c9:38:2d:14:2c:66:f4:42:44:e6:55:76:1b:80: + 15:57:ff:c0:a7:a7:aa:39:aa:d8:d3:70:d0:2e:ba:eb:94:6a: + fa:5f:34:86:e7:62:b5:fd:8a:f0:30:85:94:c9:af:24:02:2f: + 6f:d6:dd:67:fe:e3:b0:55:4f:04:98:4f:a4:41:56:e2:93:d0: + 6a:e8:d6:f3:fb:65:e0:ce:75:c4:31:59:0c:ee:82:c8:0c:60: + 33:4a:19:ba:84:67:27:0f:bc:42:5d:bd:24:54:0d:ec:1d:70: + 06:5f:a4:bc:fa:20:7c:55 +SHA1 Fingerprint=0B:BE:C2:27:22:49:CB:39:AA:DB:35:5C:53:E3:8C:AE:78:FF:B6:FE -----BEGIN CERTIFICATE----- -MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UE +MIIGFDCCA/ygAwIBAgIIG3Dp0v+ubHEwDQYJKoZIhvcNAQELBQAwUTELMAkGA1UE BhMCRVMxQjBABgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1h -cHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEy -MzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUg +cHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODAeFw0xNDA5MjMxNTIyMDdaFw0zNjA1 +MDUxNTIyMDdaMFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUg Q2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBBNjI2MzQwNjgwggIi MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDDUtd9 thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQM @@ -122,21 +122,21 @@ Z/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirja EbsXLZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/T KI8xWVvTyQKmtFLKbpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF 6NkBiDkal4ZkQdU7hwxu+g/GvUgUvzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVh -OSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD -VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNHDhpkLzCBpgYD -VR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp -cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBv -ACAAZABlACAAbABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBl -AGwAbwBuAGEAIAAwADgAMAAxADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF -661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx51tkljYyGOylMnfX40S2wBEqgLk9 -am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qkR71kMrv2JYSiJ0L1 -ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaPT481 -PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS -3a/DTg4fJl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5k -SeTy36LssUzAKh3ntLFlosS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF -3dvd6qJ2gHN99ZwExEWN57kci57q13XRcrHedUTnQn3iV2t93Jm8PYMo6oCTjcVM -ZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoRsaS8I8nkvof/uZS2+F0g -StRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTDKCOM/icz -Q0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQB -jLMi6Et8Vcad+qMUu2WFbm5PEn4KPJ2V +OSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMB0GA1UdDgQWBBRlzeurNR4APn7VdMAc +tHNHDhpkLzASBgNVHRMBAf8ECDAGAQH/AgEBMIGmBgNVHSAEgZ4wgZswgZgGBFUd +IAAwgY8wLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuZmlybWFwcm9mZXNpb25hbC5j +b20vY3BzMFwGCCsGAQUFBwICMFAeTgBQAGEAcwBlAG8AIABkAGUAIABsAGEAIABC +AG8AbgBhAG4AbwB2AGEAIAA0ADcAIABCAGEAcgBjAGUAbABvAG4AYQAgADAAOAAw +ADEANzAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggIBAHSHKAIrdx9m +iWTtj3QuRhy7qPj4Cx2Dtjqn6EWKB7fgPiDL4QjbEwj4KKE1soCzC1HA01aajTNF +Sa9J8OA9B3pFE1r/yJfY0xgsfZb43aJlQ3CTkBW6kN/oGbDbLIpgD7dvlAceHabJ +hfa9NPhAeGIQcDq+fUs5gakQ1JZBu/hfHAsdCPKxsIl68veg4MSPi3i1O1ilI45P +Vf42O+AMt8oqMEEgtIDNrvx2ZnOorm7hfNoD6JQg5iKj0B+QXSBTFCZX2lSX3xZE +EAEeiGaPcjiT3SC3NL7X8e5jjkd5KAb881lFJWAiMxujX6i6KtoaPc1A6ozuBRWV +1aUsIC+nmCjuRfzxuIgALI9C2lHVnOUTaHFFQ4ueCyE8S1wF3BqfmI7avSKecs2t +CsvMo2ebKHTEm9caPARYpoKdrcd7b/+Alun4jWq9GJAd/0kakFI3ky88Al2CdgtR +5xbHV/g4+afNmyJU72OwFW1TZQNKXkqgsqeOSQBZONXH9IBk9W6VULgRfhVwOEqw +f9DEMnDAGf/JOC0ULGb0QkTmVXYbgBVX/8Cnp6o5qtjTcNAuuuuUavpfNIbnYrX9 +ivAwhZTJryQCL2/W3Wf+47BVTwSYT6RBVuKT0Gro1vP7ZeDOdcQxWQzugsgMYDNK +GbqEZycPvEJdvSRUDewdcAZfpLz6IHxV -----END CERTIFICATE----- diff --git a/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-01.pem b/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-01.pem new file mode 100644 index 000000000000..41e8a409ac3c --- /dev/null +++ b/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-01.pem @@ -0,0 +1,67 @@ +## +## CommScope Public Trust ECC Root-01 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 43:70:82:77:cf:4d:5d:34:f1:ca:ae:32:2f:37:f7:f4:7f:75:a0:9e + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = US, O = CommScope, CN = CommScope Public Trust ECC Root-01 + Validity + Not Before: Apr 28 17:35:43 2021 GMT + Not After : Apr 28 17:35:42 2046 GMT + Subject: C = US, O = CommScope, CN = CommScope Public Trust ECC Root-01 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:4b:36:e9:ae:57:5e:a8:70:d7:d0:8f:74:62:77: + c3:5e:7a:aa:e5:b6:a2:f1:78:fd:02:7e:57:dd:91: + 79:9c:6c:b9:52:88:54:bc:2f:04:be:b8:cd:f6:10: + d1:29:ec:b5:d0:a0:c3:f0:89:70:19:bb:51:65:c5: + 43:9c:c3:9b:63:9d:20:83:3e:06:0b:a6:42:44:85: + 11:a7:4a:3a:2d:e9:d6:68:2f:48:4e:53:2b:07:3f: + 4d:bd:b9:ac:77:39:57 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + 8E:07:62:C0:50:DD:C6:19:06:00:46:74:04:F7:F3:AE:7D:75:4D:30 + Signature Algorithm: ecdsa-with-SHA384 + Signature Value: + 30:65:02:31:00:9c:33:df:41:e3:23:a8:42:36:26:97:35:5c: + 7b:eb:db:4b:f8:aa:8b:73:55:15:5c:ac:78:29:0f:ba:21:d8: + c4:a0:d8:d1:03:dd:6d:d1:39:3d:c4:93:60:d2:e3:72:b2:02: + 30:7c:c5:7e:88:d3:50:f5:1e:25:e8:fa:4e:75:e6:58:96:a4: + 35:5f:1b:65:ea:61:9a:70:23:b5:0d:a3:9b:92:52:6f:69:a0: + 8c:8d:4a:d0:ee:8b:0e:cb:47:8e:d0:8d:11 +SHA1 Fingerprint=07:86:C0:D8:DD:8E:C0:80:98:06:98:D0:58:7A:EF:DE:A6:CC:A2:5D +-----BEGIN CERTIFICATE----- +MIICHTCCAaOgAwIBAgIUQ3CCd89NXTTxyq4yLzf39H91oJ4wCgYIKoZIzj0EAwMw +TjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwiQ29t +bVNjb3BlIFB1YmxpYyBUcnVzdCBFQ0MgUm9vdC0wMTAeFw0yMTA0MjgxNzM1NDNa +Fw00NjA0MjgxNzM1NDJaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21tU2Nv +cGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgRUNDIFJvb3QtMDEw +djAQBgcqhkjOPQIBBgUrgQQAIgNiAARLNumuV16ocNfQj3Rid8NeeqrltqLxeP0C +flfdkXmcbLlSiFS8LwS+uM32ENEp7LXQoMPwiXAZu1FlxUOcw5tjnSCDPgYLpkJE +hRGnSjot6dZoL0hOUysHP029uax3OVejQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD +VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSOB2LAUN3GGQYARnQE9/OufXVNMDAKBggq +hkjOPQQDAwNoADBlAjEAnDPfQeMjqEI2Jpc1XHvr20v4qotzVRVcrHgpD7oh2MSg +2NED3W3ROT3Ek2DS43KyAjB8xX6I01D1HiXo+k515liWpDVfG2XqYZpwI7UNo5uS +Um9poIyNStDuiw7LR47QjRE= +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-02.pem b/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-02.pem new file mode 100644 index 000000000000..f547954704be --- /dev/null +++ b/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-02.pem @@ -0,0 +1,67 @@ +## +## CommScope Public Trust ECC Root-02 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 28:fd:99:60:41:47:a6:01:3a:ca:14:7b:1f:ef:f9:68:08:83:5d:7d + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = US, O = CommScope, CN = CommScope Public Trust ECC Root-02 + Validity + Not Before: Apr 28 17:44:54 2021 GMT + Not After : Apr 28 17:44:53 2046 GMT + Subject: C = US, O = CommScope, CN = CommScope Public Trust ECC Root-02 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:78:30:81:e8:63:1e:e5:eb:71:51:0f:f7:07:07: + ca:39:99:7c:4e:d5:0f:cc:30:30:0b:8f:66:93:3e: + cf:bd:c5:86:bd:f9:b1:b7:b4:3e:b4:07:c8:f3:96: + 31:f3:ed:a4:4f:f8:a3:4e:8d:29:15:58:b8:d5:6f: + 7f:ee:6c:22:b5:b0:af:48:45:0a:bd:a8:49:94:bf: + 84:43:b0:db:84:4a:03:23:19:67:6a:6f:c1:6e:bc: + 06:39:37:d1:88:22:f7 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + E6:18:75:FF:EF:60:DE:84:A4:F5:46:C7:DE:4A:55:E3:32:36:79:F5 + Signature Algorithm: ecdsa-with-SHA384 + Signature Value: + 30:64:02:30:26:73:49:7a:b6:ab:e6:49:f4:7d:52:3f:d4:41: + 04:ae:80:43:83:65:75:b9:85:80:38:3b:d6:6f:e4:93:86:ab: + 8f:e7:89:c8:7f:9b:7e:6b:0a:12:55:61:aa:11:e0:79:02:30: + 77:e8:31:71:ac:3c:71:03:d6:84:26:1e:14:b8:f3:3b:3b:de: + ed:59:fc:6b:4c:30:7f:59:ce:45:e9:73:60:15:9a:4c:f0:e6: + 5e:25:22:15:6d:c2:87:59:d0:b2:8e:6a +SHA1 Fingerprint=3C:3F:EF:57:0F:FE:65:93:86:9E:A0:FE:B0:F6:ED:8E:D1:13:C7:E5 +-----BEGIN CERTIFICATE----- +MIICHDCCAaOgAwIBAgIUKP2ZYEFHpgE6yhR7H+/5aAiDXX0wCgYIKoZIzj0EAwMw +TjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwiQ29t +bVNjb3BlIFB1YmxpYyBUcnVzdCBFQ0MgUm9vdC0wMjAeFw0yMTA0MjgxNzQ0NTRa +Fw00NjA0MjgxNzQ0NTNaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21tU2Nv +cGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgRUNDIFJvb3QtMDIw +djAQBgcqhkjOPQIBBgUrgQQAIgNiAAR4MIHoYx7l63FRD/cHB8o5mXxO1Q/MMDAL +j2aTPs+9xYa9+bG3tD60B8jzljHz7aRP+KNOjSkVWLjVb3/ubCK1sK9IRQq9qEmU +v4RDsNuESgMjGWdqb8FuvAY5N9GIIvejQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD +VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTmGHX/72DehKT1RsfeSlXjMjZ59TAKBggq +hkjOPQQDAwNnADBkAjAmc0l6tqvmSfR9Uj/UQQSugEODZXW5hYA4O9Zv5JOGq4/n +ich/m35rChJVYaoR4HkCMHfoMXGsPHED1oQmHhS48zs73u1Z/GtMMH9ZzkXpc2AV +mkzw5l4lIhVtwodZ0LKOag== +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-01.pem b/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-01.pem new file mode 100644 index 000000000000..2f144760f93c --- /dev/null +++ b/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-01.pem @@ -0,0 +1,134 @@ +## +## CommScope Public Trust RSA Root-01 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 3e:03:49:81:75:16:74:31:8e:4c:ab:d5:c5:90:29:96:c5:39:10:dd + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = US, O = CommScope, CN = CommScope Public Trust RSA Root-01 + Validity + Not Before: Apr 28 16:45:54 2021 GMT + Not After : Apr 28 16:45:53 2046 GMT + Subject: C = US, O = CommScope, CN = CommScope Public Trust RSA Root-01 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (4096 bit) + Modulus: + 00:b0:48:65:a3:0d:1d:42:e3:91:6d:9d:84:a4:61: + 96:12:c2:ed:c3:da:23:34:19:76:f6:ea:fd:55:5a: + f6:55:01:53:0f:f2:cc:8c:97:4f:b9:50:cb:b3:01: + 44:56:96:fd:9b:28:ec:7b:74:0b:e7:42:6b:55:ce: + c9:61:b2:e8:ad:40:3c:ba:b9:41:0a:05:4f:1b:26: + 85:8f:43:b5:40:b5:85:d1:d4:71:dc:83:41:f3:f6: + 45:c7:80:a2:84:50:97:46:ce:a0:0c:c4:60:56:04: + 1d:07:5b:46:a5:0e:b2:4b:a4:0e:a5:7c:ee:f8:d4: + 62:03:b9:93:6a:8a:14:b8:70:f8:2e:82:46:38:23: + 0e:74:c7:6b:41:b7:d0:29:a3:9d:80:b0:7e:77:93: + 63:42:fb:34:83:3b:73:a3:5a:21:36:eb:47:fa:18: + 17:d9:ba:66:c2:93:a4:8f:fc:5d:a4:ad:fc:50:6a: + 95:ac:bc:24:33:d1:bd:88:7f:86:f5:f5:b2:73:2a: + 8f:7c:af:08:f2:1a:98:3f:a9:81:65:3f:c1:8c:89: + c5:96:30:9a:0a:cf:f4:d4:c8:34:ed:9d:2f:bc:8d: + 38:86:53:ee:97:9f:a9:b2:63:94:17:8d:0f:dc:66: + 2a:7c:52:51:75:cb:99:8e:e8:3d:5c:bf:9e:3b:28: + 8d:83:02:0f:a9:9f:72:e2:2c:2b:b3:dc:66:97:00: + 40:d0:a4:54:8e:9b:5d:7b:45:36:26:d6:72:43:eb: + cf:c0:ea:0d:dc:ce:12:e6:7d:38:9f:05:27:a8:97: + 3e:e9:51:c6:6c:05:28:c1:02:0f:e9:18:6d:ec:bd: + 9c:06:d4:a7:49:f4:54:05:6b:6c:30:f1:eb:03:d5: + ea:3d:6a:76:c2:cb:1a:28:49:4d:7f:64:e0:fa:2b: + da:73:83:81:ff:91:03:bd:94:bb:e4:b8:8e:9c:32: + 63:cd:9f:bb:68:81:b1:84:5b:af:36:bf:77:ee:1d: + 7f:f7:49:9b:52:ec:d2:77:5a:7d:91:9d:4d:c2:39: + 2d:e4:ba:82:f8:6f:f2:4e:1e:0f:4e:e6:3f:59:a5: + 23:dc:3d:87:a8:28:58:28:d1:f1:1b:36:db:4f:c4: + ff:e1:8c:5b:72:8c:c7:26:03:27:a3:39:0a:01:aa: + c0:b2:31:60:83:22:a1:4f:12:09:01:11:af:34:d4: + cf:d7:ae:62:d3:05:07:b4:31:75:e0:0d:6d:57:4f: + 69:87:f9:57:a9:ba:15:f6:c8:52:6d:a1:cb:9c:1f: + e5:fc:78:a8:35:9a:9f:41:14:ce:a5:b4:ce:94:08: + 1c:09:ad:56:e5:da:b6:49:9a:4a:ea:63:18:53:9c: + 2c:2e:c3 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + 37:5D:A6:9A:74:32:C2:C2:F9:C7:A6:15:10:59:B8:E4:FD:E5:B8:6D + Signature Algorithm: sha256WithRSAEncryption + Signature Value: + af:a7:cf:de:ff:e0:bd:42:8d:4d:e5:22:96:df:68:ea:7d:4d: + 2a:7d:d0:ad:3d:16:5c:43:e7:7d:c0:86:e8:7a:35:63:f1:cc: + 81:c8:c6:0b:e8:2e:52:35:a4:a6:49:90:63:51:ac:34:ac:05: + 3b:57:00:e9:d3:62:d3:d9:29:d5:54:be:1c:10:91:9c:b2:6d: + fe:59:fd:79:f7:ea:56:d0:9e:68:54:42:8f:26:52:e2:4c:df: + 2f:97:a6:2f:d2:07:98:a8:f3:60:5d:4b:9a:58:57:88:ef:82: + e5:fa:af:6c:81:4b:92:8f:40:9a:93:46:59:cb:5f:78:16:b1: + 67:3e:42:0b:df:28:d9:b0:ad:98:20:be:43:7c:d1:5e:1a:09: + 17:24:8d:7b:5d:95:e9:ab:c1:60:ab:5b:18:64:80:fb:ad:e0: + 06:7d:1d:ca:59:b8:f3:78:29:67:c6:56:1d:af:b6:b5:74:2a: + 76:a1:3f:fb:75:30:9f:94:5e:3b:a5:60:f3:cb:5c:0c:e2:0e: + c9:60:f8:c9:1f:16:8a:26:dd:e7:27:7f:eb:25:a6:8a:bd:b8: + 2d:36:10:9a:b1:58:4d:9a:68:4f:60:54:e5:f6:46:13:8e:88: + ac:bc:21:42:12:ad:c6:4a:89:7d:9b:c1:d8:2d:e9:96:03:f4: + a2:74:0c:bc:00:1d:bf:d6:37:25:67:b4:72:8b:af:85:bd:ea: + 2a:03:8f:cc:fb:3c:44:24:82:e2:01:a5:0b:59:b6:34:8d:32: + 0b:12:0d:eb:27:c2:fd:41:d7:40:3c:72:46:29:c0:8c:ea:ba: + 0f:f1:06:93:2e:f7:9c:a8:f4:60:3e:a3:f1:38:5e:8e:13:c1: + b3:3a:97:87:3f:92:ca:78:a9:1c:af:d0:b0:1b:26:1e:be:70: + ec:7a:f5:33:98:ea:5c:ff:2b:0b:04:4e:43:dd:63:7e:0e:a7: + 4e:78:03:95:3e:d4:2d:30:95:11:10:28:2e:bf:a0:02:3e:ff: + 5e:59:d3:05:0e:95:5f:53:45:ef:6b:87:d5:48:cd:16:a6:96: + 83:e1:df:b3:06:f3:c1:14:db:a7:ec:1c:8b:5d:90:90:0d:72: + 51:e7:61:f9:14:ca:af:83:8f:bf:af:b1:0a:59:5d:dc:5c:d7: + e4:96:ad:5b:60:1d:da:ae:97:b2:39:d9:06:f5:76:00:13:f8: + 68:4c:21:b0:35:c4:dc:55:b2:c9:c1:41:5a:1c:89:c0:8c:6f: + 74:a0:6b:33:4d:b5:01:28:fd:ad:ad:89:17:3b:a6:9a:84:bc: + eb:8c:ea:c4:71:24:a8:ba:29:f9:08:b2:27:56:35:32:5f:ea: + 39:fb:31:9a:d5:19:cc:f0 +SHA1 Fingerprint=6D:0A:5F:F7:B4:23:06:B4:85:B3:B7:97:64:FC:AC:75:F5:33:F2:93 +-----BEGIN CERTIFICATE----- +MIIFbDCCA1SgAwIBAgIUPgNJgXUWdDGOTKvVxZAplsU5EN0wDQYJKoZIhvcNAQEL +BQAwTjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwi +Q29tbVNjb3BlIFB1YmxpYyBUcnVzdCBSU0EgUm9vdC0wMTAeFw0yMTA0MjgxNjQ1 +NTRaFw00NjA0MjgxNjQ1NTNaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21t +U2NvcGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgUlNBIFJvb3Qt +MDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwSGWjDR1C45FtnYSk +YZYSwu3D2iM0GXb26v1VWvZVAVMP8syMl0+5UMuzAURWlv2bKOx7dAvnQmtVzslh +suitQDy6uUEKBU8bJoWPQ7VAtYXR1HHcg0Hz9kXHgKKEUJdGzqAMxGBWBB0HW0al +DrJLpA6lfO741GIDuZNqihS4cPgugkY4Iw50x2tBt9Apo52AsH53k2NC+zSDO3Oj +WiE260f6GBfZumbCk6SP/F2krfxQapWsvCQz0b2If4b19bJzKo98rwjyGpg/qYFl +P8GMicWWMJoKz/TUyDTtnS+8jTiGU+6Xn6myY5QXjQ/cZip8UlF1y5mO6D1cv547 +KI2DAg+pn3LiLCuz3GaXAEDQpFSOm117RTYm1nJD68/A6g3czhLmfTifBSeolz7p +UcZsBSjBAg/pGG3svZwG1KdJ9FQFa2ww8esD1eo9anbCyxooSU1/ZOD6K9pzg4H/ +kQO9lLvkuI6cMmPNn7togbGEW682v3fuHX/3SZtS7NJ3Wn2RnU3COS3kuoL4b/JO +Hg9O5j9ZpSPcPYeoKFgo0fEbNttPxP/hjFtyjMcmAyejOQoBqsCyMWCDIqFPEgkB +Ea801M/XrmLTBQe0MXXgDW1XT2mH+VepuhX2yFJtocucH+X8eKg1mp9BFM6ltM6U +CBwJrVbl2rZJmkrqYxhTnCwuwwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G +A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUN12mmnQywsL5x6YVEFm45P3luG0wDQYJ +KoZIhvcNAQELBQADggIBAK+nz97/4L1CjU3lIpbfaOp9TSp90K09FlxD533Ahuh6 +NWPxzIHIxgvoLlI1pKZJkGNRrDSsBTtXAOnTYtPZKdVUvhwQkZyybf5Z/Xn36lbQ +nmhUQo8mUuJM3y+Xpi/SB5io82BdS5pYV4jvguX6r2yBS5KPQJqTRlnLX3gWsWc+ +QgvfKNmwrZggvkN80V4aCRckjXtdlemrwWCrWxhkgPut4AZ9HcpZuPN4KWfGVh2v +trV0KnahP/t1MJ+UXjulYPPLXAziDslg+MkfFoom3ecnf+slpoq9uC02EJqxWE2a +aE9gVOX2RhOOiKy8IUISrcZKiX2bwdgt6ZYD9KJ0DLwAHb/WNyVntHKLr4W96ioD +j8z7PEQkguIBpQtZtjSNMgsSDesnwv1B10A8ckYpwIzqug/xBpMu95yo9GA+o/E4 +Xo4TwbM6l4c/ksp4qRyv0LAbJh6+cOx69TOY6lz/KwsETkPdY34Op054A5U+1C0w +lREQKC6/oAI+/15Z0wUOlV9TRe9rh9VIzRamloPh37MG88EU26fsHItdkJANclHn +YfkUyq+Dj7+vsQpZXdxc1+SWrVtgHdqul7I52Qb1dgAT+GhMIbA1xNxVssnBQVoc +icCMb3SgazNNtQEo/a2tiRc7ppqEvOuM6sRxJKi6KfkIsidWNTJf6jn7MZrVGczw +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-02.pem b/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-02.pem new file mode 100644 index 000000000000..b343c7765878 --- /dev/null +++ b/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-02.pem @@ -0,0 +1,134 @@ +## +## CommScope Public Trust RSA Root-02 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 54:16:bf:3b:7e:39:95:71:8d:d1:aa:00:a5:86:0d:2b:8f:7a:05:4e + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = US, O = CommScope, CN = CommScope Public Trust RSA Root-02 + Validity + Not Before: Apr 28 17:16:43 2021 GMT + Not After : Apr 28 17:16:42 2046 GMT + Subject: C = US, O = CommScope, CN = CommScope Public Trust RSA Root-02 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (4096 bit) + Modulus: + 00:e1:fa:0e:fb:68:00:12:c8:4d:d5:ac:22:c4:35: + 01:3b:c5:54:e5:59:76:63:a5:7f:eb:c1:c4:6a:98: + bd:32:8d:17:80:eb:5d:ba:d1:62:3d:25:23:19:35: + 14:e9:7f:89:a7:1b:62:3c:d6:50:e7:34:95:03:32: + b1:b4:93:22:3d:a7:e2:b1:ed:e6:7b:4e:2e:87:9b: + 0d:33:75:0a:de:aa:35:e7:7e:e5:36:98:a2:ae:25: + 9e:95:b3:32:96:a4:2b:58:1e:ef:3f:fe:62:34:48: + 51:d1:b4:8d:42:ad:60:da:49:6a:95:70:dd:d2:00: + e2:cc:57:63:02:7b:96:dd:49:97:5b:92:4e:95:d3: + f9:cb:29:1f:18:4a:f8:01:2a:d2:63:09:6e:24:e9: + 89:d2:e5:c7:22:4c:dc:73:86:47:00:aa:0d:88:8e: + ae:85:7d:4a:e9:bb:33:4f:0e:52:70:9d:95:e3:7c: + 6d:96:5b:2d:3d:5f:a1:83:46:5d:b6:e3:25:b8:7c: + a7:19:80:1c:ea:65:43:dc:91:79:36:2c:74:7c:f2: + 67:06:c9:89:c9:db:bf:da:68:bf:23:ed:dc:6b:ad: + 28:83:79:2f:ec:38:a5:0d:37:01:67:27:9a:e9:33: + d9:33:5f:37:a1:c5:f0:ab:3d:fa:78:b0:e7:2c:9f: + f6:3e:9f:60:e0:ef:48:e9:90:45:1e:05:51:78:1a: + 2c:12:2c:5c:28:ac:0d:a2:23:9e:34:8f:05:e6:a2: + 33:ce:11:77:13:d4:0e:a4:1e:42:1f:86:cd:70:fe: + d9:2e:15:3d:1d:bb:b8:f2:53:57:db:cc:c6:74:29: + 9c:18:b3:36:75:38:2e:0f:54:a1:f8:92:1f:89:96: + 4f:bb:d4:ee:9d:e9:3b:36:42:b5:0a:3b:2a:d4:64: + 79:36:10:e1:f9:91:03:2b:7b:20:54:cd:0d:19:1a: + c8:41:32:34:d1:b0:99:e1:90:1e:01:40:36:b5:b7: + fa:a9:e5:77:75:a4:22:81:5d:b0:8b:e4:27:12:0f: + 54:88:c6:db:85:74:e6:b7:c0:d7:a6:29:fa:db:de: + f3:93:97:27:04:55:2f:0a:6f:37:c5:3d:13:af:0a: + 00:a9:2c:8b:1c:81:28:d7:ef:86:31:a9:ae:f2:6e: + b8:ca:6a:2c:54:47:d8:2a:88:2e:af:c1:07:10:78: + ac:11:a2:2f:42:f0:37:c5:f2:b8:56:dd:0e:62:2d: + ce:2d:56:7e:55:f2:a7:44:f6:2b:32:f4:23:a8:47: + e8:d4:2a:01:78:cf:6a:c3:37:a8:9e:65:d2:2c:e5: + fa:ba:33:c1:06:44:f6:e6:cf:a5:0d:a7:66:08:34: + 8a:2c:f3 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + 47:D0:E7:B1:22:FF:9D:2C:F5:D9:57:60:B3:B1:B1:70:95:EF:61:7A + Signature Algorithm: sha256WithRSAEncryption + Signature Value: + 86:69:b1:4d:2f:e9:9f:4f:22:93:68:8e:e4:21:99:a3:ce:45: + 53:1b:73:44:53:00:81:61:cd:31:e3:08:ba:81:28:28:7a:92: + b9:b6:a8:c8:43:9e:c7:13:26:4d:c2:d8:e5:55:9c:92:5d:50: + d8:c2:2b:db:fe:e6:a8:97:cf:52:3a:24:c3:65:64:5c:47:31: + a3:65:35:13:c3:93:b9:f7:f9:51:97:bb:a4:f0:62:87:c5:d6: + 06:d3:97:83:20:a9:7e:bb:b6:21:c2:a5:0d:84:00:e1:f2:27: + 10:83:ba:dd:03:81:d5:dd:68:c3:66:10:c8:d1:76:b4:b3:6f: + 29:9e:00:f9:c2:29:f5:b1:93:19:52:69:1a:2c:4c:a0:8b:e0: + 15:9a:31:2f:d3:88:95:59:6e:e5:c4:b3:50:c8:14:08:4a:9b: + 8b:13:83:b1:a4:72:b2:3b:76:33:41:dc:dc:aa:a6:07:6f:1d: + 24:12:9f:c8:76:bd:2f:d9:8e:f4:2c:ee:b7:d2:38:10:24:36: + 51:2f:e3:5c:5d:81:21:a7:da:bb:4e:ff:e6:07:a8:fe:b9:0d: + 27:6c:bb:70:5a:55:7a:13:e9:f1:2a:49:69:c7:5f:87:57:4c: + 43:79:6d:3a:65:e9:30:5c:41:ee:eb:77:a5:73:12:88:e8:bf: + 7d:ae:e5:c4:a8:1f:0d:8e:1c:6d:50:02:4f:26:18:43:de:8f: + 55:85:b1:0b:37:05:60:c9:55:39:12:04:a1:2a:cf:71:16:9f: + 36:51:49:bf:70:3b:9e:67:9c:fb:7b:79:c9:39:1c:78:ac:77: + 91:54:9a:b8:75:0a:81:52:97:e3:66:61:6b:ed:3e:38:1e:96: + 61:55:e1:91:54:8c:ed:8c:24:1f:81:c9:10:9a:73:99:2b:16: + 4e:72:00:3f:54:1b:f8:8d:ba:8b:e7:14:d6:b6:45:4f:60:ec: + 96:ae:c3:2f:02:4e:5d:9d:96:49:72:00:b2:ab:75:5c:0f:68: + 5b:1d:65:c2:5f:33:0f:1e:0f:f0:3b:86:f5:b0:4e:bb:9c:f7: + ea:25:05:dc:ad:a2:9b:4b:17:01:be:42:df:35:21:1d:ad:ab: + ae:f4:bf:ae:1f:1b:d3:e2:3b:fc:b3:72:73:1c:9b:28:90:89: + 13:3d:1d:c1:00:47:09:96:9a:38:1b:dd:b1:cf:0d:c2:b4:44: + f3:96:95:ce:32:3a:8f:34:9c:e0:17:c7:5e:ce:ae:0d:db:87: + 38:e5:3f:5b:fd:9b:19:e1:31:41:7a:70:aa:23:6b:01:e1:45: + 4c:cd:94:ce:3b:9e:2d:e7:88:02:22:f4:6e:e8:c8:ec:d6:3c: + f3:b9:b2:d7:77:7a:ac:7b +SHA1 Fingerprint=EA:B0:E2:52:1B:89:93:4C:11:68:F2:D8:9A:AC:22:4C:A3:8A:57:AE +-----BEGIN CERTIFICATE----- +MIIFbDCCA1SgAwIBAgIUVBa/O345lXGN0aoApYYNK496BU4wDQYJKoZIhvcNAQEL +BQAwTjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwi +Q29tbVNjb3BlIFB1YmxpYyBUcnVzdCBSU0EgUm9vdC0wMjAeFw0yMTA0MjgxNzE2 +NDNaFw00NjA0MjgxNzE2NDJaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21t +U2NvcGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgUlNBIFJvb3Qt +MDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDh+g77aAASyE3VrCLE +NQE7xVTlWXZjpX/rwcRqmL0yjReA61260WI9JSMZNRTpf4mnG2I81lDnNJUDMrG0 +kyI9p+Kx7eZ7Ti6Hmw0zdQreqjXnfuU2mKKuJZ6VszKWpCtYHu8//mI0SFHRtI1C +rWDaSWqVcN3SAOLMV2MCe5bdSZdbkk6V0/nLKR8YSvgBKtJjCW4k6YnS5cciTNxz +hkcAqg2Ijq6FfUrpuzNPDlJwnZXjfG2WWy09X6GDRl224yW4fKcZgBzqZUPckXk2 +LHR88mcGyYnJ27/aaL8j7dxrrSiDeS/sOKUNNwFnJ5rpM9kzXzehxfCrPfp4sOcs +n/Y+n2Dg70jpkEUeBVF4GiwSLFworA2iI540jwXmojPOEXcT1A6kHkIfhs1w/tku +FT0du7jyU1fbzMZ0KZwYszZ1OC4PVKH4kh+Jlk+71O6d6Ts2QrUKOyrUZHk2EOH5 +kQMreyBUzQ0ZGshBMjTRsJnhkB4BQDa1t/qp5Xd1pCKBXbCL5CcSD1SIxtuFdOa3 +wNemKfrb3vOTlycEVS8KbzfFPROvCgCpLIscgSjX74Yxqa7ybrjKaixUR9gqiC6v +wQcQeKwRoi9C8DfF8rhW3Q5iLc4tVn5V8qdE9isy9COoR+jUKgF4z2rDN6ieZdIs +5fq6M8EGRPbmz6UNp2YINIos8wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G +A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUR9DnsSL/nSz12Vdgs7GxcJXvYXowDQYJ +KoZIhvcNAQELBQADggIBAIZpsU0v6Z9PIpNojuQhmaPORVMbc0RTAIFhzTHjCLqB +KCh6krm2qMhDnscTJk3C2OVVnJJdUNjCK9v+5qiXz1I6JMNlZFxHMaNlNRPDk7n3 ++VGXu6TwYofF1gbTl4MgqX67tiHCpQ2EAOHyJxCDut0DgdXdaMNmEMjRdrSzbyme +APnCKfWxkxlSaRosTKCL4BWaMS/TiJVZbuXEs1DIFAhKm4sTg7GkcrI7djNB3Nyq +pgdvHSQSn8h2vS/ZjvQs7rfSOBAkNlEv41xdgSGn2rtO/+YHqP65DSdsu3BaVXoT +6fEqSWnHX4dXTEN5bTpl6TBcQe7rd6VzEojov32u5cSoHw2OHG1QAk8mGEPej1WF +sQs3BWDJVTkSBKEqz3EWnzZRSb9wO55nnPt7eck5HHisd5FUmrh1CoFSl+NmYWvt +PjgelmFV4ZFUjO2MJB+ByRCac5krFk5yAD9UG/iNuovnFNa2RU9g7Jauwy8CTl2d +lklyALKrdVwPaFsdZcJfMw8eD/A7hvWwTruc9+olBdytoptLFwG+Qt81IR2tq670 +v64fG9PiO/yzcnMcmyiQiRM9HcEARwmWmjgb3bHPDcK0RPOWlc4yOo80nOAXx17O +rg3bhzjlP1v9mxnhMUF6cKojawHhRUzNlM47ni3niAIi9G7oyOzWPPO5std3eqx7 +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/Telekom_Security_TLS_ECC_Root_2020.pem b/secure/caroot/trusted/Telekom_Security_TLS_ECC_Root_2020.pem new file mode 100644 index 000000000000..da5285d26633 --- /dev/null +++ b/secure/caroot/trusted/Telekom_Security_TLS_ECC_Root_2020.pem @@ -0,0 +1,68 @@ +## +## Telekom Security TLS ECC Root 2020 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 36:3a:96:8c:c9:5c:b2:58:cd:d0:01:5d:c5:e5:57:00 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = DE, O = Deutsche Telekom Security GmbH, CN = Telekom Security TLS ECC Root 2020 + Validity + Not Before: Aug 25 07:48:20 2020 GMT + Not After : Aug 25 23:59:59 2045 GMT + Subject: C = DE, O = Deutsche Telekom Security GmbH, CN = Telekom Security TLS ECC Root 2020 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:ce:bf:fe:57:a8:bf:d5:aa:f7:10:9a:cd:bc:d1: + 11:a2:bd:67:42:cc:90:eb:15:18:90:d9:a2:cd:0c: + 2a:25:eb:3e:4f:ce:b5:d2:8f:0f:f3:35:da:43:8b: + 02:80:be:6f:51:24:1d:0f:6b:2b:ca:9f:c2:6f:50: + 32:e5:37:20:b6:20:ff:88:0d:0f:6d:49:bb:db:06: + a4:87:90:92:94:f4:09:d0:cf:7f:c8:80:0b:c1:97: + b3:bb:35:27:c9:c2:1b + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Subject Key Identifier: + E3:72:CC:6E:95:99:47:B1:E6:B3:61:4C:D1:CB:AB:E3:BA:CD:DE:9F + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + Signature Algorithm: ecdsa-with-SHA384 + Signature Value: + 30:64:02:30:75:52:8b:b7:a4:10:4f:ae:4a:10:8b:b2:84:5b: + 42:e1:e6:2a:36:02:da:a0:6e:19:3f:25:bf:da:59:32:8e:e4: + fb:90:dc:93:64:ce:ad:b4:41:47:60:e2:cf:a7:cb:1e:02:30: + 37:41:8c:66:df:41:6b:d6:83:00:41:fd:2f:5a:f7:50:b4:67: + d1:2c:a8:71:d7:43:ca:9c:27:24:91:83:48:0d:cf:cd:f7:54: + 81:af:ec:7f:e4:67:db:b8:90:ee:dd:25 +SHA1 Fingerprint=C0:F8:96:C5:A9:3B:01:06:21:07:DA:18:42:48:BC:E9:9D:88:D5:EC +-----BEGIN CERTIFICATE----- +MIICQjCCAcmgAwIBAgIQNjqWjMlcsljN0AFdxeVXADAKBggqhkjOPQQDAzBjMQsw +CQYDVQQGEwJERTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0eSBH +bWJIMSswKQYDVQQDDCJUZWxla29tIFNlY3VyaXR5IFRMUyBFQ0MgUm9vdCAyMDIw +MB4XDTIwMDgyNTA3NDgyMFoXDTQ1MDgyNTIzNTk1OVowYzELMAkGA1UEBhMCREUx +JzAlBgNVBAoMHkRldXRzY2hlIFRlbGVrb20gU2VjdXJpdHkgR21iSDErMCkGA1UE +AwwiVGVsZWtvbSBTZWN1cml0eSBUTFMgRUNDIFJvb3QgMjAyMDB2MBAGByqGSM49 +AgEGBSuBBAAiA2IABM6//leov9Wq9xCazbzREaK9Z0LMkOsVGJDZos0MKiXrPk/O +tdKPD/M12kOLAoC+b1EkHQ9rK8qfwm9QMuU3ILYg/4gND21Ju9sGpIeQkpT0CdDP +f8iAC8GXs7s1J8nCG6NCMEAwHQYDVR0OBBYEFONyzG6VmUex5rNhTNHLq+O6zd6f +MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMAoGCCqGSM49BAMDA2cA +MGQCMHVSi7ekEE+uShCLsoRbQuHmKjYC2qBuGT8lv9pZMo7k+5Dck2TOrbRBR2Di +z6fLHgIwN0GMZt9Ba9aDAEH9L1r3ULRn0SyocddDypwnJJGDSA3PzfdUga/sf+Rn +27iQ7t0l +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/Telekom_Security_TLS_RSA_Root_2023.pem b/secure/caroot/trusted/Telekom_Security_TLS_RSA_Root_2023.pem new file mode 100644 index 000000000000..69bbcdd0e322 --- /dev/null +++ b/secure/caroot/trusted/Telekom_Security_TLS_RSA_Root_2023.pem @@ -0,0 +1,138 @@ +## +## Telekom Security TLS RSA Root 2023 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 21:9c:54:2d:e8:f6:ec:71:77:fa:4e:e8:c3:70:57:97 + Signature Algorithm: sha384WithRSAEncryption + Issuer: C = DE, O = Deutsche Telekom Security GmbH, CN = Telekom Security TLS RSA Root 2023 + Validity + Not Before: Mar 28 12:16:45 2023 GMT + Not After : Mar 27 23:59:59 2048 GMT + Subject: C = DE, O = Deutsche Telekom Security GmbH, CN = Telekom Security TLS RSA Root 2023 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (4096 bit) + Modulus: + 00:ed:35:a1:81:80:f3:cb:4a:69:5b:c2:fb:51:83: + ae:26:fd:e1:6e:f3:81:12:7d:71:40:ff:87:75:42: + 29:21:ed:81:52:2c:df:12:c1:19:84:89:c1:bd:c5: + 28:d5:d5:4b:6c:44:d6:4c:db:07:96:4a:55:7a:ca: + 36:82:04:36:a8:a5:fc:27:f6:49:f1:d5:72:9e:91: + f9:23:d6:70:7b:bb:f5:9b:c1:ec:93:cf:19:ea:65: + 7e:88:70:a0:73:fc:f6:ff:b5:56:62:e1:73:6a:34: + 98:3e:82:b8:ac:95:53:f4:01:a0:27:07:72:a3:00: + 53:a0:e4:b2:ab:83:38:57:33:25:94:9f:be:48:1d: + 98:e1:a3:ba:9e:5c:cd:04:71:51:7d:75:78:ab:f3: + 59:aa:c4:e0:60:be:8f:83:52:b8:75:1a:41:35:ed: + bc:f3:3a:63:e9:a9:14:45:d7:e6:52:d1:6e:d2:de: + bc:e3:f5:0b:3b:e6:e0:c4:bd:43:64:13:a6:ce:f4: + 98:37:6c:8a:95:a8:97:c8:47:0f:f0:5e:10:8b:e7: + 1d:1c:fe:b1:3b:a0:05:33:68:05:41:82:c1:03:2b: + 01:c8:e7:8f:4d:ab:e8:b5:f6:cd:6b:44:b5:e7:dd: + 8b:ec:ea:25:b4:00:22:57:4d:b0:b1:b2:31:c1:16: + ce:ff:fd:14:84:b7:47:fa:b2:f1:70:de:db:8b:6c: + 36:58:a4:7c:b3:11:d1:c3:77:7f:5f:b6:25:e0:0d: + c5:d2:b3:f9:b8:b8:77:db:37:71:71:47:e3:60:18: + 4f:24:b6:75:37:78:b9:a3:62:af:bd:c9:72:8e:2f: + cc:bb:ae:db:e4:15:52:19:07:33:fb:6a:b7:2d:4b: + 90:28:82:73:fe:18:8b:35:8d:db:a7:04:6a:be:ea: + c1:4d:36:3b:16:36:91:32:ef:b6:40:89:91:43:e0: + f2:a2:ab:04:2e:e6:f2:4c:0e:16:34:20:ac:87:c1: + 2d:7e:c9:66:47:17:14:11:a4:f3:f7:a1:24:89:ab: + d8:1a:c8:a1:5c:b1:a3:f7:8c:6d:c8:01:c9:4f:c9: + ec:c4:fc:ac:51:33:d1:c8:83:d1:c9:9f:1d:d4:47: + 34:29:3e:cb:b0:0e:fa:83:0b:28:58:e5:29:dc:3f: + 7c:a8:9f:c9:b6:0a:bb:a6:e8:46:16:0f:96:e5:7b: + e4:6a:7a:48:6d:76:98:05:a5:dc:6d:1e:42:1e:42: + da:1a:e0:52:f7:b5:83:c0:1a:7b:78:35:2c:38:f5: + 1f:fd:49:a3:2e:d2:59:63:bf:80:b0:8c:93:73:cb: + 35:a6:99:95:22:61:65:03:60:fb:2f:93:4b:fa:9a: + 9c:80:3b + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + B6:A7:97:82:3D:74:85:9B:F7:3C:9F:93:9A:95:79:75:52:8C:6D:47 + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Authority Key Identifier: + B6:A7:97:82:3D:74:85:9B:F7:3C:9F:93:9A:95:79:75:52:8C:6D:47 + Signature Algorithm: sha384WithRSAEncryption + Signature Value: + a8:cc:61:a6:be:75:9e:15:50:a4:6b:fb:a8:70:45:7c:ba:7e: + b1:5a:fc:5b:23:fa:0a:77:f8:98:71:82:0c:6d:e0:5e:46:aa: + 93:f4:1e:a0:c3:e1:93:db:4b:ad:b2:a6:5d:ab:b0:d4:62:cb: + 5e:bb:66:f5:2d:ee:97:40:3c:62:eb:5e:d6:14:d6:8c:e2:96: + 8b:41:69:93:35:e6:b9:99:6b:62:b4:a1:17:66:34:a6:6b:63: + c6:b9:4e:f2:22:e9:58:0d:56:41:d1:fa:0c:4a:f0:33:cd:3b: + bb:6d:21:3a:ae:8e:72:b5:c3:4a:fb:e9:7d:e5:b1:9b:86:ee: + e2:e0:7d:b4:f7:32:fd:22:84:f1:85:c9:37:79:e9:b5:3f:bf: + 5c:e4:74:b2:8f:11:62:00:dd:18:66:a1:d9:7b:23:5f:f1:8e: + d5:67:e8:54:da:5b:3a:6b:36:6f:f9:81:b1:33:47:33:77:40: + f9:52:aa:dd:d4:83:cf:85:78:99:9a:93:b9:73:67:42:46:11: + 21:ea:fe:0a:a9:1b:1a:65:69:b3:8f:ae:16:b6:f6:4b:56:b2: + 2d:f9:a5:c8:ec:3b:62:a3:ed:6b:d0:4e:d5:40:09:a4:1f:98: + d7:3a:a5:92:59:20:e4:b0:7d:cd:5b:73:68:bd:6d:c4:a2:13: + 0e:67:19:b8:8d:42:7e:6c:0c:9a:6e:a0:24:2d:d5:45:1b:dc: + c4:02:14:fe:85:5b:65:97:ca:4e:90:50:08:7a:42:35:f9:ea: + c2:66:d4:f8:01:ae:1e:b4:be:c3:a8:ef:fe:76:9a:a2:a6:1f: + 46:f6:84:ed:fc:db:ce:c4:02:ce:77:48:2c:8c:b2:ec:c3:00: + a3:ec:2c:55:18:c1:7e:19:ee:e1:2f:f2:ad:83:9b:9e:ab:19: + df:c6:8a:2f:8c:77:e5:b7:05:ec:3b:c1:ec:be:86:b3:86:bc: + c0:f7:dc:e7:ea:5b:ae:b2:cc:b5:35:86:4b:d0:e2:3f:b6:d8: + f8:0e:00:ee:5d:e3:f7:8d:58:ff:cf:8b:37:e9:63:5f:6e:f7: + 09:71:36:c2:12:5d:57:f2:c8:b4:cd:f3:ee:02:df:11:dc:6a: + b9:57:84:1d:59:4d:8c:ce:c8:0e:23:c2:b7:26:9a:10:14:71: + fe:93:b2:8a:b8:80:f0:0e:10:9e:d3:a8:50:0c:37:82:2f:ea: + e0:8a:9d:e1:2c:39:ff:b5:b4:73:00:e4:f7:48:a6:73:ac:bf: + b2:de:77:04:87:b4:a3:cd:9b:35:24:37:fa:90:93:13:81:42: + c6:98:26:75:37:66:41:10:ac:bb:f5:94:e3:c2:31:2b:ad:e7: + 23:56:cc:35:25:92:b3:50 +SHA1 Fingerprint=54:D3:AC:B3:BD:57:56:F6:85:9D:CE:E5:C3:21:E2:D4:AD:83:D0:93 +-----BEGIN CERTIFICATE----- +MIIFszCCA5ugAwIBAgIQIZxULej27HF3+k7ow3BXlzANBgkqhkiG9w0BAQwFADBj +MQswCQYDVQQGEwJERTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0 +eSBHbWJIMSswKQYDVQQDDCJUZWxla29tIFNlY3VyaXR5IFRMUyBSU0EgUm9vdCAy +MDIzMB4XDTIzMDMyODEyMTY0NVoXDTQ4MDMyNzIzNTk1OVowYzELMAkGA1UEBhMC +REUxJzAlBgNVBAoMHkRldXRzY2hlIFRlbGVrb20gU2VjdXJpdHkgR21iSDErMCkG +A1UEAwwiVGVsZWtvbSBTZWN1cml0eSBUTFMgUlNBIFJvb3QgMjAyMzCCAiIwDQYJ +KoZIhvcNAQEBBQADggIPADCCAgoCggIBAO01oYGA88tKaVvC+1GDrib94W7zgRJ9 +cUD/h3VCKSHtgVIs3xLBGYSJwb3FKNXVS2xE1kzbB5ZKVXrKNoIENqil/Cf2SfHV +cp6R+SPWcHu79ZvB7JPPGeplfohwoHP89v+1VmLhc2o0mD6CuKyVU/QBoCcHcqMA +U6DksquDOFczJZSfvkgdmOGjup5czQRxUX11eKvzWarE4GC+j4NSuHUaQTXtvPM6 +Y+mpFEXX5lLRbtLevOP1Czvm4MS9Q2QTps70mDdsipWol8hHD/BeEIvnHRz+sTug +BTNoBUGCwQMrAcjnj02r6LX2zWtEtefdi+zqJbQAIldNsLGyMcEWzv/9FIS3R/qy +8XDe24tsNlikfLMR0cN3f1+2JeANxdKz+bi4d9s3cXFH42AYTyS2dTd4uaNir73J +co4vzLuu2+QVUhkHM/tqty1LkCiCc/4YizWN26cEar7qwU02OxY2kTLvtkCJkUPg +8qKrBC7m8kwOFjQgrIfBLX7JZkcXFBGk8/ehJImr2BrIoVyxo/eMbcgByU/J7MT8 +rFEz0ciD0cmfHdRHNCk+y7AO+oMLKFjlKdw/fKifybYKu6boRhYPluV75Gp6SG12 +mAWl3G0eQh5C2hrgUve1g8Aae3g1LDj1H/1Joy7SWWO/gLCMk3PLNaaZlSJhZQNg ++y+TS/qanIA7AgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtqeX +gj10hZv3PJ+TmpV5dVKMbUcwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS2 +p5eCPXSFm/c8n5OalXl1UoxtRzANBgkqhkiG9w0BAQwFAAOCAgEAqMxhpr51nhVQ +pGv7qHBFfLp+sVr8WyP6Cnf4mHGCDG3gXkaqk/QeoMPhk9tLrbKmXauw1GLLXrtm +9S3ul0A8Yute1hTWjOKWi0FpkzXmuZlrYrShF2Y0pmtjxrlO8iLpWA1WQdH6DErw +M807u20hOq6OcrXDSvvpfeWxm4bu4uB9tPcy/SKE8YXJN3nptT+/XOR0so8RYgDd +GGah2XsjX/GO1WfoVNpbOms2b/mBsTNHM3dA+VKq3dSDz4V4mZqTuXNnQkYRIer+ +CqkbGmVps4+uFrb2S1ayLfmlyOw7YqPta9BO1UAJpB+Y1zqlklkg5LB9zVtzaL1t +xKITDmcZuI1CfmwMmm6gJC3VRRvcxAIU/oVbZZfKTpBQCHpCNfnqwmbU+AGuHrS+ +w6jv/naaoqYfRvaE7fzbzsQCzndILIyy7MMAo+wsVRjBfhnu4S/yrYObnqsZ38aK +L4x35bcF7DvB7L6Gs4a8wPfc5+pbrrLMtTWGS9DiP7bY+A4A7l3j941Y/8+LN+lj +X273CXE2whJdV/LItM3z7gLfEdxquVeEHVlNjM7IDiPCtyaaEBRx/pOyiriA8A4Q +ntOoUAw3gi/q4Iqd4Sw5/7W0cwDk90imc6y/st53BIe0o82bNSQ3+pCTE4FCxpgm +dTdmQRCsu/WU48IxK63nI1bMNSWSs1A= +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/TrustAsia_Global_Root_CA_G3.pem b/secure/caroot/trusted/TrustAsia_Global_Root_CA_G3.pem new file mode 100644 index 000000000000..72e8d614f96a --- /dev/null +++ b/secure/caroot/trusted/TrustAsia_Global_Root_CA_G3.pem @@ -0,0 +1,138 @@ +## +## TrustAsia Global Root CA G3 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 64:f6:0e:65:77:61:6a:ab:3b:b4:ea:85:84:bb:b1:89:b8:71:93:0f + Signature Algorithm: sha384WithRSAEncryption + Issuer: C = CN, O = "TrustAsia Technologies, Inc.", CN = TrustAsia Global Root CA G3 + Validity + Not Before: May 20 02:10:19 2021 GMT + Not After : May 19 02:10:19 2046 GMT + Subject: C = CN, O = "TrustAsia Technologies, Inc.", CN = TrustAsia Global Root CA G3 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (4096 bit) + Modulus: + 00:c0:31:82:61:92:e4:94:1b:0a:2a:65:d0:be:06: + a9:87:3b:51:12:ea:70:41:ae:e2:fb:74:ea:0a:8d: + b9:b3:4c:dc:8f:b7:13:52:4f:54:18:e1:2c:73:95: + 91:c5:66:3b:6a:cf:ac:63:6d:87:53:f0:f7:f1:39: + b7:a0:43:63:b0:c4:03:5d:57:a9:e7:44:ce:c4:a1: + 83:65:f6:50:3e:b1:7e:16:b8:3a:8a:02:d0:96:1f: + 00:cd:05:21:ef:06:6d:dd:21:9c:19:43:45:a1:c5: + e8:80:ca:c2:ad:40:62:17:06:c6:aa:bc:f3:d6:e6: + fc:50:7e:66:42:1f:3c:8b:a6:79:79:86:40:35:9f: + 20:ef:3f:eb:8b:47:1f:8f:8e:c5:d4:8e:b6:2c:c9: + 44:04:e3:d4:43:75:3f:d5:3f:af:1c:cc:7e:46:5f: + ac:df:64:10:8a:ef:46:f0:90:f0:0f:2d:f4:88:0b: + b1:29:aa:af:85:aa:49:58:a8:bf:63:a0:38:91:e6: + b3:e6:77:68:c4:f9:2a:19:84:bb:0e:e1:f5:af:89: + ec:a5:2f:50:20:74:1e:12:41:73:1e:24:d9:ca:ce: + 2c:a1:59:35:c0:c8:1d:46:27:61:5a:8f:f9:4d:d3: + 72:79:66:1e:9f:15:90:21:2d:fd:ed:8b:56:70:03: + 4a:49:3e:7f:69:31:12:69:c7:1e:5c:ca:7a:13:8b: + e8:e6:f5:60:0f:cc:93:2c:84:7f:f1:fc:6a:fc:9b: + 47:9d:db:ad:88:3d:f3:76:75:33:d7:4b:a4:c8:8b: + f9:f5:43:58:4f:cb:c8:03:54:8f:a5:85:78:04:1a: + f3:73:f2:d7:87:1d:41:9f:e7:d8:17:ce:1a:9c:0f: + 4a:fc:dc:44:68:54:68:e2:41:3c:fe:2c:84:86:37: + 3c:cd:3f:2f:a2:db:e7:f7:54:03:5f:59:d3:f7:91: + 78:c7:8b:77:6a:16:e5:49:85:90:45:72:70:2f:91: + 5d:f8:3e:65:40:0b:19:99:c9:26:20:5a:68:c1:35: + bf:4f:a7:51:f1:d8:11:2b:5b:e0:9a:9e:28:3b:0a: + 3a:0a:1f:c1:81:e5:2e:f0:a6:b9:69:a5:88:94:e6: + 6b:13:7f:d1:64:3f:3d:9c:70:46:e5:a2:85:7b:58: + 84:27:dc:c4:80:3e:67:9a:9a:c7:9a:31:0e:30:ec: + e6:17:40:95:d9:45:ed:01:96:aa:bf:0c:f3:4b:d1: + 63:f7:13:58:c0:b8:f3:fa:67:dd:9b:7d:6d:4a:ff: + 32:4c:b5:25:3b:ff:1c:67:0f:85:22:59:05:91:91: + 41:77:81:d0:85:4c:87:10:71:ff:9e:43:1b:ae:95: + 75:2d:81 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Authority Key Identifier: + 40:E4:E4:F2:23:EF:38:CA:B0:AE:57:7F:F2:21:30:16:34:DB:BC:92 + X509v3 Subject Key Identifier: + 40:E4:E4:F2:23:EF:38:CA:B0:AE:57:7F:F2:21:30:16:34:DB:BC:92 + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + Signature Algorithm: sha384WithRSAEncryption + Signature Value: + 26:3b:51:e1:4d:38:f3:32:18:b4:b4:5e:e1:65:5e:c4:94:4f: + d4:a7:61:a3:f8:c0:cf:33:01:02:e9:c3:aa:35:0f:f1:94:13: + 77:77:35:9e:2d:56:51:44:6e:e1:c6:2e:28:1e:ff:da:ec:47: + cd:97:44:17:f7:e0:4c:c2:e1:7c:7c:32:7a:66:c8:5a:b6:5c: + 53:45:57:5a:45:d4:05:99:2f:2e:23:55:ee:63:68:df:d3:1b: + 78:a7:12:94:06:00:75:0d:72:84:e9:2e:bc:5a:6a:d5:de:2f: + 59:c7:a3:ec:d2:87:66:db:b7:54:b5:24:ab:f4:43:78:db:4b: + 04:c4:6f:dd:e6:3e:66:3e:29:f2:4b:68:71:22:87:a0:f8:b1: + 33:63:76:e3:0d:85:72:44:22:55:3f:1c:7c:e9:fc:b8:15:e8: + 52:fa:aa:3e:a3:21:39:35:74:89:a6:6a:c2:39:fa:78:cf:b6: + ac:e7:e7:d6:56:ff:23:92:2e:50:0b:a9:b5:07:33:f4:38:5f: + a4:49:a6:cb:65:70:76:e8:0a:85:80:4b:36:3d:33:f7:95:54: + 75:25:da:ac:c4:73:82:65:e9:52:f5:5c:fd:38:95:02:6a:69: + 30:c5:1c:0a:57:07:ae:22:a4:2c:f9:c5:41:b7:b8:ec:9f:4f: + 48:00:f9:01:04:55:cc:ac:f9:32:31:c4:75:95:06:a0:7f:d1: + 8d:27:dd:b3:a9:a4:72:87:fe:59:8b:9a:7a:74:16:dd:16:a5: + 62:29:eb:3a:96:dc:8b:a7:68:59:d3:eb:77:91:39:f8:d7:cb: + d9:8f:5f:5a:27:01:7d:5d:68:19:62:d8:c8:cd:f4:b7:72:47: + be:5b:97:ce:f2:ad:a2:99:93:ad:94:cb:93:f6:12:09:95:b6: + ab:d7:3b:d0:3f:11:cb:30:16:2e:79:80:e4:67:81:2d:5d:ed: + 70:78:b6:60:59:ac:e1:5d:45:63:8f:c8:df:72:68:5b:ea:1d: + b8:01:f1:7e:fb:e7:8a:b3:e3:54:a0:38:09:e0:3c:de:42:f2: + c2:ed:2e:9b:f3:1f:35:b6:36:d8:e3:80:a1:8b:cd:99:64:0f: + c2:aa:ab:b1:ca:f5:6f:9e:43:8d:84:54:99:b3:6e:c0:12:66: + d8:70:10:f1:06:35:33:43:a8:9c:2e:ba:14:31:ce:10:7f:1c: + 86:e3:8f:d2:d5:f8:77:ec:9b:ab:f1:2f:63:d9:42:5f:e0:67: + 81:64:91:f1:97:2f:fc:6e:26:f6:33:f8:d3:b5:f8:c4:62:ab: + 31:51:25:02:7a:f8:dd:6b:65:d5:6d:4d:30:c8:65:ba:68:14: + 65:ac:27:0b:74:8a:f2:87 +SHA1 Fingerprint=63:CF:B6:C1:27:2B:56:E4:88:8E:1C:23:9A:B6:2E:81:47:24:C3:C7 +-----BEGIN CERTIFICATE----- +MIIFpTCCA42gAwIBAgIUZPYOZXdhaqs7tOqFhLuxibhxkw8wDQYJKoZIhvcNAQEM +BQAwWjELMAkGA1UEBhMCQ04xJTAjBgNVBAoMHFRydXN0QXNpYSBUZWNobm9sb2dp +ZXMsIEluYy4xJDAiBgNVBAMMG1RydXN0QXNpYSBHbG9iYWwgUm9vdCBDQSBHMzAe +Fw0yMTA1MjAwMjEwMTlaFw00NjA1MTkwMjEwMTlaMFoxCzAJBgNVBAYTAkNOMSUw +IwYDVQQKDBxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSQwIgYDVQQDDBtU +cnVzdEFzaWEgR2xvYmFsIFJvb3QgQ0EgRzMwggIiMA0GCSqGSIb3DQEBAQUAA4IC +DwAwggIKAoICAQDAMYJhkuSUGwoqZdC+BqmHO1ES6nBBruL7dOoKjbmzTNyPtxNS +T1QY4SxzlZHFZjtqz6xjbYdT8PfxObegQ2OwxANdV6nnRM7EoYNl9lA+sX4WuDqK +AtCWHwDNBSHvBm3dIZwZQ0WhxeiAysKtQGIXBsaqvPPW5vxQfmZCHzyLpnl5hkA1 +nyDvP+uLRx+PjsXUjrYsyUQE49RDdT/VP68czH5GX6zfZBCK70bwkPAPLfSIC7Ep +qq+FqklYqL9joDiR5rPmd2jE+SoZhLsO4fWvieylL1AgdB4SQXMeJNnKziyhWTXA +yB1GJ2Faj/lN03J5Zh6fFZAhLf3ti1ZwA0pJPn9pMRJpxx5cynoTi+jm9WAPzJMs +hH/x/Gr8m0ed262IPfN2dTPXS6TIi/n1Q1hPy8gDVI+lhXgEGvNz8teHHUGf59gX +zhqcD0r83ERoVGjiQTz+LISGNzzNPy+i2+f3VANfWdP3kXjHi3dqFuVJhZBFcnAv +kV34PmVACxmZySYgWmjBNb9Pp1Hx2BErW+Canig7CjoKH8GB5S7wprlppYiU5msT +f9FkPz2ccEblooV7WIQn3MSAPmeamseaMQ4w7OYXQJXZRe0Blqq/DPNL0WP3E1jA +uPP6Z92bfW1K/zJMtSU7/xxnD4UiWQWRkUF3gdCFTIcQcf+eQxuulXUtgQIDAQAB +o2MwYTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFEDk5PIj7zjKsK5Xf/Ih +MBY027ySMB0GA1UdDgQWBBRA5OTyI+84yrCuV3/yITAWNNu8kjAOBgNVHQ8BAf8E +BAMCAQYwDQYJKoZIhvcNAQEMBQADggIBACY7UeFNOPMyGLS0XuFlXsSUT9SnYaP4 +wM8zAQLpw6o1D/GUE3d3NZ4tVlFEbuHGLige/9rsR82XRBf34EzC4Xx8MnpmyFq2 +XFNFV1pF1AWZLy4jVe5jaN/TG3inEpQGAHUNcoTpLrxaatXeL1nHo+zSh2bbt1S1 +JKv0Q3jbSwTEb93mPmY+KfJLaHEih6D4sTNjduMNhXJEIlU/HHzp/LgV6FL6qj6j +ITk1dImmasI5+njPtqzn59ZW/yOSLlALqbUHM/Q4X6RJpstlcHboCoWASzY9M/eV +VHUl2qzEc4Jl6VL1XP04lQJqaTDFHApXB64ipCz5xUG3uOyfT0gA+QEEVcys+TIx +xHWVBqB/0Y0n3bOppHKH/lmLmnp0Ft0WpWIp6zqW3IunaFnT63eROfjXy9mPX1on *** 82 LINES SKIPPED *** From nobody Tue Feb 13 20:34:15 2024 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 4TZCjN1GmZz59j13; Tue, 13 Feb 2024 20:34:16 +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 4TZCjN10tYz4PRt; Tue, 13 Feb 2024 20:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707856456; 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=rqJfPiUj5Ip37E7f40J4vF0Bv5dKnDOD1bUJ/sFJ7Fs=; b=XIeCjiWRnfy16Cq/M+Hd4qjZm1sbuGm7aEqW9PWGZKhc0jUgr+RhKX9Q+jpMsyEJe3pyJ8 ORC5JGmrvpcNSfWq2uaHJfy+od1Af0ggZZzfrDgNwjfl7h72l/yYXQhw/BzNtPvp+7edj8 SWrHLofiIursC2ottmJBdgRKgF+9860qbZ1gsTheosB68rjTQA77f+bHw7WGUhVwMqgr8V tqaLoA25drJqlMeBGbXC/AARmhQJ/UIsZS9hVEdFkEeZ0nBF8E9V37v7Rdcr3U7ZNqUGxV DywUKIlykGxHG/SUciPTo+yJLxfDETw0api9JDENQ20h1xbHWZHkOWLCqxetZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707856456; a=rsa-sha256; cv=none; b=MqnFRPkIPN8vFdgCEnLKI1znYyfwdVg0USNTmPtmMLjbhaX1BIAI/Op90OPqvBdEo75AAJ wxTzkUC0lG+0tSaZZefubegxW5h9WS5ypRs7322s9XRvUlw6X5LsHULSkMzcHsEHk3wKRf dTcbg2+vxbWgMGNanaWrLFD5WHVzbpaPV6yOsqhf6WpbRivfK5Z+wyEdtAcpZhnwKDFef9 ezAMCLQlrK/iTNc7ML7ccs8TnPe+kBPtQNNxYbidCeFwB+OnzsII6de5mRFByWNPGK5B/d iLqDNmfgnq4TdxBeQQnmG0jeH81EkLj+0yT8/zId5+W8jUuXc+kp2zVmcowklA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707856456; 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=rqJfPiUj5Ip37E7f40J4vF0Bv5dKnDOD1bUJ/sFJ7Fs=; b=gMqm5SqEEXsNhW4+/+VL++CWbL6Y73L56JLzL8lYGx8mWHbv8YDXFvhn7sBwBjnDecqPsn i7u40ru8fP5LMyChGUsPub4jeibRjFwVfiiARXlUMWmgAbQoofYHy2nYM0Xcp4I65GopjP IyI1iwIeVPTHLm9Lx75EE57fO2Wrpd74asV+062J+Kr84Pm15Ox4HbPoqwFJLxn4h8uIJR +JVkaNa2ds8vGlmdkLk5A4vCDlyA+Wqh9QKlZNeoEL6SavNg3JnD8b8FeOwu0HIi5A93QR W2orTB9ZqJqYGUzsUbLtH5I6pPYbVV1g5R+MAYBZ5CDkp6xSF+0jHeMIaZrJhg== 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 4TZCjN037ZzVSm; Tue, 13 Feb 2024 20:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41DKYFCP025043; Tue, 13 Feb 2024 20:34:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DKYFVf025040; Tue, 13 Feb 2024 20:34:15 GMT (envelope-from git) Date: Tue, 13 Feb 2024 20:34:15 GMT Message-Id: <202402132034.41DKYFVf025040@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 16eebc4e19de - releng/13.3 - caroot: routine update 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.3 X-Git-Reftype: branch X-Git-Commit: 16eebc4e19de99bdc0457f483c97d749a27e7603 Auto-Submitted: auto-generated The branch releng/13.3 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=16eebc4e19de99bdc0457f483c97d749a27e7603 commit 16eebc4e19de99bdc0457f483c97d749a27e7603 Author: Kyle Evans AuthorDate: 2024-02-11 06:33:12 +0000 Commit: Kyle Evans CommitDate: 2024-02-13 20:34:00 +0000 caroot: routine update Changes: - One (1) modified - Eight (8) added - One (1) expired, now untrusted Approved by: re (cperciva) MFC after: 3 days (cherry picked from commit 0d3b2bdbf719ac6b5719a47387558ca9c34a4b2c) (cherry picked from commit 9b7611d9c7b48e68f017c43ec67d4182a4bc11c4) --- ObsoleteFiles.inc | 3 + .../Security_Communication_Root_CA.pem | 0 ...ertificacion_Firmaprofesional_CIF_A62634068.pem | 118 +++++++++--------- .../trusted/CommScope_Public_Trust_ECC_Root-01.pem | 67 ++++++++++ .../trusted/CommScope_Public_Trust_ECC_Root-02.pem | 67 ++++++++++ .../trusted/CommScope_Public_Trust_RSA_Root-01.pem | 134 ++++++++++++++++++++ .../trusted/CommScope_Public_Trust_RSA_Root-02.pem | 134 ++++++++++++++++++++ .../trusted/Telekom_Security_TLS_ECC_Root_2020.pem | 68 ++++++++++ .../trusted/Telekom_Security_TLS_RSA_Root_2023.pem | 138 +++++++++++++++++++++ .../caroot/trusted/TrustAsia_Global_Root_CA_G3.pem | 138 +++++++++++++++++++++ .../caroot/trusted/TrustAsia_Global_Root_CA_G4.pem | 70 +++++++++++ 11 files changed, 878 insertions(+), 59 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 73435961164c..9e1006e21e51 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20240213: caroot bundle updated +OLD_FILES+=usr/share/certs/trusted/Security_Communication_Root_CA.pem + # 20240112: replaced NetBSD tests for uniq with our own OLD_FILES+=usr/tests/usr.bin/uniq/d_basic.in OLD_FILES+=usr/tests/usr.bin/uniq/d_basic.out diff --git a/secure/caroot/trusted/Security_Communication_Root_CA.pem b/secure/caroot/blacklisted/Security_Communication_Root_CA.pem similarity index 100% rename from secure/caroot/trusted/Security_Communication_Root_CA.pem rename to secure/caroot/blacklisted/Security_Communication_Root_CA.pem diff --git a/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem b/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem index 7eeb715ac674..ceae80a3e6d8 100644 --- a/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem +++ b/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem @@ -14,12 +14,12 @@ Certificate: Data: Version: 3 (0x2) - Serial Number: 6047274297262753887 (0x53ec3beefbb2485f) - Signature Algorithm: sha1WithRSAEncryption + Serial Number: 1977337328857672817 (0x1b70e9d2ffae6c71) + Signature Algorithm: sha256WithRSAEncryption Issuer: C = ES, CN = Autoridad de Certificacion Firmaprofesional CIF A62634068 Validity - Not Before: May 20 08:38:15 2009 GMT - Not After : Dec 31 08:38:15 2030 GMT + Not Before: Sep 23 15:22:07 2014 GMT + Not After : May 5 15:22:07 2036 GMT Subject: C = ES, CN = Autoridad de Certificacion Firmaprofesional CIF A62634068 Subject Public Key Info: Public Key Algorithm: rsaEncryption @@ -62,54 +62,54 @@ Certificate: 92:30:bb Exponent: 65537 (0x10001) X509v3 extensions: - X509v3 Basic Constraints: critical - CA:TRUE, pathlen:1 - X509v3 Key Usage: critical - Certificate Sign, CRL Sign X509v3 Subject Key Identifier: 65:CD:EB:AB:35:1E:00:3E:7E:D5:74:C0:1C:B4:73:47:0E:1A:64:2F + X509v3 Basic Constraints: critical + CA:TRUE, pathlen:1 X509v3 Certificate Policies: Policy: X509v3 Any Policy CPS: http://www.firmaprofesional.com/cps User Notice: Explicit Text: - Signature Algorithm: sha1WithRSAEncryption + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + Signature Algorithm: sha256WithRSAEncryption Signature Value: - 17:7d:a0:f9:b4:dd:c5:c5:eb:ad:4b:24:b5:a1:02:ab:dd:a5: - 88:4a:b2:0f:55:4b:2b:57:8c:3b:e5:31:dd:fe:c4:32:f1:e7: - 5b:64:96:36:32:18:ec:a5:32:77:d7:e3:44:b6:c0:11:2a:80: - b9:3d:6a:6e:7c:9b:d3:ad:fc:c3:d6:a3:e6:64:29:7c:d1:e1: - 38:1e:82:2b:ff:27:65:af:fb:16:15:c4:2e:71:84:e5:b5:ff: - fa:a4:47:bd:64:32:bb:f6:25:84:a2:27:42:f5:20:b0:c2:13: - 10:11:cd:10:15:ba:42:90:2a:d2:44:e1:96:26:eb:31:48:12: - fd:2a:da:c9:06:cf:74:1e:a9:4b:d5:87:28:f9:79:34:92:3e: - 2e:44:e8:f6:8f:4f:8f:35:3f:25:b3:39:dc:63:2a:90:6b:20: - 5f:c4:52:12:4e:97:2c:2a:ac:9d:97:de:48:f2:a3:66:db:c2: - d2:83:95:a6:66:a7:9e:25:0f:e9:0b:33:91:65:0a:5a:c3:d9: - 54:12:dd:af:c3:4e:0e:1f:26:5e:0d:dc:b3:8d:ec:d5:81:70: - de:d2:4f:24:05:f3:6c:4e:f5:4c:49:66:8d:d1:ff:d2:0b:25: - 41:48:fe:51:84:c6:42:af:80:04:cf:d0:7e:64:49:e4:f2:df: - a2:ec:b1:4c:c0:2a:1d:e7:b4:b1:65:a2:c4:bc:f1:98:f4:aa: - 70:07:63:b4:b8:da:3b:4c:fa:40:22:30:5b:11:a6:f0:05:0e: - c6:02:03:48:ab:86:9b:85:dd:db:dd:ea:a2:76:80:73:7d:f5: - 9c:04:c4:45:8d:e7:b9:1c:8b:9e:ea:d7:75:d1:72:b1:de:75: - 44:e7:42:7d:e2:57:6b:7d:dc:99:bc:3d:83:28:ea:80:93:8d: - c5:4c:65:c1:70:81:b8:38:fc:43:31:b2:f6:03:34:47:b2:ac: - fb:22:06:cb:1e:dd:17:47:1c:5f:66:b9:d3:1a:a2:da:11:b1: - a4:bc:23:c9:e4:be:87:ff:b9:94:b6:f8:5d:20:4a:d4:5f:e7: - bd:68:7b:65:f2:15:1e:d2:3a:a9:2d:e9:d8:6b:24:ac:97:58: - 44:47:ad:59:18:f1:21:65:70:de:ce:34:60:a8:40:f1:f3:3c: - a4:c3:28:23:8c:fe:27:33:43:40:a0:17:3c:eb:ea:3b:b0:72: - a6:a3:b9:4a:4b:5e:16:48:f4:b2:bc:c8:8c:92:c5:9d:9f:ac: - 72:36:bc:34:80:34:6b:a9:8b:92:c0:b8:17:ed:ec:76:53:f5: - 24:01:8c:b3:22:e8:4b:7c:55:c6:9d:fa:a3:14:bb:65:85:6e: - 6e:4f:12:7e:0a:3c:9d:95 -SHA1 Fingerprint=AE:C5:FB:3F:C8:E1:BF:C4:E5:4F:03:07:5A:9A:E8:00:B7:F7:B6:FA + 74:87:28:02:2b:77:1f:66:89:64:ed:8f:74:2e:46:1c:bb:a8: + f8:f8:0b:1d:83:b6:3a:a7:e8:45:8a:07:b7:e0:3e:20:cb:e1: + 08:db:13:08:f8:28:a1:35:b2:80:b3:0b:51:c0:d3:56:9a:8d: + 33:45:49:af:49:f0:e0:3d:07:7a:45:13:5a:ff:c8:97:d8:d3: + 18:2c:7d:96:f8:dd:a2:65:43:70:93:90:15:ba:90:df:e8:19: + b0:db:2c:8a:60:0f:b7:6f:94:07:1e:1d:a6:c9:85:f6:bd:34: + f8:40:78:62:10:70:3a:be:7d:4b:39:81:a9:10:d4:96:41:bb: + f8:5f:1c:0b:1d:08:f2:b1:b0:89:7a:f2:f7:a0:e0:c4:8f:8b: + 78:b5:3b:58:a5:23:8e:4f:55:fe:36:3b:e0:0c:b7:ca:2a:30: + 41:20:b4:80:cd:ae:fc:76:66:73:a8:ae:6e:e1:7c:da:03:e8: + 94:20:e6:22:a3:d0:1f:90:5d:20:53:14:26:57:da:54:97:df: + 16:44:10:01:1e:88:66:8f:72:38:93:dd:20:b7:34:be:d7:f1: + ee:63:8e:47:79:28:06:fc:f3:59:45:25:60:22:33:1b:a3:5f: + a8:ba:2a:da:1a:3d:cd:40:ea:8c:ee:05:15:95:d5:a5:2c:20: + 2f:a7:98:28:ee:45:fc:f1:b8:88:00:2c:8f:42:da:51:d5:9c: + e5:13:68:71:45:43:8b:9e:0b:21:3c:4b:5c:05:dc:1a:9f:98: + 8e:da:bd:22:9e:72:cd:ad:0a:cb:cc:a3:67:9b:28:74:c4:9b: + d7:1a:3c:04:58:a6:82:9d:ad:c7:7b:6f:ff:80:96:e9:f8:8d: + 6a:bd:18:90:1d:ff:49:1a:90:52:37:93:2f:3c:02:5d:82:76: + 0b:51:e7:16:c7:57:f8:38:f9:a7:cd:9b:22:54:ef:63:b0:15: + 6d:53:65:03:4a:5e:4a:a0:b2:a7:8e:49:00:59:38:d5:c7:f4: + 80:64:f5:6e:95:50:b8:11:7e:15:70:38:4a:b0:7f:d0:c4:32: + 70:c0:19:ff:c9:38:2d:14:2c:66:f4:42:44:e6:55:76:1b:80: + 15:57:ff:c0:a7:a7:aa:39:aa:d8:d3:70:d0:2e:ba:eb:94:6a: + fa:5f:34:86:e7:62:b5:fd:8a:f0:30:85:94:c9:af:24:02:2f: + 6f:d6:dd:67:fe:e3:b0:55:4f:04:98:4f:a4:41:56:e2:93:d0: + 6a:e8:d6:f3:fb:65:e0:ce:75:c4:31:59:0c:ee:82:c8:0c:60: + 33:4a:19:ba:84:67:27:0f:bc:42:5d:bd:24:54:0d:ec:1d:70: + 06:5f:a4:bc:fa:20:7c:55 +SHA1 Fingerprint=0B:BE:C2:27:22:49:CB:39:AA:DB:35:5C:53:E3:8C:AE:78:FF:B6:FE -----BEGIN CERTIFICATE----- -MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UE +MIIGFDCCA/ygAwIBAgIIG3Dp0v+ubHEwDQYJKoZIhvcNAQELBQAwUTELMAkGA1UE BhMCRVMxQjBABgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1h -cHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEy -MzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUg +cHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODAeFw0xNDA5MjMxNTIyMDdaFw0zNjA1 +MDUxNTIyMDdaMFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUg Q2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBBNjI2MzQwNjgwggIi MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDDUtd9 thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQM @@ -122,21 +122,21 @@ Z/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirja EbsXLZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/T KI8xWVvTyQKmtFLKbpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF 6NkBiDkal4ZkQdU7hwxu+g/GvUgUvzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVh -OSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD -VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNHDhpkLzCBpgYD -VR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp -cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBv -ACAAZABlACAAbABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBl -AGwAbwBuAGEAIAAwADgAMAAxADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF -661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx51tkljYyGOylMnfX40S2wBEqgLk9 -am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qkR71kMrv2JYSiJ0L1 -ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaPT481 -PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS -3a/DTg4fJl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5k -SeTy36LssUzAKh3ntLFlosS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF -3dvd6qJ2gHN99ZwExEWN57kci57q13XRcrHedUTnQn3iV2t93Jm8PYMo6oCTjcVM -ZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoRsaS8I8nkvof/uZS2+F0g -StRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTDKCOM/icz -Q0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQB -jLMi6Et8Vcad+qMUu2WFbm5PEn4KPJ2V +OSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMB0GA1UdDgQWBBRlzeurNR4APn7VdMAc +tHNHDhpkLzASBgNVHRMBAf8ECDAGAQH/AgEBMIGmBgNVHSAEgZ4wgZswgZgGBFUd +IAAwgY8wLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuZmlybWFwcm9mZXNpb25hbC5j +b20vY3BzMFwGCCsGAQUFBwICMFAeTgBQAGEAcwBlAG8AIABkAGUAIABsAGEAIABC +AG8AbgBhAG4AbwB2AGEAIAA0ADcAIABCAGEAcgBjAGUAbABvAG4AYQAgADAAOAAw +ADEANzAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggIBAHSHKAIrdx9m +iWTtj3QuRhy7qPj4Cx2Dtjqn6EWKB7fgPiDL4QjbEwj4KKE1soCzC1HA01aajTNF +Sa9J8OA9B3pFE1r/yJfY0xgsfZb43aJlQ3CTkBW6kN/oGbDbLIpgD7dvlAceHabJ +hfa9NPhAeGIQcDq+fUs5gakQ1JZBu/hfHAsdCPKxsIl68veg4MSPi3i1O1ilI45P +Vf42O+AMt8oqMEEgtIDNrvx2ZnOorm7hfNoD6JQg5iKj0B+QXSBTFCZX2lSX3xZE +EAEeiGaPcjiT3SC3NL7X8e5jjkd5KAb881lFJWAiMxujX6i6KtoaPc1A6ozuBRWV +1aUsIC+nmCjuRfzxuIgALI9C2lHVnOUTaHFFQ4ueCyE8S1wF3BqfmI7avSKecs2t +CsvMo2ebKHTEm9caPARYpoKdrcd7b/+Alun4jWq9GJAd/0kakFI3ky88Al2CdgtR +5xbHV/g4+afNmyJU72OwFW1TZQNKXkqgsqeOSQBZONXH9IBk9W6VULgRfhVwOEqw +f9DEMnDAGf/JOC0ULGb0QkTmVXYbgBVX/8Cnp6o5qtjTcNAuuuuUavpfNIbnYrX9 +ivAwhZTJryQCL2/W3Wf+47BVTwSYT6RBVuKT0Gro1vP7ZeDOdcQxWQzugsgMYDNK +GbqEZycPvEJdvSRUDewdcAZfpLz6IHxV -----END CERTIFICATE----- diff --git a/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-01.pem b/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-01.pem new file mode 100644 index 000000000000..41e8a409ac3c --- /dev/null +++ b/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-01.pem @@ -0,0 +1,67 @@ +## +## CommScope Public Trust ECC Root-01 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 43:70:82:77:cf:4d:5d:34:f1:ca:ae:32:2f:37:f7:f4:7f:75:a0:9e + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = US, O = CommScope, CN = CommScope Public Trust ECC Root-01 + Validity + Not Before: Apr 28 17:35:43 2021 GMT + Not After : Apr 28 17:35:42 2046 GMT + Subject: C = US, O = CommScope, CN = CommScope Public Trust ECC Root-01 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:4b:36:e9:ae:57:5e:a8:70:d7:d0:8f:74:62:77: + c3:5e:7a:aa:e5:b6:a2:f1:78:fd:02:7e:57:dd:91: + 79:9c:6c:b9:52:88:54:bc:2f:04:be:b8:cd:f6:10: + d1:29:ec:b5:d0:a0:c3:f0:89:70:19:bb:51:65:c5: + 43:9c:c3:9b:63:9d:20:83:3e:06:0b:a6:42:44:85: + 11:a7:4a:3a:2d:e9:d6:68:2f:48:4e:53:2b:07:3f: + 4d:bd:b9:ac:77:39:57 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + 8E:07:62:C0:50:DD:C6:19:06:00:46:74:04:F7:F3:AE:7D:75:4D:30 + Signature Algorithm: ecdsa-with-SHA384 + Signature Value: + 30:65:02:31:00:9c:33:df:41:e3:23:a8:42:36:26:97:35:5c: + 7b:eb:db:4b:f8:aa:8b:73:55:15:5c:ac:78:29:0f:ba:21:d8: + c4:a0:d8:d1:03:dd:6d:d1:39:3d:c4:93:60:d2:e3:72:b2:02: + 30:7c:c5:7e:88:d3:50:f5:1e:25:e8:fa:4e:75:e6:58:96:a4: + 35:5f:1b:65:ea:61:9a:70:23:b5:0d:a3:9b:92:52:6f:69:a0: + 8c:8d:4a:d0:ee:8b:0e:cb:47:8e:d0:8d:11 +SHA1 Fingerprint=07:86:C0:D8:DD:8E:C0:80:98:06:98:D0:58:7A:EF:DE:A6:CC:A2:5D +-----BEGIN CERTIFICATE----- +MIICHTCCAaOgAwIBAgIUQ3CCd89NXTTxyq4yLzf39H91oJ4wCgYIKoZIzj0EAwMw +TjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwiQ29t +bVNjb3BlIFB1YmxpYyBUcnVzdCBFQ0MgUm9vdC0wMTAeFw0yMTA0MjgxNzM1NDNa +Fw00NjA0MjgxNzM1NDJaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21tU2Nv +cGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgRUNDIFJvb3QtMDEw +djAQBgcqhkjOPQIBBgUrgQQAIgNiAARLNumuV16ocNfQj3Rid8NeeqrltqLxeP0C +flfdkXmcbLlSiFS8LwS+uM32ENEp7LXQoMPwiXAZu1FlxUOcw5tjnSCDPgYLpkJE +hRGnSjot6dZoL0hOUysHP029uax3OVejQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD +VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSOB2LAUN3GGQYARnQE9/OufXVNMDAKBggq +hkjOPQQDAwNoADBlAjEAnDPfQeMjqEI2Jpc1XHvr20v4qotzVRVcrHgpD7oh2MSg +2NED3W3ROT3Ek2DS43KyAjB8xX6I01D1HiXo+k515liWpDVfG2XqYZpwI7UNo5uS +Um9poIyNStDuiw7LR47QjRE= +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-02.pem b/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-02.pem new file mode 100644 index 000000000000..f547954704be --- /dev/null +++ b/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-02.pem @@ -0,0 +1,67 @@ +## +## CommScope Public Trust ECC Root-02 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 28:fd:99:60:41:47:a6:01:3a:ca:14:7b:1f:ef:f9:68:08:83:5d:7d + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = US, O = CommScope, CN = CommScope Public Trust ECC Root-02 + Validity + Not Before: Apr 28 17:44:54 2021 GMT + Not After : Apr 28 17:44:53 2046 GMT + Subject: C = US, O = CommScope, CN = CommScope Public Trust ECC Root-02 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:78:30:81:e8:63:1e:e5:eb:71:51:0f:f7:07:07: + ca:39:99:7c:4e:d5:0f:cc:30:30:0b:8f:66:93:3e: + cf:bd:c5:86:bd:f9:b1:b7:b4:3e:b4:07:c8:f3:96: + 31:f3:ed:a4:4f:f8:a3:4e:8d:29:15:58:b8:d5:6f: + 7f:ee:6c:22:b5:b0:af:48:45:0a:bd:a8:49:94:bf: + 84:43:b0:db:84:4a:03:23:19:67:6a:6f:c1:6e:bc: + 06:39:37:d1:88:22:f7 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + E6:18:75:FF:EF:60:DE:84:A4:F5:46:C7:DE:4A:55:E3:32:36:79:F5 + Signature Algorithm: ecdsa-with-SHA384 + Signature Value: + 30:64:02:30:26:73:49:7a:b6:ab:e6:49:f4:7d:52:3f:d4:41: + 04:ae:80:43:83:65:75:b9:85:80:38:3b:d6:6f:e4:93:86:ab: + 8f:e7:89:c8:7f:9b:7e:6b:0a:12:55:61:aa:11:e0:79:02:30: + 77:e8:31:71:ac:3c:71:03:d6:84:26:1e:14:b8:f3:3b:3b:de: + ed:59:fc:6b:4c:30:7f:59:ce:45:e9:73:60:15:9a:4c:f0:e6: + 5e:25:22:15:6d:c2:87:59:d0:b2:8e:6a +SHA1 Fingerprint=3C:3F:EF:57:0F:FE:65:93:86:9E:A0:FE:B0:F6:ED:8E:D1:13:C7:E5 +-----BEGIN CERTIFICATE----- +MIICHDCCAaOgAwIBAgIUKP2ZYEFHpgE6yhR7H+/5aAiDXX0wCgYIKoZIzj0EAwMw +TjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwiQ29t +bVNjb3BlIFB1YmxpYyBUcnVzdCBFQ0MgUm9vdC0wMjAeFw0yMTA0MjgxNzQ0NTRa +Fw00NjA0MjgxNzQ0NTNaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21tU2Nv +cGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgRUNDIFJvb3QtMDIw +djAQBgcqhkjOPQIBBgUrgQQAIgNiAAR4MIHoYx7l63FRD/cHB8o5mXxO1Q/MMDAL +j2aTPs+9xYa9+bG3tD60B8jzljHz7aRP+KNOjSkVWLjVb3/ubCK1sK9IRQq9qEmU +v4RDsNuESgMjGWdqb8FuvAY5N9GIIvejQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD +VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTmGHX/72DehKT1RsfeSlXjMjZ59TAKBggq +hkjOPQQDAwNnADBkAjAmc0l6tqvmSfR9Uj/UQQSugEODZXW5hYA4O9Zv5JOGq4/n +ich/m35rChJVYaoR4HkCMHfoMXGsPHED1oQmHhS48zs73u1Z/GtMMH9ZzkXpc2AV +mkzw5l4lIhVtwodZ0LKOag== +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-01.pem b/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-01.pem new file mode 100644 index 000000000000..2f144760f93c --- /dev/null +++ b/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-01.pem @@ -0,0 +1,134 @@ +## +## CommScope Public Trust RSA Root-01 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 3e:03:49:81:75:16:74:31:8e:4c:ab:d5:c5:90:29:96:c5:39:10:dd + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = US, O = CommScope, CN = CommScope Public Trust RSA Root-01 + Validity + Not Before: Apr 28 16:45:54 2021 GMT + Not After : Apr 28 16:45:53 2046 GMT + Subject: C = US, O = CommScope, CN = CommScope Public Trust RSA Root-01 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (4096 bit) + Modulus: + 00:b0:48:65:a3:0d:1d:42:e3:91:6d:9d:84:a4:61: + 96:12:c2:ed:c3:da:23:34:19:76:f6:ea:fd:55:5a: + f6:55:01:53:0f:f2:cc:8c:97:4f:b9:50:cb:b3:01: + 44:56:96:fd:9b:28:ec:7b:74:0b:e7:42:6b:55:ce: + c9:61:b2:e8:ad:40:3c:ba:b9:41:0a:05:4f:1b:26: + 85:8f:43:b5:40:b5:85:d1:d4:71:dc:83:41:f3:f6: + 45:c7:80:a2:84:50:97:46:ce:a0:0c:c4:60:56:04: + 1d:07:5b:46:a5:0e:b2:4b:a4:0e:a5:7c:ee:f8:d4: + 62:03:b9:93:6a:8a:14:b8:70:f8:2e:82:46:38:23: + 0e:74:c7:6b:41:b7:d0:29:a3:9d:80:b0:7e:77:93: + 63:42:fb:34:83:3b:73:a3:5a:21:36:eb:47:fa:18: + 17:d9:ba:66:c2:93:a4:8f:fc:5d:a4:ad:fc:50:6a: + 95:ac:bc:24:33:d1:bd:88:7f:86:f5:f5:b2:73:2a: + 8f:7c:af:08:f2:1a:98:3f:a9:81:65:3f:c1:8c:89: + c5:96:30:9a:0a:cf:f4:d4:c8:34:ed:9d:2f:bc:8d: + 38:86:53:ee:97:9f:a9:b2:63:94:17:8d:0f:dc:66: + 2a:7c:52:51:75:cb:99:8e:e8:3d:5c:bf:9e:3b:28: + 8d:83:02:0f:a9:9f:72:e2:2c:2b:b3:dc:66:97:00: + 40:d0:a4:54:8e:9b:5d:7b:45:36:26:d6:72:43:eb: + cf:c0:ea:0d:dc:ce:12:e6:7d:38:9f:05:27:a8:97: + 3e:e9:51:c6:6c:05:28:c1:02:0f:e9:18:6d:ec:bd: + 9c:06:d4:a7:49:f4:54:05:6b:6c:30:f1:eb:03:d5: + ea:3d:6a:76:c2:cb:1a:28:49:4d:7f:64:e0:fa:2b: + da:73:83:81:ff:91:03:bd:94:bb:e4:b8:8e:9c:32: + 63:cd:9f:bb:68:81:b1:84:5b:af:36:bf:77:ee:1d: + 7f:f7:49:9b:52:ec:d2:77:5a:7d:91:9d:4d:c2:39: + 2d:e4:ba:82:f8:6f:f2:4e:1e:0f:4e:e6:3f:59:a5: + 23:dc:3d:87:a8:28:58:28:d1:f1:1b:36:db:4f:c4: + ff:e1:8c:5b:72:8c:c7:26:03:27:a3:39:0a:01:aa: + c0:b2:31:60:83:22:a1:4f:12:09:01:11:af:34:d4: + cf:d7:ae:62:d3:05:07:b4:31:75:e0:0d:6d:57:4f: + 69:87:f9:57:a9:ba:15:f6:c8:52:6d:a1:cb:9c:1f: + e5:fc:78:a8:35:9a:9f:41:14:ce:a5:b4:ce:94:08: + 1c:09:ad:56:e5:da:b6:49:9a:4a:ea:63:18:53:9c: + 2c:2e:c3 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + 37:5D:A6:9A:74:32:C2:C2:F9:C7:A6:15:10:59:B8:E4:FD:E5:B8:6D + Signature Algorithm: sha256WithRSAEncryption + Signature Value: + af:a7:cf:de:ff:e0:bd:42:8d:4d:e5:22:96:df:68:ea:7d:4d: + 2a:7d:d0:ad:3d:16:5c:43:e7:7d:c0:86:e8:7a:35:63:f1:cc: + 81:c8:c6:0b:e8:2e:52:35:a4:a6:49:90:63:51:ac:34:ac:05: + 3b:57:00:e9:d3:62:d3:d9:29:d5:54:be:1c:10:91:9c:b2:6d: + fe:59:fd:79:f7:ea:56:d0:9e:68:54:42:8f:26:52:e2:4c:df: + 2f:97:a6:2f:d2:07:98:a8:f3:60:5d:4b:9a:58:57:88:ef:82: + e5:fa:af:6c:81:4b:92:8f:40:9a:93:46:59:cb:5f:78:16:b1: + 67:3e:42:0b:df:28:d9:b0:ad:98:20:be:43:7c:d1:5e:1a:09: + 17:24:8d:7b:5d:95:e9:ab:c1:60:ab:5b:18:64:80:fb:ad:e0: + 06:7d:1d:ca:59:b8:f3:78:29:67:c6:56:1d:af:b6:b5:74:2a: + 76:a1:3f:fb:75:30:9f:94:5e:3b:a5:60:f3:cb:5c:0c:e2:0e: + c9:60:f8:c9:1f:16:8a:26:dd:e7:27:7f:eb:25:a6:8a:bd:b8: + 2d:36:10:9a:b1:58:4d:9a:68:4f:60:54:e5:f6:46:13:8e:88: + ac:bc:21:42:12:ad:c6:4a:89:7d:9b:c1:d8:2d:e9:96:03:f4: + a2:74:0c:bc:00:1d:bf:d6:37:25:67:b4:72:8b:af:85:bd:ea: + 2a:03:8f:cc:fb:3c:44:24:82:e2:01:a5:0b:59:b6:34:8d:32: + 0b:12:0d:eb:27:c2:fd:41:d7:40:3c:72:46:29:c0:8c:ea:ba: + 0f:f1:06:93:2e:f7:9c:a8:f4:60:3e:a3:f1:38:5e:8e:13:c1: + b3:3a:97:87:3f:92:ca:78:a9:1c:af:d0:b0:1b:26:1e:be:70: + ec:7a:f5:33:98:ea:5c:ff:2b:0b:04:4e:43:dd:63:7e:0e:a7: + 4e:78:03:95:3e:d4:2d:30:95:11:10:28:2e:bf:a0:02:3e:ff: + 5e:59:d3:05:0e:95:5f:53:45:ef:6b:87:d5:48:cd:16:a6:96: + 83:e1:df:b3:06:f3:c1:14:db:a7:ec:1c:8b:5d:90:90:0d:72: + 51:e7:61:f9:14:ca:af:83:8f:bf:af:b1:0a:59:5d:dc:5c:d7: + e4:96:ad:5b:60:1d:da:ae:97:b2:39:d9:06:f5:76:00:13:f8: + 68:4c:21:b0:35:c4:dc:55:b2:c9:c1:41:5a:1c:89:c0:8c:6f: + 74:a0:6b:33:4d:b5:01:28:fd:ad:ad:89:17:3b:a6:9a:84:bc: + eb:8c:ea:c4:71:24:a8:ba:29:f9:08:b2:27:56:35:32:5f:ea: + 39:fb:31:9a:d5:19:cc:f0 +SHA1 Fingerprint=6D:0A:5F:F7:B4:23:06:B4:85:B3:B7:97:64:FC:AC:75:F5:33:F2:93 +-----BEGIN CERTIFICATE----- +MIIFbDCCA1SgAwIBAgIUPgNJgXUWdDGOTKvVxZAplsU5EN0wDQYJKoZIhvcNAQEL +BQAwTjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwi +Q29tbVNjb3BlIFB1YmxpYyBUcnVzdCBSU0EgUm9vdC0wMTAeFw0yMTA0MjgxNjQ1 +NTRaFw00NjA0MjgxNjQ1NTNaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21t +U2NvcGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgUlNBIFJvb3Qt +MDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwSGWjDR1C45FtnYSk +YZYSwu3D2iM0GXb26v1VWvZVAVMP8syMl0+5UMuzAURWlv2bKOx7dAvnQmtVzslh +suitQDy6uUEKBU8bJoWPQ7VAtYXR1HHcg0Hz9kXHgKKEUJdGzqAMxGBWBB0HW0al +DrJLpA6lfO741GIDuZNqihS4cPgugkY4Iw50x2tBt9Apo52AsH53k2NC+zSDO3Oj +WiE260f6GBfZumbCk6SP/F2krfxQapWsvCQz0b2If4b19bJzKo98rwjyGpg/qYFl +P8GMicWWMJoKz/TUyDTtnS+8jTiGU+6Xn6myY5QXjQ/cZip8UlF1y5mO6D1cv547 +KI2DAg+pn3LiLCuz3GaXAEDQpFSOm117RTYm1nJD68/A6g3czhLmfTifBSeolz7p +UcZsBSjBAg/pGG3svZwG1KdJ9FQFa2ww8esD1eo9anbCyxooSU1/ZOD6K9pzg4H/ +kQO9lLvkuI6cMmPNn7togbGEW682v3fuHX/3SZtS7NJ3Wn2RnU3COS3kuoL4b/JO +Hg9O5j9ZpSPcPYeoKFgo0fEbNttPxP/hjFtyjMcmAyejOQoBqsCyMWCDIqFPEgkB +Ea801M/XrmLTBQe0MXXgDW1XT2mH+VepuhX2yFJtocucH+X8eKg1mp9BFM6ltM6U +CBwJrVbl2rZJmkrqYxhTnCwuwwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G +A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUN12mmnQywsL5x6YVEFm45P3luG0wDQYJ +KoZIhvcNAQELBQADggIBAK+nz97/4L1CjU3lIpbfaOp9TSp90K09FlxD533Ahuh6 +NWPxzIHIxgvoLlI1pKZJkGNRrDSsBTtXAOnTYtPZKdVUvhwQkZyybf5Z/Xn36lbQ +nmhUQo8mUuJM3y+Xpi/SB5io82BdS5pYV4jvguX6r2yBS5KPQJqTRlnLX3gWsWc+ +QgvfKNmwrZggvkN80V4aCRckjXtdlemrwWCrWxhkgPut4AZ9HcpZuPN4KWfGVh2v +trV0KnahP/t1MJ+UXjulYPPLXAziDslg+MkfFoom3ecnf+slpoq9uC02EJqxWE2a +aE9gVOX2RhOOiKy8IUISrcZKiX2bwdgt6ZYD9KJ0DLwAHb/WNyVntHKLr4W96ioD +j8z7PEQkguIBpQtZtjSNMgsSDesnwv1B10A8ckYpwIzqug/xBpMu95yo9GA+o/E4 +Xo4TwbM6l4c/ksp4qRyv0LAbJh6+cOx69TOY6lz/KwsETkPdY34Op054A5U+1C0w +lREQKC6/oAI+/15Z0wUOlV9TRe9rh9VIzRamloPh37MG88EU26fsHItdkJANclHn +YfkUyq+Dj7+vsQpZXdxc1+SWrVtgHdqul7I52Qb1dgAT+GhMIbA1xNxVssnBQVoc +icCMb3SgazNNtQEo/a2tiRc7ppqEvOuM6sRxJKi6KfkIsidWNTJf6jn7MZrVGczw +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-02.pem b/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-02.pem new file mode 100644 index 000000000000..b343c7765878 --- /dev/null +++ b/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-02.pem @@ -0,0 +1,134 @@ +## +## CommScope Public Trust RSA Root-02 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 54:16:bf:3b:7e:39:95:71:8d:d1:aa:00:a5:86:0d:2b:8f:7a:05:4e + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = US, O = CommScope, CN = CommScope Public Trust RSA Root-02 + Validity + Not Before: Apr 28 17:16:43 2021 GMT + Not After : Apr 28 17:16:42 2046 GMT + Subject: C = US, O = CommScope, CN = CommScope Public Trust RSA Root-02 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (4096 bit) + Modulus: + 00:e1:fa:0e:fb:68:00:12:c8:4d:d5:ac:22:c4:35: + 01:3b:c5:54:e5:59:76:63:a5:7f:eb:c1:c4:6a:98: + bd:32:8d:17:80:eb:5d:ba:d1:62:3d:25:23:19:35: + 14:e9:7f:89:a7:1b:62:3c:d6:50:e7:34:95:03:32: + b1:b4:93:22:3d:a7:e2:b1:ed:e6:7b:4e:2e:87:9b: + 0d:33:75:0a:de:aa:35:e7:7e:e5:36:98:a2:ae:25: + 9e:95:b3:32:96:a4:2b:58:1e:ef:3f:fe:62:34:48: + 51:d1:b4:8d:42:ad:60:da:49:6a:95:70:dd:d2:00: + e2:cc:57:63:02:7b:96:dd:49:97:5b:92:4e:95:d3: + f9:cb:29:1f:18:4a:f8:01:2a:d2:63:09:6e:24:e9: + 89:d2:e5:c7:22:4c:dc:73:86:47:00:aa:0d:88:8e: + ae:85:7d:4a:e9:bb:33:4f:0e:52:70:9d:95:e3:7c: + 6d:96:5b:2d:3d:5f:a1:83:46:5d:b6:e3:25:b8:7c: + a7:19:80:1c:ea:65:43:dc:91:79:36:2c:74:7c:f2: + 67:06:c9:89:c9:db:bf:da:68:bf:23:ed:dc:6b:ad: + 28:83:79:2f:ec:38:a5:0d:37:01:67:27:9a:e9:33: + d9:33:5f:37:a1:c5:f0:ab:3d:fa:78:b0:e7:2c:9f: + f6:3e:9f:60:e0:ef:48:e9:90:45:1e:05:51:78:1a: + 2c:12:2c:5c:28:ac:0d:a2:23:9e:34:8f:05:e6:a2: + 33:ce:11:77:13:d4:0e:a4:1e:42:1f:86:cd:70:fe: + d9:2e:15:3d:1d:bb:b8:f2:53:57:db:cc:c6:74:29: + 9c:18:b3:36:75:38:2e:0f:54:a1:f8:92:1f:89:96: + 4f:bb:d4:ee:9d:e9:3b:36:42:b5:0a:3b:2a:d4:64: + 79:36:10:e1:f9:91:03:2b:7b:20:54:cd:0d:19:1a: + c8:41:32:34:d1:b0:99:e1:90:1e:01:40:36:b5:b7: + fa:a9:e5:77:75:a4:22:81:5d:b0:8b:e4:27:12:0f: + 54:88:c6:db:85:74:e6:b7:c0:d7:a6:29:fa:db:de: + f3:93:97:27:04:55:2f:0a:6f:37:c5:3d:13:af:0a: + 00:a9:2c:8b:1c:81:28:d7:ef:86:31:a9:ae:f2:6e: + b8:ca:6a:2c:54:47:d8:2a:88:2e:af:c1:07:10:78: + ac:11:a2:2f:42:f0:37:c5:f2:b8:56:dd:0e:62:2d: + ce:2d:56:7e:55:f2:a7:44:f6:2b:32:f4:23:a8:47: + e8:d4:2a:01:78:cf:6a:c3:37:a8:9e:65:d2:2c:e5: + fa:ba:33:c1:06:44:f6:e6:cf:a5:0d:a7:66:08:34: + 8a:2c:f3 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + 47:D0:E7:B1:22:FF:9D:2C:F5:D9:57:60:B3:B1:B1:70:95:EF:61:7A + Signature Algorithm: sha256WithRSAEncryption + Signature Value: + 86:69:b1:4d:2f:e9:9f:4f:22:93:68:8e:e4:21:99:a3:ce:45: + 53:1b:73:44:53:00:81:61:cd:31:e3:08:ba:81:28:28:7a:92: + b9:b6:a8:c8:43:9e:c7:13:26:4d:c2:d8:e5:55:9c:92:5d:50: + d8:c2:2b:db:fe:e6:a8:97:cf:52:3a:24:c3:65:64:5c:47:31: + a3:65:35:13:c3:93:b9:f7:f9:51:97:bb:a4:f0:62:87:c5:d6: + 06:d3:97:83:20:a9:7e:bb:b6:21:c2:a5:0d:84:00:e1:f2:27: + 10:83:ba:dd:03:81:d5:dd:68:c3:66:10:c8:d1:76:b4:b3:6f: + 29:9e:00:f9:c2:29:f5:b1:93:19:52:69:1a:2c:4c:a0:8b:e0: + 15:9a:31:2f:d3:88:95:59:6e:e5:c4:b3:50:c8:14:08:4a:9b: + 8b:13:83:b1:a4:72:b2:3b:76:33:41:dc:dc:aa:a6:07:6f:1d: + 24:12:9f:c8:76:bd:2f:d9:8e:f4:2c:ee:b7:d2:38:10:24:36: + 51:2f:e3:5c:5d:81:21:a7:da:bb:4e:ff:e6:07:a8:fe:b9:0d: + 27:6c:bb:70:5a:55:7a:13:e9:f1:2a:49:69:c7:5f:87:57:4c: + 43:79:6d:3a:65:e9:30:5c:41:ee:eb:77:a5:73:12:88:e8:bf: + 7d:ae:e5:c4:a8:1f:0d:8e:1c:6d:50:02:4f:26:18:43:de:8f: + 55:85:b1:0b:37:05:60:c9:55:39:12:04:a1:2a:cf:71:16:9f: + 36:51:49:bf:70:3b:9e:67:9c:fb:7b:79:c9:39:1c:78:ac:77: + 91:54:9a:b8:75:0a:81:52:97:e3:66:61:6b:ed:3e:38:1e:96: + 61:55:e1:91:54:8c:ed:8c:24:1f:81:c9:10:9a:73:99:2b:16: + 4e:72:00:3f:54:1b:f8:8d:ba:8b:e7:14:d6:b6:45:4f:60:ec: + 96:ae:c3:2f:02:4e:5d:9d:96:49:72:00:b2:ab:75:5c:0f:68: + 5b:1d:65:c2:5f:33:0f:1e:0f:f0:3b:86:f5:b0:4e:bb:9c:f7: + ea:25:05:dc:ad:a2:9b:4b:17:01:be:42:df:35:21:1d:ad:ab: + ae:f4:bf:ae:1f:1b:d3:e2:3b:fc:b3:72:73:1c:9b:28:90:89: + 13:3d:1d:c1:00:47:09:96:9a:38:1b:dd:b1:cf:0d:c2:b4:44: + f3:96:95:ce:32:3a:8f:34:9c:e0:17:c7:5e:ce:ae:0d:db:87: + 38:e5:3f:5b:fd:9b:19:e1:31:41:7a:70:aa:23:6b:01:e1:45: + 4c:cd:94:ce:3b:9e:2d:e7:88:02:22:f4:6e:e8:c8:ec:d6:3c: + f3:b9:b2:d7:77:7a:ac:7b +SHA1 Fingerprint=EA:B0:E2:52:1B:89:93:4C:11:68:F2:D8:9A:AC:22:4C:A3:8A:57:AE +-----BEGIN CERTIFICATE----- +MIIFbDCCA1SgAwIBAgIUVBa/O345lXGN0aoApYYNK496BU4wDQYJKoZIhvcNAQEL +BQAwTjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwi +Q29tbVNjb3BlIFB1YmxpYyBUcnVzdCBSU0EgUm9vdC0wMjAeFw0yMTA0MjgxNzE2 +NDNaFw00NjA0MjgxNzE2NDJaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21t +U2NvcGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgUlNBIFJvb3Qt +MDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDh+g77aAASyE3VrCLE +NQE7xVTlWXZjpX/rwcRqmL0yjReA61260WI9JSMZNRTpf4mnG2I81lDnNJUDMrG0 +kyI9p+Kx7eZ7Ti6Hmw0zdQreqjXnfuU2mKKuJZ6VszKWpCtYHu8//mI0SFHRtI1C +rWDaSWqVcN3SAOLMV2MCe5bdSZdbkk6V0/nLKR8YSvgBKtJjCW4k6YnS5cciTNxz +hkcAqg2Ijq6FfUrpuzNPDlJwnZXjfG2WWy09X6GDRl224yW4fKcZgBzqZUPckXk2 +LHR88mcGyYnJ27/aaL8j7dxrrSiDeS/sOKUNNwFnJ5rpM9kzXzehxfCrPfp4sOcs +n/Y+n2Dg70jpkEUeBVF4GiwSLFworA2iI540jwXmojPOEXcT1A6kHkIfhs1w/tku +FT0du7jyU1fbzMZ0KZwYszZ1OC4PVKH4kh+Jlk+71O6d6Ts2QrUKOyrUZHk2EOH5 +kQMreyBUzQ0ZGshBMjTRsJnhkB4BQDa1t/qp5Xd1pCKBXbCL5CcSD1SIxtuFdOa3 +wNemKfrb3vOTlycEVS8KbzfFPROvCgCpLIscgSjX74Yxqa7ybrjKaixUR9gqiC6v +wQcQeKwRoi9C8DfF8rhW3Q5iLc4tVn5V8qdE9isy9COoR+jUKgF4z2rDN6ieZdIs +5fq6M8EGRPbmz6UNp2YINIos8wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G +A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUR9DnsSL/nSz12Vdgs7GxcJXvYXowDQYJ +KoZIhvcNAQELBQADggIBAIZpsU0v6Z9PIpNojuQhmaPORVMbc0RTAIFhzTHjCLqB +KCh6krm2qMhDnscTJk3C2OVVnJJdUNjCK9v+5qiXz1I6JMNlZFxHMaNlNRPDk7n3 ++VGXu6TwYofF1gbTl4MgqX67tiHCpQ2EAOHyJxCDut0DgdXdaMNmEMjRdrSzbyme +APnCKfWxkxlSaRosTKCL4BWaMS/TiJVZbuXEs1DIFAhKm4sTg7GkcrI7djNB3Nyq +pgdvHSQSn8h2vS/ZjvQs7rfSOBAkNlEv41xdgSGn2rtO/+YHqP65DSdsu3BaVXoT +6fEqSWnHX4dXTEN5bTpl6TBcQe7rd6VzEojov32u5cSoHw2OHG1QAk8mGEPej1WF +sQs3BWDJVTkSBKEqz3EWnzZRSb9wO55nnPt7eck5HHisd5FUmrh1CoFSl+NmYWvt +PjgelmFV4ZFUjO2MJB+ByRCac5krFk5yAD9UG/iNuovnFNa2RU9g7Jauwy8CTl2d +lklyALKrdVwPaFsdZcJfMw8eD/A7hvWwTruc9+olBdytoptLFwG+Qt81IR2tq670 +v64fG9PiO/yzcnMcmyiQiRM9HcEARwmWmjgb3bHPDcK0RPOWlc4yOo80nOAXx17O +rg3bhzjlP1v9mxnhMUF6cKojawHhRUzNlM47ni3niAIi9G7oyOzWPPO5std3eqx7 +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/Telekom_Security_TLS_ECC_Root_2020.pem b/secure/caroot/trusted/Telekom_Security_TLS_ECC_Root_2020.pem new file mode 100644 index 000000000000..da5285d26633 --- /dev/null +++ b/secure/caroot/trusted/Telekom_Security_TLS_ECC_Root_2020.pem @@ -0,0 +1,68 @@ +## +## Telekom Security TLS ECC Root 2020 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 36:3a:96:8c:c9:5c:b2:58:cd:d0:01:5d:c5:e5:57:00 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = DE, O = Deutsche Telekom Security GmbH, CN = Telekom Security TLS ECC Root 2020 + Validity + Not Before: Aug 25 07:48:20 2020 GMT + Not After : Aug 25 23:59:59 2045 GMT + Subject: C = DE, O = Deutsche Telekom Security GmbH, CN = Telekom Security TLS ECC Root 2020 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:ce:bf:fe:57:a8:bf:d5:aa:f7:10:9a:cd:bc:d1: + 11:a2:bd:67:42:cc:90:eb:15:18:90:d9:a2:cd:0c: + 2a:25:eb:3e:4f:ce:b5:d2:8f:0f:f3:35:da:43:8b: + 02:80:be:6f:51:24:1d:0f:6b:2b:ca:9f:c2:6f:50: + 32:e5:37:20:b6:20:ff:88:0d:0f:6d:49:bb:db:06: + a4:87:90:92:94:f4:09:d0:cf:7f:c8:80:0b:c1:97: + b3:bb:35:27:c9:c2:1b + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Subject Key Identifier: + E3:72:CC:6E:95:99:47:B1:E6:B3:61:4C:D1:CB:AB:E3:BA:CD:DE:9F + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + Signature Algorithm: ecdsa-with-SHA384 + Signature Value: + 30:64:02:30:75:52:8b:b7:a4:10:4f:ae:4a:10:8b:b2:84:5b: + 42:e1:e6:2a:36:02:da:a0:6e:19:3f:25:bf:da:59:32:8e:e4: + fb:90:dc:93:64:ce:ad:b4:41:47:60:e2:cf:a7:cb:1e:02:30: + 37:41:8c:66:df:41:6b:d6:83:00:41:fd:2f:5a:f7:50:b4:67: + d1:2c:a8:71:d7:43:ca:9c:27:24:91:83:48:0d:cf:cd:f7:54: + 81:af:ec:7f:e4:67:db:b8:90:ee:dd:25 +SHA1 Fingerprint=C0:F8:96:C5:A9:3B:01:06:21:07:DA:18:42:48:BC:E9:9D:88:D5:EC +-----BEGIN CERTIFICATE----- +MIICQjCCAcmgAwIBAgIQNjqWjMlcsljN0AFdxeVXADAKBggqhkjOPQQDAzBjMQsw +CQYDVQQGEwJERTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0eSBH +bWJIMSswKQYDVQQDDCJUZWxla29tIFNlY3VyaXR5IFRMUyBFQ0MgUm9vdCAyMDIw +MB4XDTIwMDgyNTA3NDgyMFoXDTQ1MDgyNTIzNTk1OVowYzELMAkGA1UEBhMCREUx +JzAlBgNVBAoMHkRldXRzY2hlIFRlbGVrb20gU2VjdXJpdHkgR21iSDErMCkGA1UE +AwwiVGVsZWtvbSBTZWN1cml0eSBUTFMgRUNDIFJvb3QgMjAyMDB2MBAGByqGSM49 +AgEGBSuBBAAiA2IABM6//leov9Wq9xCazbzREaK9Z0LMkOsVGJDZos0MKiXrPk/O +tdKPD/M12kOLAoC+b1EkHQ9rK8qfwm9QMuU3ILYg/4gND21Ju9sGpIeQkpT0CdDP +f8iAC8GXs7s1J8nCG6NCMEAwHQYDVR0OBBYEFONyzG6VmUex5rNhTNHLq+O6zd6f +MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMAoGCCqGSM49BAMDA2cA +MGQCMHVSi7ekEE+uShCLsoRbQuHmKjYC2qBuGT8lv9pZMo7k+5Dck2TOrbRBR2Di +z6fLHgIwN0GMZt9Ba9aDAEH9L1r3ULRn0SyocddDypwnJJGDSA3PzfdUga/sf+Rn +27iQ7t0l +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/Telekom_Security_TLS_RSA_Root_2023.pem b/secure/caroot/trusted/Telekom_Security_TLS_RSA_Root_2023.pem new file mode 100644 index 000000000000..69bbcdd0e322 --- /dev/null +++ b/secure/caroot/trusted/Telekom_Security_TLS_RSA_Root_2023.pem @@ -0,0 +1,138 @@ +## +## Telekom Security TLS RSA Root 2023 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 21:9c:54:2d:e8:f6:ec:71:77:fa:4e:e8:c3:70:57:97 + Signature Algorithm: sha384WithRSAEncryption + Issuer: C = DE, O = Deutsche Telekom Security GmbH, CN = Telekom Security TLS RSA Root 2023 + Validity + Not Before: Mar 28 12:16:45 2023 GMT + Not After : Mar 27 23:59:59 2048 GMT + Subject: C = DE, O = Deutsche Telekom Security GmbH, CN = Telekom Security TLS RSA Root 2023 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (4096 bit) + Modulus: + 00:ed:35:a1:81:80:f3:cb:4a:69:5b:c2:fb:51:83: + ae:26:fd:e1:6e:f3:81:12:7d:71:40:ff:87:75:42: + 29:21:ed:81:52:2c:df:12:c1:19:84:89:c1:bd:c5: + 28:d5:d5:4b:6c:44:d6:4c:db:07:96:4a:55:7a:ca: + 36:82:04:36:a8:a5:fc:27:f6:49:f1:d5:72:9e:91: + f9:23:d6:70:7b:bb:f5:9b:c1:ec:93:cf:19:ea:65: + 7e:88:70:a0:73:fc:f6:ff:b5:56:62:e1:73:6a:34: + 98:3e:82:b8:ac:95:53:f4:01:a0:27:07:72:a3:00: + 53:a0:e4:b2:ab:83:38:57:33:25:94:9f:be:48:1d: + 98:e1:a3:ba:9e:5c:cd:04:71:51:7d:75:78:ab:f3: + 59:aa:c4:e0:60:be:8f:83:52:b8:75:1a:41:35:ed: + bc:f3:3a:63:e9:a9:14:45:d7:e6:52:d1:6e:d2:de: + bc:e3:f5:0b:3b:e6:e0:c4:bd:43:64:13:a6:ce:f4: + 98:37:6c:8a:95:a8:97:c8:47:0f:f0:5e:10:8b:e7: + 1d:1c:fe:b1:3b:a0:05:33:68:05:41:82:c1:03:2b: + 01:c8:e7:8f:4d:ab:e8:b5:f6:cd:6b:44:b5:e7:dd: + 8b:ec:ea:25:b4:00:22:57:4d:b0:b1:b2:31:c1:16: + ce:ff:fd:14:84:b7:47:fa:b2:f1:70:de:db:8b:6c: + 36:58:a4:7c:b3:11:d1:c3:77:7f:5f:b6:25:e0:0d: + c5:d2:b3:f9:b8:b8:77:db:37:71:71:47:e3:60:18: + 4f:24:b6:75:37:78:b9:a3:62:af:bd:c9:72:8e:2f: + cc:bb:ae:db:e4:15:52:19:07:33:fb:6a:b7:2d:4b: + 90:28:82:73:fe:18:8b:35:8d:db:a7:04:6a:be:ea: + c1:4d:36:3b:16:36:91:32:ef:b6:40:89:91:43:e0: + f2:a2:ab:04:2e:e6:f2:4c:0e:16:34:20:ac:87:c1: + 2d:7e:c9:66:47:17:14:11:a4:f3:f7:a1:24:89:ab: + d8:1a:c8:a1:5c:b1:a3:f7:8c:6d:c8:01:c9:4f:c9: + ec:c4:fc:ac:51:33:d1:c8:83:d1:c9:9f:1d:d4:47: + 34:29:3e:cb:b0:0e:fa:83:0b:28:58:e5:29:dc:3f: + 7c:a8:9f:c9:b6:0a:bb:a6:e8:46:16:0f:96:e5:7b: + e4:6a:7a:48:6d:76:98:05:a5:dc:6d:1e:42:1e:42: + da:1a:e0:52:f7:b5:83:c0:1a:7b:78:35:2c:38:f5: + 1f:fd:49:a3:2e:d2:59:63:bf:80:b0:8c:93:73:cb: + 35:a6:99:95:22:61:65:03:60:fb:2f:93:4b:fa:9a: + 9c:80:3b + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + B6:A7:97:82:3D:74:85:9B:F7:3C:9F:93:9A:95:79:75:52:8C:6D:47 + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Authority Key Identifier: + B6:A7:97:82:3D:74:85:9B:F7:3C:9F:93:9A:95:79:75:52:8C:6D:47 + Signature Algorithm: sha384WithRSAEncryption + Signature Value: + a8:cc:61:a6:be:75:9e:15:50:a4:6b:fb:a8:70:45:7c:ba:7e: + b1:5a:fc:5b:23:fa:0a:77:f8:98:71:82:0c:6d:e0:5e:46:aa: + 93:f4:1e:a0:c3:e1:93:db:4b:ad:b2:a6:5d:ab:b0:d4:62:cb: + 5e:bb:66:f5:2d:ee:97:40:3c:62:eb:5e:d6:14:d6:8c:e2:96: + 8b:41:69:93:35:e6:b9:99:6b:62:b4:a1:17:66:34:a6:6b:63: + c6:b9:4e:f2:22:e9:58:0d:56:41:d1:fa:0c:4a:f0:33:cd:3b: + bb:6d:21:3a:ae:8e:72:b5:c3:4a:fb:e9:7d:e5:b1:9b:86:ee: + e2:e0:7d:b4:f7:32:fd:22:84:f1:85:c9:37:79:e9:b5:3f:bf: + 5c:e4:74:b2:8f:11:62:00:dd:18:66:a1:d9:7b:23:5f:f1:8e: + d5:67:e8:54:da:5b:3a:6b:36:6f:f9:81:b1:33:47:33:77:40: + f9:52:aa:dd:d4:83:cf:85:78:99:9a:93:b9:73:67:42:46:11: + 21:ea:fe:0a:a9:1b:1a:65:69:b3:8f:ae:16:b6:f6:4b:56:b2: + 2d:f9:a5:c8:ec:3b:62:a3:ed:6b:d0:4e:d5:40:09:a4:1f:98: + d7:3a:a5:92:59:20:e4:b0:7d:cd:5b:73:68:bd:6d:c4:a2:13: + 0e:67:19:b8:8d:42:7e:6c:0c:9a:6e:a0:24:2d:d5:45:1b:dc: + c4:02:14:fe:85:5b:65:97:ca:4e:90:50:08:7a:42:35:f9:ea: + c2:66:d4:f8:01:ae:1e:b4:be:c3:a8:ef:fe:76:9a:a2:a6:1f: + 46:f6:84:ed:fc:db:ce:c4:02:ce:77:48:2c:8c:b2:ec:c3:00: + a3:ec:2c:55:18:c1:7e:19:ee:e1:2f:f2:ad:83:9b:9e:ab:19: + df:c6:8a:2f:8c:77:e5:b7:05:ec:3b:c1:ec:be:86:b3:86:bc: + c0:f7:dc:e7:ea:5b:ae:b2:cc:b5:35:86:4b:d0:e2:3f:b6:d8: + f8:0e:00:ee:5d:e3:f7:8d:58:ff:cf:8b:37:e9:63:5f:6e:f7: + 09:71:36:c2:12:5d:57:f2:c8:b4:cd:f3:ee:02:df:11:dc:6a: + b9:57:84:1d:59:4d:8c:ce:c8:0e:23:c2:b7:26:9a:10:14:71: + fe:93:b2:8a:b8:80:f0:0e:10:9e:d3:a8:50:0c:37:82:2f:ea: + e0:8a:9d:e1:2c:39:ff:b5:b4:73:00:e4:f7:48:a6:73:ac:bf: + b2:de:77:04:87:b4:a3:cd:9b:35:24:37:fa:90:93:13:81:42: + c6:98:26:75:37:66:41:10:ac:bb:f5:94:e3:c2:31:2b:ad:e7: + 23:56:cc:35:25:92:b3:50 +SHA1 Fingerprint=54:D3:AC:B3:BD:57:56:F6:85:9D:CE:E5:C3:21:E2:D4:AD:83:D0:93 +-----BEGIN CERTIFICATE----- +MIIFszCCA5ugAwIBAgIQIZxULej27HF3+k7ow3BXlzANBgkqhkiG9w0BAQwFADBj +MQswCQYDVQQGEwJERTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0 +eSBHbWJIMSswKQYDVQQDDCJUZWxla29tIFNlY3VyaXR5IFRMUyBSU0EgUm9vdCAy +MDIzMB4XDTIzMDMyODEyMTY0NVoXDTQ4MDMyNzIzNTk1OVowYzELMAkGA1UEBhMC +REUxJzAlBgNVBAoMHkRldXRzY2hlIFRlbGVrb20gU2VjdXJpdHkgR21iSDErMCkG +A1UEAwwiVGVsZWtvbSBTZWN1cml0eSBUTFMgUlNBIFJvb3QgMjAyMzCCAiIwDQYJ +KoZIhvcNAQEBBQADggIPADCCAgoCggIBAO01oYGA88tKaVvC+1GDrib94W7zgRJ9 +cUD/h3VCKSHtgVIs3xLBGYSJwb3FKNXVS2xE1kzbB5ZKVXrKNoIENqil/Cf2SfHV +cp6R+SPWcHu79ZvB7JPPGeplfohwoHP89v+1VmLhc2o0mD6CuKyVU/QBoCcHcqMA +U6DksquDOFczJZSfvkgdmOGjup5czQRxUX11eKvzWarE4GC+j4NSuHUaQTXtvPM6 +Y+mpFEXX5lLRbtLevOP1Czvm4MS9Q2QTps70mDdsipWol8hHD/BeEIvnHRz+sTug +BTNoBUGCwQMrAcjnj02r6LX2zWtEtefdi+zqJbQAIldNsLGyMcEWzv/9FIS3R/qy +8XDe24tsNlikfLMR0cN3f1+2JeANxdKz+bi4d9s3cXFH42AYTyS2dTd4uaNir73J +co4vzLuu2+QVUhkHM/tqty1LkCiCc/4YizWN26cEar7qwU02OxY2kTLvtkCJkUPg +8qKrBC7m8kwOFjQgrIfBLX7JZkcXFBGk8/ehJImr2BrIoVyxo/eMbcgByU/J7MT8 +rFEz0ciD0cmfHdRHNCk+y7AO+oMLKFjlKdw/fKifybYKu6boRhYPluV75Gp6SG12 +mAWl3G0eQh5C2hrgUve1g8Aae3g1LDj1H/1Joy7SWWO/gLCMk3PLNaaZlSJhZQNg ++y+TS/qanIA7AgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtqeX +gj10hZv3PJ+TmpV5dVKMbUcwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS2 +p5eCPXSFm/c8n5OalXl1UoxtRzANBgkqhkiG9w0BAQwFAAOCAgEAqMxhpr51nhVQ +pGv7qHBFfLp+sVr8WyP6Cnf4mHGCDG3gXkaqk/QeoMPhk9tLrbKmXauw1GLLXrtm +9S3ul0A8Yute1hTWjOKWi0FpkzXmuZlrYrShF2Y0pmtjxrlO8iLpWA1WQdH6DErw +M807u20hOq6OcrXDSvvpfeWxm4bu4uB9tPcy/SKE8YXJN3nptT+/XOR0so8RYgDd +GGah2XsjX/GO1WfoVNpbOms2b/mBsTNHM3dA+VKq3dSDz4V4mZqTuXNnQkYRIer+ +CqkbGmVps4+uFrb2S1ayLfmlyOw7YqPta9BO1UAJpB+Y1zqlklkg5LB9zVtzaL1t +xKITDmcZuI1CfmwMmm6gJC3VRRvcxAIU/oVbZZfKTpBQCHpCNfnqwmbU+AGuHrS+ +w6jv/naaoqYfRvaE7fzbzsQCzndILIyy7MMAo+wsVRjBfhnu4S/yrYObnqsZ38aK +L4x35bcF7DvB7L6Gs4a8wPfc5+pbrrLMtTWGS9DiP7bY+A4A7l3j941Y/8+LN+lj +X273CXE2whJdV/LItM3z7gLfEdxquVeEHVlNjM7IDiPCtyaaEBRx/pOyiriA8A4Q +ntOoUAw3gi/q4Iqd4Sw5/7W0cwDk90imc6y/st53BIe0o82bNSQ3+pCTE4FCxpgm +dTdmQRCsu/WU48IxK63nI1bMNSWSs1A= +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/TrustAsia_Global_Root_CA_G3.pem b/secure/caroot/trusted/TrustAsia_Global_Root_CA_G3.pem new file mode 100644 index 000000000000..72e8d614f96a --- /dev/null +++ b/secure/caroot/trusted/TrustAsia_Global_Root_CA_G3.pem @@ -0,0 +1,138 @@ +## +## TrustAsia Global Root CA G3 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 64:f6:0e:65:77:61:6a:ab:3b:b4:ea:85:84:bb:b1:89:b8:71:93:0f + Signature Algorithm: sha384WithRSAEncryption + Issuer: C = CN, O = "TrustAsia Technologies, Inc.", CN = TrustAsia Global Root CA G3 + Validity + Not Before: May 20 02:10:19 2021 GMT + Not After : May 19 02:10:19 2046 GMT + Subject: C = CN, O = "TrustAsia Technologies, Inc.", CN = TrustAsia Global Root CA G3 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (4096 bit) + Modulus: + 00:c0:31:82:61:92:e4:94:1b:0a:2a:65:d0:be:06: + a9:87:3b:51:12:ea:70:41:ae:e2:fb:74:ea:0a:8d: + b9:b3:4c:dc:8f:b7:13:52:4f:54:18:e1:2c:73:95: + 91:c5:66:3b:6a:cf:ac:63:6d:87:53:f0:f7:f1:39: + b7:a0:43:63:b0:c4:03:5d:57:a9:e7:44:ce:c4:a1: + 83:65:f6:50:3e:b1:7e:16:b8:3a:8a:02:d0:96:1f: + 00:cd:05:21:ef:06:6d:dd:21:9c:19:43:45:a1:c5: + e8:80:ca:c2:ad:40:62:17:06:c6:aa:bc:f3:d6:e6: + fc:50:7e:66:42:1f:3c:8b:a6:79:79:86:40:35:9f: + 20:ef:3f:eb:8b:47:1f:8f:8e:c5:d4:8e:b6:2c:c9: + 44:04:e3:d4:43:75:3f:d5:3f:af:1c:cc:7e:46:5f: + ac:df:64:10:8a:ef:46:f0:90:f0:0f:2d:f4:88:0b: + b1:29:aa:af:85:aa:49:58:a8:bf:63:a0:38:91:e6: + b3:e6:77:68:c4:f9:2a:19:84:bb:0e:e1:f5:af:89: + ec:a5:2f:50:20:74:1e:12:41:73:1e:24:d9:ca:ce: + 2c:a1:59:35:c0:c8:1d:46:27:61:5a:8f:f9:4d:d3: + 72:79:66:1e:9f:15:90:21:2d:fd:ed:8b:56:70:03: + 4a:49:3e:7f:69:31:12:69:c7:1e:5c:ca:7a:13:8b: + e8:e6:f5:60:0f:cc:93:2c:84:7f:f1:fc:6a:fc:9b: + 47:9d:db:ad:88:3d:f3:76:75:33:d7:4b:a4:c8:8b: + f9:f5:43:58:4f:cb:c8:03:54:8f:a5:85:78:04:1a: + f3:73:f2:d7:87:1d:41:9f:e7:d8:17:ce:1a:9c:0f: + 4a:fc:dc:44:68:54:68:e2:41:3c:fe:2c:84:86:37: + 3c:cd:3f:2f:a2:db:e7:f7:54:03:5f:59:d3:f7:91: + 78:c7:8b:77:6a:16:e5:49:85:90:45:72:70:2f:91: + 5d:f8:3e:65:40:0b:19:99:c9:26:20:5a:68:c1:35: + bf:4f:a7:51:f1:d8:11:2b:5b:e0:9a:9e:28:3b:0a: + 3a:0a:1f:c1:81:e5:2e:f0:a6:b9:69:a5:88:94:e6: + 6b:13:7f:d1:64:3f:3d:9c:70:46:e5:a2:85:7b:58: + 84:27:dc:c4:80:3e:67:9a:9a:c7:9a:31:0e:30:ec: + e6:17:40:95:d9:45:ed:01:96:aa:bf:0c:f3:4b:d1: + 63:f7:13:58:c0:b8:f3:fa:67:dd:9b:7d:6d:4a:ff: + 32:4c:b5:25:3b:ff:1c:67:0f:85:22:59:05:91:91: + 41:77:81:d0:85:4c:87:10:71:ff:9e:43:1b:ae:95: + 75:2d:81 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Authority Key Identifier: + 40:E4:E4:F2:23:EF:38:CA:B0:AE:57:7F:F2:21:30:16:34:DB:BC:92 + X509v3 Subject Key Identifier: + 40:E4:E4:F2:23:EF:38:CA:B0:AE:57:7F:F2:21:30:16:34:DB:BC:92 + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + Signature Algorithm: sha384WithRSAEncryption + Signature Value: + 26:3b:51:e1:4d:38:f3:32:18:b4:b4:5e:e1:65:5e:c4:94:4f: + d4:a7:61:a3:f8:c0:cf:33:01:02:e9:c3:aa:35:0f:f1:94:13: + 77:77:35:9e:2d:56:51:44:6e:e1:c6:2e:28:1e:ff:da:ec:47: + cd:97:44:17:f7:e0:4c:c2:e1:7c:7c:32:7a:66:c8:5a:b6:5c: + 53:45:57:5a:45:d4:05:99:2f:2e:23:55:ee:63:68:df:d3:1b: + 78:a7:12:94:06:00:75:0d:72:84:e9:2e:bc:5a:6a:d5:de:2f: + 59:c7:a3:ec:d2:87:66:db:b7:54:b5:24:ab:f4:43:78:db:4b: + 04:c4:6f:dd:e6:3e:66:3e:29:f2:4b:68:71:22:87:a0:f8:b1: + 33:63:76:e3:0d:85:72:44:22:55:3f:1c:7c:e9:fc:b8:15:e8: + 52:fa:aa:3e:a3:21:39:35:74:89:a6:6a:c2:39:fa:78:cf:b6: + ac:e7:e7:d6:56:ff:23:92:2e:50:0b:a9:b5:07:33:f4:38:5f: + a4:49:a6:cb:65:70:76:e8:0a:85:80:4b:36:3d:33:f7:95:54: + 75:25:da:ac:c4:73:82:65:e9:52:f5:5c:fd:38:95:02:6a:69: + 30:c5:1c:0a:57:07:ae:22:a4:2c:f9:c5:41:b7:b8:ec:9f:4f: + 48:00:f9:01:04:55:cc:ac:f9:32:31:c4:75:95:06:a0:7f:d1: + 8d:27:dd:b3:a9:a4:72:87:fe:59:8b:9a:7a:74:16:dd:16:a5: + 62:29:eb:3a:96:dc:8b:a7:68:59:d3:eb:77:91:39:f8:d7:cb: + d9:8f:5f:5a:27:01:7d:5d:68:19:62:d8:c8:cd:f4:b7:72:47: + be:5b:97:ce:f2:ad:a2:99:93:ad:94:cb:93:f6:12:09:95:b6: + ab:d7:3b:d0:3f:11:cb:30:16:2e:79:80:e4:67:81:2d:5d:ed: + 70:78:b6:60:59:ac:e1:5d:45:63:8f:c8:df:72:68:5b:ea:1d: + b8:01:f1:7e:fb:e7:8a:b3:e3:54:a0:38:09:e0:3c:de:42:f2: + c2:ed:2e:9b:f3:1f:35:b6:36:d8:e3:80:a1:8b:cd:99:64:0f: + c2:aa:ab:b1:ca:f5:6f:9e:43:8d:84:54:99:b3:6e:c0:12:66: + d8:70:10:f1:06:35:33:43:a8:9c:2e:ba:14:31:ce:10:7f:1c: + 86:e3:8f:d2:d5:f8:77:ec:9b:ab:f1:2f:63:d9:42:5f:e0:67: + 81:64:91:f1:97:2f:fc:6e:26:f6:33:f8:d3:b5:f8:c4:62:ab: + 31:51:25:02:7a:f8:dd:6b:65:d5:6d:4d:30:c8:65:ba:68:14: + 65:ac:27:0b:74:8a:f2:87 +SHA1 Fingerprint=63:CF:B6:C1:27:2B:56:E4:88:8E:1C:23:9A:B6:2E:81:47:24:C3:C7 +-----BEGIN CERTIFICATE----- +MIIFpTCCA42gAwIBAgIUZPYOZXdhaqs7tOqFhLuxibhxkw8wDQYJKoZIhvcNAQEM +BQAwWjELMAkGA1UEBhMCQ04xJTAjBgNVBAoMHFRydXN0QXNpYSBUZWNobm9sb2dp +ZXMsIEluYy4xJDAiBgNVBAMMG1RydXN0QXNpYSBHbG9iYWwgUm9vdCBDQSBHMzAe +Fw0yMTA1MjAwMjEwMTlaFw00NjA1MTkwMjEwMTlaMFoxCzAJBgNVBAYTAkNOMSUw +IwYDVQQKDBxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSQwIgYDVQQDDBtU +cnVzdEFzaWEgR2xvYmFsIFJvb3QgQ0EgRzMwggIiMA0GCSqGSIb3DQEBAQUAA4IC +DwAwggIKAoICAQDAMYJhkuSUGwoqZdC+BqmHO1ES6nBBruL7dOoKjbmzTNyPtxNS +T1QY4SxzlZHFZjtqz6xjbYdT8PfxObegQ2OwxANdV6nnRM7EoYNl9lA+sX4WuDqK +AtCWHwDNBSHvBm3dIZwZQ0WhxeiAysKtQGIXBsaqvPPW5vxQfmZCHzyLpnl5hkA1 +nyDvP+uLRx+PjsXUjrYsyUQE49RDdT/VP68czH5GX6zfZBCK70bwkPAPLfSIC7Ep +qq+FqklYqL9joDiR5rPmd2jE+SoZhLsO4fWvieylL1AgdB4SQXMeJNnKziyhWTXA +yB1GJ2Faj/lN03J5Zh6fFZAhLf3ti1ZwA0pJPn9pMRJpxx5cynoTi+jm9WAPzJMs +hH/x/Gr8m0ed262IPfN2dTPXS6TIi/n1Q1hPy8gDVI+lhXgEGvNz8teHHUGf59gX +zhqcD0r83ERoVGjiQTz+LISGNzzNPy+i2+f3VANfWdP3kXjHi3dqFuVJhZBFcnAv +kV34PmVACxmZySYgWmjBNb9Pp1Hx2BErW+Canig7CjoKH8GB5S7wprlppYiU5msT +f9FkPz2ccEblooV7WIQn3MSAPmeamseaMQ4w7OYXQJXZRe0Blqq/DPNL0WP3E1jA +uPP6Z92bfW1K/zJMtSU7/xxnD4UiWQWRkUF3gdCFTIcQcf+eQxuulXUtgQIDAQAB +o2MwYTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFEDk5PIj7zjKsK5Xf/Ih +MBY027ySMB0GA1UdDgQWBBRA5OTyI+84yrCuV3/yITAWNNu8kjAOBgNVHQ8BAf8E +BAMCAQYwDQYJKoZIhvcNAQEMBQADggIBACY7UeFNOPMyGLS0XuFlXsSUT9SnYaP4 +wM8zAQLpw6o1D/GUE3d3NZ4tVlFEbuHGLige/9rsR82XRBf34EzC4Xx8MnpmyFq2 +XFNFV1pF1AWZLy4jVe5jaN/TG3inEpQGAHUNcoTpLrxaatXeL1nHo+zSh2bbt1S1 +JKv0Q3jbSwTEb93mPmY+KfJLaHEih6D4sTNjduMNhXJEIlU/HHzp/LgV6FL6qj6j +ITk1dImmasI5+njPtqzn59ZW/yOSLlALqbUHM/Q4X6RJpstlcHboCoWASzY9M/eV *** 84 LINES SKIPPED *** From nobody Tue Feb 13 21:34:01 2024 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 4TZF2L1fJrz59qQj; Tue, 13 Feb 2024 21:34:02 +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 4TZF2K71YRz4Yv0; Tue, 13 Feb 2024 21:34:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707860042; 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=1FwnwKanWX0R1yxT7B1K/8icIRBlpbX7dBVIuxJbeps=; b=TyyWL3H2rihDDXFKVbAuk47W04Tl8QUnFJeuW69T4BHRcdBSpXPU7W/IdXnYqznJJjXA5d KaM6v/PCDpPztev2DBIpWty8vkLLcaJK1u7qJ1jIo2JKGlGwzj5jwyPO+54/iG/reHQZKa z3vZlTTTDO9X1qB5jIzA2rgQKHZwN70aM7qHrT0QwjzwJ7DmeML0rsCmVrOZRj4bLm3LVW KVgAGvlEpuwNAVzVKh30TqmauuuA3ZZ6nDkMOrMLHehbaT6rXCwV2Hlyp7FPmbovwddP0E BiH4ZYy2RXFjzG7bFzDggAcyQFCIsJm/992YJBHeKdZAcpZrnZnNQXH1wH87Xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707860042; a=rsa-sha256; cv=none; b=IVE8dToVY+OSCxDjstAaDl+Fz3k5rgG4NxdjZNSgcy09MEtapgItGj7U3k5uMyGJ2JI0pC axSxAH1lBkWUpLts1WzH13Y4bCvv9gSlOOCMnmYDYC4+h7rxYNhadCy7iZzdDLPxQofKlf ERY6E/32jt/FBrPetpUTQVyYvsR7XZuIAO0UalIbdgqoOFKi/0aBkkQq7S/WK9+UU5Wa5E wFqDyPqAbjU8I01SAJh/ttOOp4mWb8kTinzo5C3rs7/MBpNTvoeSC/GVXzHg0pYQmvS519 H/Ly7QmqfMrlZqU2bthE8q1yJSzbyU6W/Q/a+DABTeKPTXGuLuWHRbYTzNrGWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707860042; 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=1FwnwKanWX0R1yxT7B1K/8icIRBlpbX7dBVIuxJbeps=; b=guDF8f3BHyMBHor9/DwLA8AursJ3GOxFgfZrURQtz8iPDKaFk3XUZC5StR46qTXpu/myxb eIkGw5kwvY/YbdroCSA9FhA5DMeCCJFIgp5uLzIInt4mnEk8cJ3gwnpZZLakXBvvFtkowl HuhDTHA+ummuueHnsydFvWgkxxCwByE2n3jX7idne4fbRA9Qkf26llPBVgIlEYSnXC4em1 O6vWWS1cVbFCg1RvovwXjJAUn71WSYBgrAik3naIvqI3p6JmqRsLQ4DAVwH1XrUEz0EK6+ 9Kjt6v90TYtYFuwziqwnvIrmmuCjOILTeao0+511iezFBeYKUWjqtyKfuMUvJg== 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 4TZF2K6616zX9W; Tue, 13 Feb 2024 21:34:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41DLY1xx026042; Tue, 13 Feb 2024 21:34:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DLY1cE026039; Tue, 13 Feb 2024 21:34:01 GMT (envelope-from git) Date: Tue, 13 Feb 2024 21:34:01 GMT Message-Id: <202402132134.41DLY1cE026039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 17167f757e0a - stable/13 - pf: uncomment counter asserts after mem leak fix 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 17167f757e0a14ac487c608459aaba6d10f43f12 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=17167f757e0a14ac487c608459aaba6d10f43f12 commit 17167f757e0a14ac487c608459aaba6d10f43f12 Author: Igor Ostapenko AuthorDate: 2024-01-30 21:04:57 +0000 Commit: Kristof Provost CommitDate: 2024-02-13 21:31:04 +0000 pf: uncomment counter asserts after mem leak fix Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D43657 (cherry picked from commit 9d784da3a7af9b9b04536c2e97459a7d9f92e364) --- sys/netpfil/pf/pf_ioctl.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 81b766cb7f6a..98b5ce318596 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -5863,13 +5863,8 @@ pf_unload_vnet(void) V_pf_allrulecount--; LIST_REMOVE(V_pf_rulemarker, allrulelist); - /* - * There are known pf rule leaks when running the test suite. - */ -#ifdef notyet MPASS(LIST_EMPTY(&V_pf_allrulelist)); MPASS(V_pf_allrulecount == 0); -#endif PF_RULES_WUNLOCK(); From nobody Tue Feb 13 21:48:27 2024 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 4TZFLz550lz59s4b; Tue, 13 Feb 2024 21:48:27 +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 4TZFLz4q1dz4brr; Tue, 13 Feb 2024 21:48:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707860907; 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=ENu7E6Gn1tnZIOPSgxrduS3xdOpddTLw6NER3A5K2U0=; b=Z9DVjbCWe3hmzrp+o2ZSUE1TSsQbgkDYuSajHXBrVRA+n20z31UjcL7KlED+23w5FZ18FM Vt3NHNtyECj8uP+xYcjug07fJGoY8WnP2F4QRlwY2dbax3Jw7ebmZazLg2JzoD7zZZ6it2 VV98WwK3XOE0jYV2JyFrAuM6HsEkb9e/5oVoAN0oIRW2kT8ypLOzG+J948bByE3/oGNrjL WMmV0+IkGZjn/pGoORs2i16IAQgHKBvZMCViuSehGsONtxi5LXpgE/OKo5zcM/jheP++5V lprAPz18vLthdzYpbDuAKTQfdcmq4oRB559VpLnUyvob/nGt+x1Y04rDcJDDgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707860907; a=rsa-sha256; cv=none; b=AKLNp2Wg6hQzufaMcBYaASOqUDo/LamnPm3nv7ksWoLYgDkhBhIBe9zbEm4iOrE0fuDr8P atToE8iSF2jLN8JjIH2DVhVbi2hDMnxSrQWv1Cz5MxSH/UBn90tcDFpfmPp3m86Kxnnxwz 2iMfrBtJHuedXHEIugU40bc+asdFAcTyL5NVro8mOlEaPUW0bTunzR4ZniFl8/x13ZaBxb o8UtspkzyfA9r9N83naQzuxPvJDO5jWGNQBSb17r8XxV7ZFvZG6pERml5v62NOIWMiPP2d cV9ROfkbbh0LoksIr9Qu9oBzlDwXhhnhx3hXAvjmorWTeUk/DeZtWNnmygsMxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707860907; 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=ENu7E6Gn1tnZIOPSgxrduS3xdOpddTLw6NER3A5K2U0=; b=WlgyFLi6plm2PuaFIKIgS57L5S8tgyVkR3ZC4NbgJ+ja7NB/xHl5h1ZyjEu8PBSgnxPaLK +3TQck8j/eV/RCskJS16ERgd2hMzI8o20z2+0niwjZ8Uk/p/dhpB+xKgPOjdpZnZAgi3HM xWJZ2esgtc/3cyG8lOLw3T2PP7OKxgM4z5b2+qey/xSfHrJJaV+TzcBDzMD/nDmbjFStqs eFcU78JsPtBtvYya2au1d5byeGFxwaahNh6p8Kmt5gfbRzpi7eZajyTbRulFPu7901N8Du VGrGl2ICXPaZgZjalaNGwc6qLyRWJ5FcVOstJCkmtiZJxxoCH1N3SC3ISP1rjw== 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 4TZFLz3mFczXJS; Tue, 13 Feb 2024 21:48:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41DLmR8t043030; Tue, 13 Feb 2024 21:48:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DLmRm8043027; Tue, 13 Feb 2024 21:48:27 GMT (envelope-from git) Date: Tue, 13 Feb 2024 21:48:27 GMT Message-Id: <202402132148.41DLmRm8043027@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gregory Neil Shapiro Subject: git: b36ddb27b3b9 - releng/13.3 - Merge sendmail 8.18.1 from stable/13 to releng/13.3 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: gshapiro X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.3 X-Git-Reftype: branch X-Git-Commit: b36ddb27b3b96a3d42dba6b0cc5c103b70911ddb Auto-Submitted: auto-generated The branch releng/13.3 has been updated by gshapiro: URL: https://cgit.FreeBSD.org/src/commit/?id=b36ddb27b3b96a3d42dba6b0cc5c103b70911ddb commit b36ddb27b3b96a3d42dba6b0cc5c103b70911ddb Author: Gregory Neil Shapiro AuthorDate: 2024-01-31 23:53:48 +0000 Commit: Gregory Neil Shapiro CommitDate: 2024-02-13 21:47:33 +0000 Merge sendmail 8.18.1 from stable/13 to releng/13.3 Merge commit '850ef5ae11d69ea3381bd310f564f025fc8caea3' Merge vendor sendmail 8.18.1 into HEAD (cherry picked from commit d39bd2c1388b520fcba9abed1932acacead60fba) Add new source file for sendmail 8.18.1 (cherry picked from commit 19d4fb85bf17579780e8f0c3cbae8a5e92a6922e) New sendmail 8.18.1 cf file (cherry picked from commit 1b6a5580c1f999fb1ba5f9860cf63a8aefc55b3c) Minor change to update these files so new freebsd*.cf files are generated (cherry picked from commit 2c191ba6b0b5d1b3729a5ac428d51cfc5d5f3d2e) Belatedly update version and date for sendmail 8.18.1 upgrade (cherry picked from commit 31fbc98c949bfca30ab55afef04b4396a61b7e92) Add a note about sendmail 8.18.1's stricter SMTP protocol enforcement (akin to commit 21c1f1deb6a3ac6a60e4516261e5264a28e0b7a6 in main) Update import date for stable/14 Relnotes: Yes Security: CVE-2023-51765 Approved-by: re (cperciva) (cherry picked from commit a64caf2cb2dc3ddd6f325e323c281d1463a80ccf) --- UPDATING | 7 + contrib/sendmail/FREEBSD-upgrade | 4 +- contrib/sendmail/KNOWNBUGS | 17 +- contrib/sendmail/PGPKEYS | 625 +++++++- contrib/sendmail/README | 26 +- contrib/sendmail/RELEASE_NOTES | 215 ++- contrib/sendmail/cf/README | 29 +- contrib/sendmail/cf/cf/submit.cf | 15 +- contrib/sendmail/cf/feature/check_cert_altnames.m4 | 2 +- contrib/sendmail/cf/feature/enhdnsbl.m4 | 14 +- contrib/sendmail/cf/feature/fips3.m4 | 16 + contrib/sendmail/cf/feature/ldap_routing.m4 | 2 +- contrib/sendmail/cf/hack/xconnect.m4 | 4 +- contrib/sendmail/cf/m4/proto.m4 | 84 +- contrib/sendmail/cf/m4/version.m4 | 2 +- contrib/sendmail/cf/sh/makeinfo.sh | 2 +- contrib/sendmail/contrib/buildvirtuser | 2 +- contrib/sendmail/doc/op/Makefile | 6 +- contrib/sendmail/doc/op/op.me | 271 ++-- contrib/sendmail/include/libsmdb/smdb.h | 2 +- contrib/sendmail/include/sendmail/sendmail.h | 1 + contrib/sendmail/include/sm/conf.h | 8 +- contrib/sendmail/include/sm/fdset.h | 1 + contrib/sendmail/include/sm/gen.h | 4 + contrib/sendmail/include/sm/ixlen.h | 1 + contrib/sendmail/include/sm/notify.h | 7 +- contrib/sendmail/include/sm/os/sm_os_openbsd.h | 14 - contrib/sendmail/include/sm/rpool.h | 2 + contrib/sendmail/libmilter/README | 3 + contrib/sendmail/libmilter/docs/overview.html | 2 +- .../sendmail/libmilter/docs/smfi_getsymval.html | 17 +- .../sendmail/libmilter/docs/smfi_replacebody.html | 2 +- contrib/sendmail/libmilter/docs/xxfi_body.html | 2 +- contrib/sendmail/libmilter/docs/xxfi_header.html | 4 +- contrib/sendmail/libmilter/engine.c | 24 +- contrib/sendmail/libsm/Makefile.m4 | 1 - contrib/sendmail/libsm/README | 4 +- contrib/sendmail/libsm/b-strl.c | 2 +- contrib/sendmail/libsm/exc.html | 2 +- contrib/sendmail/libsm/heap.c | 2 +- contrib/sendmail/libsm/io.html | 14 +- contrib/sendmail/libsm/ldap.c | 110 +- contrib/sendmail/libsm/lowercase.c | 35 +- contrib/sendmail/libsm/mpeix.c | 2 +- contrib/sendmail/libsm/notify.c | 68 +- contrib/sendmail/libsm/notify.h | 111 ++ contrib/sendmail/libsm/rewind.c | 2 +- contrib/sendmail/libsm/setvbuf.c | 3 +- contrib/sendmail/libsm/stdio.c | 2 +- contrib/sendmail/libsm/strcaseeq.c | 12 +- contrib/sendmail/libsm/t-ixlen.c | 56 +- contrib/sendmail/libsm/t-notify.c | 141 +- contrib/sendmail/libsm/t-qic.c | 16 +- contrib/sendmail/libsm/t-streq.c | 42 +- contrib/sendmail/libsm/t-streq.sh | 19 + contrib/sendmail/libsm/test.c | 2 +- contrib/sendmail/libsm/util.c | 10 +- contrib/sendmail/libsm/vfprintf.c | 16 +- contrib/sendmail/libsm/vfscanf.c | 2 +- contrib/sendmail/libsmdb/smcdb.c | 2 +- contrib/sendmail/libsmdb/smdb.c | 7 +- contrib/sendmail/libsmdb/smdb1.c | 2 +- contrib/sendmail/libsmdb/smdb2.c | 2 +- contrib/sendmail/libsmdb/smndbm.c | 4 +- contrib/sendmail/libsmutil/t-lockfile.c | 104 +- contrib/sendmail/mail.local/mail.local.c | 2 +- contrib/sendmail/makemap/makemap.8 | 8 + contrib/sendmail/makemap/makemap.c | 187 ++- contrib/sendmail/smrsh/README | 2 +- contrib/sendmail/src/Makefile.m4 | 2 +- contrib/sendmail/src/README | 25 +- contrib/sendmail/src/SECURITY | 14 +- contrib/sendmail/src/TRACEFLAGS | 16 +- contrib/sendmail/src/alias.c | 209 ++- contrib/sendmail/src/bf.c | 2 +- contrib/sendmail/src/collect.c | 258 +++- contrib/sendmail/src/conf.c | 158 +- contrib/sendmail/src/conf.h | 8 +- contrib/sendmail/src/control.c | 2 - contrib/sendmail/src/daemon.c | 137 +- contrib/sendmail/src/daemon.h | 2 +- contrib/sendmail/src/deliver.c | 1603 +++++++++++++++----- contrib/sendmail/src/domain.c | 482 +++++- contrib/sendmail/src/err.c | 4 - contrib/sendmail/src/headers.c | 32 +- contrib/sendmail/src/helpfile | 6 +- contrib/sendmail/src/macro.c | 59 +- contrib/sendmail/src/main.c | 126 +- contrib/sendmail/src/map.c | 438 ++++-- contrib/sendmail/src/map.h | 8 + contrib/sendmail/src/mci.c | 13 +- contrib/sendmail/src/milter.c | 27 +- contrib/sendmail/src/mime.c | 8 +- contrib/sendmail/src/parseaddr.c | 44 +- contrib/sendmail/src/queue.c | 214 +-- contrib/sendmail/src/ratectrl.c | 3 +- contrib/sendmail/src/readcf.c | 238 ++- contrib/sendmail/src/recipient.c | 11 +- contrib/sendmail/src/savemail.c | 4 +- contrib/sendmail/src/sched.c | 172 +++ contrib/sendmail/src/sendmail.8 | 4 +- contrib/sendmail/src/sendmail.h | 179 ++- contrib/sendmail/src/sfsasl.c | 8 +- contrib/sendmail/src/sm_resolve.c | 206 +-- contrib/sendmail/src/sm_resolve.h | 28 +- contrib/sendmail/src/srvrsmtp.c | 465 ++++-- contrib/sendmail/src/stab.c | 6 + contrib/sendmail/src/tls.c | 599 ++++++-- contrib/sendmail/src/tls.h | 91 +- contrib/sendmail/src/tlsh.c | 37 +- contrib/sendmail/src/udb.c | 16 +- contrib/sendmail/src/usersmtp.c | 75 +- contrib/sendmail/src/util.c | 142 +- contrib/sendmail/src/version.c | 2 +- contrib/sendmail/test/README | 9 +- contrib/sendmail/vacation/vacation.1 | 25 +- contrib/sendmail/vacation/vacation.c | 232 ++- etc/sendmail/freebsd.mc | 1 + etc/sendmail/freebsd.submit.mc | 1 + tools/build/mk/OptionalObsoleteFiles.inc | 1 + usr.sbin/sendmail/Makefile | 2 +- 121 files changed, 6716 insertions(+), 2169 deletions(-) diff --git a/UPDATING b/UPDATING index 21873313b3be..8e7fa2999475 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,13 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20240207: + sendmail 8.18.1 has been imported and merged. This version enforces + stricter RFC compliance by default, especially with respect to line + endings. This may cause issues with receiving messages from + non-compliant MTAs; please see the first 8.18.1 release note in + contrib/sendmail/RELEASE_NOTES for mitigations. + 20230913: Improvements to libtacplus(8) mean that tacplus.conf(5) now follows POSIX shell syntax rules. This may cause TACACS+ diff --git a/contrib/sendmail/FREEBSD-upgrade b/contrib/sendmail/FREEBSD-upgrade index c8206c4bc351..03969cef2119 100644 --- a/contrib/sendmail/FREEBSD-upgrade +++ b/contrib/sendmail/FREEBSD-upgrade @@ -1,6 +1,6 @@ $FreeBSD$ -sendmail 8.17.1 +sendmail 8.18.1 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ For the import of sendmail, the following directories were renamed: @@ -102,4 +102,4 @@ infrastructure in FreeBSD: usr.sbin/mailwrapper/Makefile gshapiro@FreeBSD.org -31-January-2022 +07-February-2024 diff --git a/contrib/sendmail/KNOWNBUGS b/contrib/sendmail/KNOWNBUGS index b44f931af585..7a75b4975c35 100644 --- a/contrib/sendmail/KNOWNBUGS +++ b/contrib/sendmail/KNOWNBUGS @@ -25,7 +25,7 @@ This list is not guaranteed to be complete. For Linux the default is to use fcntl() for file locking. However, this does not work with Berkeley DB 5.x and probably later. Switching to flock(), i.e., compile with -DHASFLOCK fixes this - (however, the have been problems with flock() on some Linux + (however, there have been problems with flock() on some Linux versions). Alternatively, use CDB or an earlier BDB version. * Delivery to programs that generate too much output may cause problems @@ -105,11 +105,6 @@ Kresolve sequence dnsmx canon DSN does not contain the illegal address, but only the valid address(es). -* \231 considered harmful. - - Header addresses that have the \231 character (and possibly others - in the range \201 - \237) behave in odd and usually unexpected ways. - * AuthRealm for Cyrus SASL may not work as expected. The man page and the actual usage for sasl_server_new() seem to differ. Feedback for the "correct" usage is welcome, a patch to match @@ -178,11 +173,11 @@ Kresolve sequence dnsmx canon * Client ignores SIZE parameter. - When sendmail acts as client and the server specifies a limit - for the mail size, sendmail will ignore this and try to send the - mail anyway. The server will usually reject the MAIL command - which specifies the size of the message and hence this problem - is not significant. + When sendmail acts as client and the server specifies a limit for + the mail size, sendmail will ignore this and try to send the mail + anyway (unless _FFR_CLIENT_SIZE is used). The server will usually + reject the MAIL command which specifies the size of the message + and hence this problem is not significant. * Paths to programs being executed and the mode of program files are not checked. Essentially, the RunProgramInUnsafeDirPath and diff --git a/contrib/sendmail/PGPKEYS b/contrib/sendmail/PGPKEYS index 0d0b0d5a766c..13ec5a6ee56a 100644 --- a/contrib/sendmail/PGPKEYS +++ b/contrib/sendmail/PGPKEYS @@ -187,6 +187,625 @@ mk6wxhyuojEHuR7it6IU5BP8vaAGrL1jb1c2EeAe+pdJwpAb1Aq6MU6uWqOGup8t =xY3m -----END PGP PUBLIC KEY BLOCK----- +pub rsa4096/0xC4065A87C71F6844 2024-01-02 [SC] + Key fingerprint = 8AB0 63D7 A4C5 939D A9C0 1E38 C406 5A87 C71F 6844 +uid [ultimate] Sendmail Signing Key/2024 +sub rsa4096/0x8DBCFBC42AF9E161 2024-01-02 [E] + Key fingerprint = 2B52 755B 17D4 44EB EC39 5497 8DBC FBC4 2AF9 E161 + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGWUXHABEADBppmmbLqp0im5U2X6qAhePk4nOkW52VTJV4LC67Po0R2jPMdv +yCqQfGeqO0RYPCDOF9budPKj5wWZQztBWUlAUOhtt0c20F1wjzvRC+cnlZLFIZp6 +rXlexZxW/2mXXX/8FED+KjLZXCkSV+W7TMIZQtvFGwP8bpqlf31vLOKjMri/QF1Z +UQwHkWirmabwWx12x2DsYtkoSsyJnMd8ZAjnOxOVpnwY0ZzmXMcRFkmnuBLaIFqz +h6fnLj65owkxnBKY/mEsuQJp+DZvjXNpPrTgyJ/77e5XKGuKr5fx7h+9BLpOODHb +Qts+c91eVOybLEyGM+F5mfYMvD54euG06XVy+5Yi2m9+Oxwvkz6cJCPf8/S7PFLa +WyTorU+qB22T1z43qfBrGivuOyAm8slurpRH1QikkTAI+hk21zwCGnM9Nvvh9zN+ +Kg+uUoiZkEtJ6+J+O5qK6vXV6QuP9D6KBjF0zv9pIgbrLRrT+xE07v9lrYuU7U8e +znl819atkpNlE9NBb/4sxRdpmrAjQDVHpy0e0GbIKYKfla3rdsvM/2rIdbVGTqST +gPddPExgPqyq1ssyy/7CdsNmk6qfJ9UJDKtKnTjuAMisfh8P4Uoiwvhqxbx5CW2H +FqH3Ka0J/fXJlYlt3JgJReV+SJViADUyQYqacIMo7JOQVfVrinaGbxD0kQARAQAB +tDFTZW5kbWFpbCBTaWduaW5nIEtleS8yMDI0IDxzZW5kbWFpbEBTZW5kbWFpbC5P +Ukc+iQJVBBMBCgA/FiEEirBj16TFk52pwB44xAZah8cfaEQFAmWUXHACGwMLCwkN +CAoMBwsEAwIGFQoJCAsDBRYCAwEAAh4FAheAAAoJEMQGWofHH2hEPNcQALOzEpQG +3RQ6UcvFeHzK1NCV/oyZKQgj3val/QU9VoHi4RhBgosTqVAciHcKuF2b/v47b6AA +3F3cuNn28LFFr2xC2e0+NaCT8oZGRcnWPi4NfslIQgUhTsVvnisVO2obcRYVjKBS +9EEoiLStMyhGXWFN34yUQZu5DVuQ3JhyR8dqu4f5wd/1TD9vY8x4b7jdtIUDQQEE +PvhzcWn60Rpqd59CJZJ1dk54ZzjzNqTPt4fu0EU2L5oKmMS18//9hh/oADfaLgax +0V1MC3sMzFuMCIoLvd/G2XzyIRNu06brf9XZVMOMA/N6bueY8gyf82eVxNmfvnhN +RcTINWeOmjG29UYstb3S72BSrBB5/oJDrOJnyeh4xvSjeShVFLyKRo6Bcvy5+w5i +MIFlkWOl5v6JKSMUMCIzZUp7kAeU5D2CzQbFhgnOY+YFrYGgHQa4I4QmX9LE2svg +SwFwFpDHC1T7fuO5kFRO8Xa2+YLhKWjEQsljQwyyOC8n/DhhatPC1/TzNNhx2meS +OIKLy32yeIcHODlKTWwZPGRMiZZ12Z62K/i8bu8NkifXwtLjfbqmxZbP7XSFKNBt +yDvYhHMQW1YiXbTREy1b2l2Z7m56H4VN67RFlnhb27EzeQ5fbBO2pXvQ5e+sD4Jp +FcfE0QZVOyVN59FlCdaGvk8MlvHrZhwVnlnoiQEzBBABCgAdFiEEsXWWRFMDXc7d +e+kZYE378oVBCr4FAmWUXbMACgkQYE378oVBCr781wgAj8iqPRzD6kvgmqOPRh+6 +YBuSZ3+QOZKhIf8HVsutfeB90YBRJbtCKucliRIVLj8qkqIKroWpKPAv1YlqKP2t +spxfZoz9DzxSnwbXV4hmb/JfT7VLD9TBih7kBMbBxkY3ECIuvZi1roETpK9cSP17 +tPD9eFpvcG1N5DzCZTsMNEap946xVrCrFXA+etDW0BAMXtqzMlFOZt85hw2B7Z3l +mB0ErTAjeb18QD07TbjMLl+wI5SPYddMBvYYUXic0CBliuF7m+MSWPbNewHcvYG+ +JGotuLZVp29ChKG2Id4qK5IkdYTC1rfwzuPDm5QpPc0ghD6vnNvmX3oiw9V7rQJB +h4kBMwQQAQoAHRYhBFhyYhipE0AN5mA2ATmkx32peISwBQJllF3JAAoJEDmkx32p +eISwcY0H/ivF8zsxMSMWxe45atG+4V1QsNW/gasu4MaTSTf8lw1WXEoZ7SA6HduH +p7gLmRsCspDW5F4ELgpQ5wHux7LlrCRBxGHuFBn+zAptF/Z6zxRhHjcEBRQW2tGR +BRYkfr8WxY3KvYbiKJBnn3GgmQoexg//oaiAu/BqBkEhKkgDsgp8B12rMUr7zpqe +9WEGbauvzwvOnbDbJ3AC9LRsQeq+/MbXZYzK096VH799IRe5JFaQndavEPpZnuE8 +naPxesr77rwnOcPeyTxgAfZPEZXl92vznKeEdKZzaWtfKkFgVvInreCOwebyeOsF +kEaAh71TgGGXgLRUz8LB88Wh4MaMdBiJATMEEAEKAB0WIQTKeo85okGf/7CpqyeO +Wun7zu70OwUCZZRd3AAKCRCOWun7zu70O8nXB/459fW10n9esxtuWadhwnRlxF2O +mdFnTLDj8RY1IC8zvi7cONQpPv9vPEMqWjgZf1D2hKYNnjy0Nylww4XV8XNJ3kWa +riDt3aQkIuXt5iuYdbPp+JQV9rW0Uu5Sw3x0Gy2dVXDYcmSdu/NRkY8R3Uf7DJPj +4F3zIvm6cLClC9SNXiz8yATnXN8wb4qVOih9JpXas9+OPkehcah1ZhfgYx8lj497 +/CWGx5+tdl2IBIUy19aQ4aCIcIgVX5xSss0x+7WhL6THKf3IPzDKMTfy6Wa1NhvX ++eq/HbU7yWftXiZgsGc1ls4P0NmEEZwPCvmq2mtIoa22DewB9tk0O5dUy8UziQEz +BBABCgAdFiEEuH1FaYbxlIQH5cy0PWiyXVIHytMFAmWUXeMACgkQPWiyXVIHytOO ++Qf/ZzXfRqub+/gFS3Fi9v1xIPKl9fab3mRQU3HzXmys5AlLQOdi19hzqmmjW9gY +edvy85I2Buf7K9/hVumvLp+7ZK4rY5PXz97GWC5Mn9mVEaTK2OgPN9KzfvtjxIPs +KjvyfB0U6YBshuj49arYkefm2QVKRSGfTWDMVDKMOSwXFalYUape2+Ckjyfg8wsB +V2hRjhMG0PRN5dAXZiPEbYztQanQWAq3DK1ohJLgFwattMpZrh8wUF9LlEtaSSIz +/A1jv/IqfAVOudLiPa272xQOcGcZrONGcPd3BhpJ4zQM/cd9gNQzXdUPgwuV/Toa +KFX8lNqY1JIjIIgqARw0c2qqT4kBMwQQAQoAHRYhBEn2qL6EczlJUZFvO2HeEezi +djpzBQJllF3qAAoJEGHeEezidjpz0p8H/iGf0G9+IBcRK8J6Mz1wA+hemdVdSsTF +6GYCKFFfq1b40T6Mc3Ao5Ea0P/AyTIFfVBoTvsXqNB1bj1MmOZETHcEbCrjyOKLz +yC8SSH8PRUDWpPFnbKYyOnEfViASqmxHIB8G6nZ5tfucgasCrOUbkd7/QsaAeiv1 +/VkyGDx8eUDu6+NUCd+K25so8LlEotDhysTI7H1VKLQukduyBs6ziyjfFcGg8r6l +8BcpMhRZ01eR6ZFQtYRcX0ZEOBHtp7nlx2gLEFrQ11D0+PJHMf5p0oQi+hHGkFJI +V3i8Uhg9KKH/Zz3VIYoIt5v/73HRExOXMib0YgazoPnF6Q1sCEUrF6mJATMEEAEK +AB0WIQQPXJauyOaenI5ULlxtTNGUKfsD3gUCZZRd8AAKCRBtTNGUKfsD3jjHB/4+ +up91LA7tS+1nUckjWyEyRNbUFaeZtd2mp7A1D4yIKk46JYS8LI4ION8R5HRgFNN9 +ut5lwsMN6KZJIiVcrM/D/W1NS8zWScw/K1dtzDerdNOU+bwU0aBHZB93SL7MwvTN +/D+31oxy6LoQnFjEGBbWCoFpdCQceHK3AclqCmHvlfZi3/31sM26daC6Ntgn4JZU +6BHP27cFdoHy0jUiQt/LXDDtsfXb0cS3us0+7wwSQ9h/H7E777MKsa8CMeVmSBbQ +lY17TwBMVkMKrKc65aJXKkoezepew+vSO3tk86EzbuMt7iK6LLXKGtLK0IRVY5dU +jLp8B1ir4qiXiAYWgVqJiQEzBBABCgAdFiEEMLynRwX6QVRVcx17qvW13gW9zFMF +AmWUXfYACgkQqvW13gW9zFPe5ggAwdDEpOiEtSiNqXmcBfFgarSxrL6yIDzmSqTK +Q6pkQa1xO2zb7yi0gVZkJQzSeMBi6IJtnPoKEviUdLbdy6mC1ya7u+OY8Ubic2F6 +4V6yaNuLL3T4cCK/7smiB3Fak36IidtOG6P4S45LuSlPu6ndXVSDU19me0hQEAmY +7BA7qSj1lbuhXPskl2iJOMaS5y239UDYtqLRnBF1OXe+p8O8IrWp7L7anZI6eYCC +ToVvfkPCvfFDsca0nwZLRdUk69b93JgE8gManrf/qNnv0vIhJX9q4K7sAA305Y6J +XJo/f/kH7dwZwV5HV33sLc/snvjiq9TKSrlTJ4xjL4/GPxhuK4kCMwQQAQoAHRYh +BDyKHo5/RMreEU/tRkvJvaZr9yatBQJllF39AAoJEEvJvaZr9yatPwAQALBWFBNG +QY+qUc2PIcV7KZ/OAdEx8QLFkOVXPiIn6hlp8FD9OzPV9/F0F+VumG2lLCIGFMLO +T1j1MsRA95tVFj4DgEH62QwhVV4JfxhBdKcK57g7IKEro1Ssc8xGP0FhDGIo96ag +kmnH6UFhIrXJiZj9rJs/9wIJYvO/VBCB/5Zwc1zqWjdn8PiQMYZm9m1+DZcDEx3e +8G6xPKjZVRzJMQ6c0tBRE9dZRSzwUaewl/nYwELMMOayZQndBPYlGb3PuYKQTksB +3g1J4vBKwUqFKxzBXgMjlSpnSa/RMCqfvl2s3PqGARh7DrkULHtPYAl+zHeyTXNh +Fq/RZ3/0GnuxXL9LHGxZug6LtiL3un8F71YYo9S0963PlxJ2i7b6U1Ul00d+ofmH +9StrtvqQW+semspBJ+1w+WBr8v0C+vZBcO314dUAFsibEpmwMoy7CQ3PPj6FphZi +Dmw4JXeqYyv1waS39FAE8kYC3z4yxo20aVlSmZIp79a8l2Ty/lpm40RBjAp9ulQg +7ANlLRLhdKUFsH8UoaZqlLmJh56oVhJp4aHH2SSijYH5rTSOkTj3b4vIFlDMw8sF +P88C7q80KaCrV0GIITL18JaI61/BL+96lsz+f91s7KxSR5keABAHmU6u+DNodi6A +SWuxyZc8G4zli9liAHleKaTxClzkcznp/EC5iQIzBBABCgAdFiEEpoc9JKTW1ihK +5Cp18GBZ/V3HzD8FAmWUXhYACgkQ8GBZ/V3HzD/c2A//ZQ3ZPUNBHuRHNBTFhEqT +TW2kZLYlRpElpNqT0CsfKwxb8q/abLfh6Nn6oEBuT4RYDszL9UiBR9UC8v+dzsYa +2Z+13XiO7n5eonH+oBHOBFDcqvp3jpm1mexhT4I7azyhFd/u7QQsN2R2b2AZQQxT +/PIlF2sYvaKq7tYd+j2Qgq9ISa/Jy7dZQnAhxPcWTSB2ilgcPu9LXfMobWe6kVLn +CCTTgpWDQ510u/BLQPShroVDCYi++pkHkcJw+9AAvblCtiYjjK5NDF4dhMu+nqZ2 +Qe57/Dt9VSEnNe7WXMvo25s9ON13ATXI8JijXaN0rJhk/uwuBdC6a/sl/ry4uum8 +PBG9aDvq44v3BOy78kEUAAySvUJ18naaydpSeSLRMDSCI+uzhZZbwRTTNbqN58uH +4DcSIQCjyJgIrga7x1nTb3MppER8gtlWiaMs5cEWKYPGizCv9bmQR6HD3QbRww/8 +o2XlHeZJg1T8Yv1SwOmz5hro/8RHHYKNwgWZukEJSNFlQgg4FaHICM4c6ODXrD5U +n4FYZqMgPPtu65i70lFBRL1XEABi8BQn8ZdX6xpRLG7Oi/97fXcSAcb1aQSVQKG1 +NYpFaY+eTkSsVoIIzOeDWxze4krxT/vd9J3HjXxLiqQhKh7iH6BJlNcCduMwTfvL +fQRFeBX0FAKAt8GgaD7o0kOJAjMEEAEKAB0WIQRQowMJjqLde8vuKtoJ4B+gPAxQ +TgUCZZReHQAKCRAJ4B+gPAxQThkFD/9nqrAxd121HLtLo81Y7RDgj2EOfRKTOE99 +8CRUGe9YJ1pu22g6leREISjO/641uB3qdosHYIQrX2sgfXX0p5mJCI0BZgTVMHHB +AMLvrPAua1/BQan/ZVFVaSkL8n552Q9gk7VkGzubfcYs1qT/NoDzFJ18bZ8k6X6t +EDYMYaQ15oluGb96D7H2BuzSrGugqsNXdVqNFI1uGpaDMbdtFV5ZSFU1vchlmBOx +uZQFZRA1n7H06FJ5E33bk6evqrYIbmq87OJRdyUr3nbmSTPWaHxH/Xpt9J+kViDv +78AbzV1y1j0ZTSoJ6pQOw/2oR9kqQrBvMEHr/tYMY0fZCnsGhD/Xcs3LscQdM5Ky +c3Agh8/VvKU45kIT814CyR1BiYKLwWSthE3Lf/VSoOAdwWyydVBRmzXyOd0bPrp/ +KEaB7AlBXmtgBTnd+44jHOyo0X+CZdscNbCevcwaYXY4aDW8I+NcmLm2+3lG9U4G +CITW+y7q7vMzisVLzd6JcvSOx1ixdlZDAfv5of4MqCS/pjaqdOuT2F6C8n187KID +zB07m+ix3D60IN0YlBh8EP9Ptm07y93/bpMf7HzgNPSUmsOnZcFeNiAEFUMfCM8q +t5ESZO43GMJ8a9Q3KhK/c2BeXiloYasyS5GdJ2meE205extfIyqkZrLQSBWgjzZz +luaoGI3QkokCMwQQAQoAHRYhBK39twn+HqaC5YVZcdWDIQ71FHGnBQJllF4jAAoJ +ENWDIQ71FHGndC0QAICBdrTlc3cPct+E3WfcOGSBrtfySXs048YM2gxYbkt6FtE0 +kY4dKK+dQApwpkxCWuAYMjO3hJJkhA8vmuD/RLhN786EgM0yCQoWJjrfZxhf4zLZ +xyOPX69bY3L5IKQDFhCiGuPK4O4+QOtD5KeNmKrMOtUWD9TWOOyrhgaIApFHxJ7w +qfWP9K/cYb4ifT3gmGM/RF+sCn9b5nUTf9bdpsnNE8c077V4+eciIfMyD2jEsxR5 +0T7RphhHE6EOfEcoS9hdXWXMD/xYKtZ4S6+iCD7hTfqHRpYfwkLZcY3XZ3BqUTFy +aIiLPXhlEnEbfYz2iUPXoJlJFFhgG+MjWi9PKq4nMzkMkezJlrhnk+vQjHaehXkM +ysCtisKFus+LBsf2gvxBXGYeIlDMc/qyPcT8uU7dEqeUZFJEx8QMCPpSvs3bz4Br +5LsKf4b+/cXOPTv+w/M/kuVRXDQBKi65axu3TZrFRwPoGo0Ye1N5FDVOauhW+KWB +itVekfqSQv8vXPMhWHyWUVXDyJ+L/gC24HV5BXbubZhjW38AOlc6spzYS8GTteHB +HYJ0ArVRkonvJ7eKMvhCXPytEpqiZl88gxdApwiEJM0LuFRkZPM1ukmznGOpe+h1 +igbKFI5IWBVW7cpVR8Ga5Got8NIgxW6la+TVRPByOGSDJm8V3Hrgqoq+9/zziQIz +BBABCgAdFiEEYyfdy15+gOSYfqO3/XncDIHZIQoFAmWUXikACgkQ/XncDIHZIQrc +wRAAo6y31xOW1Nr8ivnXNXyoUv/vjz0m3FnhoZ6L3Ee3jFgO/LRLAOXertUHd98J +hfeZs6UGxxMAt3PZsKi5t/DxEXsqtCY5Kh+97/zzoY3a4xOal/IF6yePfm1qs2QB +b3Cun94eBEceAR/hM8mLZ4hJQbViyNv9HZLMW99gJa9QHqWAHb1WKloJzgZa3ye0 +oSqCf2416V4s4jadMGswGBgz6d1z4muziw+lkq4Ggac38JPtRX0wuNwPCs57ZhPz +abo0yxFvbalznlRpMb1g1bRxCXkNQAUZ06N8lslO7i1Q6ef6lB6EsAHBD+DwH93c +Gwuj0/UQlpU5Jc617EgbFw3LAaMwBpapOOMlaAKtGxLL/TjGt/uQqwHl+phlr2K+ +8aJJkR2VxE+ZABQ/GYNsEMxcxGl4f7+z2Apey4xXQ0+6ftcyWuQ5Cz9dDaz2UERo +BBpzHYJZn0y7eOHt0sYDLSRjS86OIvqlZbSng+hEZRsPSJd0LVH13DfdnqVN8GmT +N4TYSx5yqwLGrv9f1j5ktb5XruN0bAbiMDswHax+CrOiIS3fLQgaXTSaVOVLAfz1 +TCK3iPD0cW3g9VS1pD+5V1QMtD/+z0a6sCE/2tGNOZTc3EX0BSfG6d1Ib+ns52ag +k88qQwwUPNVKP/K71VG1s/9pivIEqkybuN0wUQfDPd40/JOJAjMEEAEKAB0WIQT0 +ziJjIQJT1qn5ebBMZuqNS+4b7gUCZZReNQAKCRBMZuqNS+4b7iFnD/sH5tnd4N82 +AMShGyss5+dzuRuSOxow5rBiUxSCU8yM7hR7HS9OEdlUcWrB9JtNEClMfR1ecm3e +VxiBkwkTS8ufKSq9LCB+31Sl6alQt/cEXZhgIpzD1UtjHEG9W9geL0uDgnYtG4Kx +6UkbOy6rHjpM1U+bi0EtijbZ7MDCuqaB0G83JOgtJaqrSWn2Gdr95wJIOLe8X1n3 +MR/Th1csKLcDiA8sGmK3/DuuoRFtDSiT/z2RRvtx6pz8Swq6ftRoTdP/8oOncuWX +vQXuMe2i7YdN1xOv0hPK1tt5ZwOllqtgdG4yabsYif2I+9vnr7NSAthyJLS1sREf +IPDWRAa9roN1OFIJ4dl8e2SrGTOZUW04Lfi/bmakkzrXrNlv+I/ZJSHAHbhecPY7 ++hFhl7bf4WrHMmC3mL/t9/c0k5U/IlCYv+NaE9HJvvkLJO73Em/A58FZIu0WCI8g +MiJec8utHPSOYfXCuOx4lSfwNZT71Ct5EYwpPYwTEHyMz3gzwJ6Ews6/dcjbfllg +PFFOKlRQ+2NLPePJJTKao0+/aDde3A/MqemIksndt4l0O88gXATH2L2xQUW8nPRT +cVCpYYeGb7MMlRs1HrSfv+dqyN5Nru2EhK4+JYg6PDauxE7agBgmEfEFqgm/U0HZ +993ihlmoKXQ6uf8goQlcw/bNb51oJaGfO4kCMwQQAQoAHRYhBIGGSgN18ngQZP6O +Tc/5+WdA7ZVQBQJllF5FAAoJEM/5+WdA7ZVQRsQQAJtXGfu30oRqALvnZPOgr6LB +aJcDKxFreTnCILpKwic/Xtd2xtuUGDJFc9xILF01lo1LC+2HRuJl8/hMUF5l+9PH +C3sGfLFOHxzIuWxPvbf0rsMerGA2wwOsCyUzJpiMF0Hp4R18NymiIRKtcGrKc21p +Q+/qAb35DkqKT+C/vRL4b7EgBqjWiyoPIcQpYrl10FNMLBWbLFmAJ5YpK/CKIXnT +8vsh0V0uC2suDA3lMKqrKJ2SFQXutPoJ2LDa3xzRY8DS/qcGAhtBRSx33rUTgO9G +M6bAabVZ8u2mbqcYtsl65PmhdlacUdZJs/YcWzLFYz65oIEF+QJEKu27dSkozp9w +xjO83IVVzi8Z+gto0PpC1TTFqnGIR0GQ8Vxv65R8mmnOlBrylIztkEOSRszukeLD +gf6FkOoFibWZyKcfrHu7abTjyJQUi7m3kBj6msVXSan6Bkk5/uKCM5Gb5wqilpDl +B40RLFJ9w4/I15rqrX1b5FGuJuS27fp6EsDQ6Om1KyDOqGQyWqPa8fn++v32EFIH +DwdxrChDV9Rx4ao6h4hcOxDAkY8azlQQE6AK2PPAFJlBrGW6jP8gVcXWhb3OX1Vg +gfkOkXBPwNM3OaR8Bi5/OFDC7epKJf/VLDcie/sEWS1C/rYIIajOSOsUelYBw3xx ++H41dtDAUnD8abrpXRzjiQEzBBABCgAdFiEErSDhqotBNnCmQlLYvSdtLm/PqIUF +AmWUXpcACgkQvSdtLm/PqIV/pQf/RQHfchEDIM8K1T9UUMWB6/cPvTRtevmTS1Pp +4C3J8tJ5ZVpHws/FpbmEYjlh+qYjEf2+IDOxqQcuDBWYg5+uG3lR/in7tmlBUZL5 +r2o7kgJFlMnQ0xrNzDRtmIKss4b0ZchpFo1FVY9T9yFhf4Hda05mUvgQB9CO12U8 +s0/1Q8bb7ed+i8CBBkd4l31qi71bQRIorYiV/WDi7Rur4rmRifCAHU//LANRu4xs +zEESREZfdDlWRe/+nV+DfLEBOcEoFyyUKOTfgq3s4982oTc7FwoiF3Y/RnzSGnPT +81W9p3vYFtvBSKcXT8q9gdpuKVNuqckxSTQanjWoFC33VRxzM4kCMwQQAQoAHRYh +BClslNvQKAJFv9OR13tSlkjuhXJkBQJllF6oAAoJEHtSlkjuhXJk8r0P/RaCfspm ++dlk+X0CPwS5NB/5PXuUOKX+HkdyEnvw1BKOaLCtoDn6eKYOfxec9X63THmaDRxY +DS3NVvubJuNnj0jvc0wZC1S+JnljKH9//bBytOS5vaFG6sGlrXtsYmYDuePUV1+p +lPM56jELbhF43izUqUjiO0l32s7cZUONrXxBnZVVDU8bX6jADAYGDUTOG0/W9Pwu +rHmWLsjronVk73SQHy+fFnc3YWJLn3YhgQ03Wlhku/BWwIwKhbkd41LO6NKg5c6j +5PN9wsbnjwoj4//B1mUaGQrrs0A/aLlbnHXkwYnEGDkwtDDc/7aMQptf5ibw5Cuu +7+19orY6muxQcDoPrlNgOlZQpa4dYuaklqcroyyXtWpjsl7QjQq9Pjd0aQsamK0c +Rxc5BJAi708xTVdz5AFRqr3Kh5IVSA+vh/feWDPDiGaiZn+VBdpjQnNpQv9XfNOv +MGreRRWMnaEmSP4aoP+EQFAbJ6AMzMNanHwEqURL/sfyRInwQWU0Ib0slXYJ/1Pc +8B4Qx6zRfYD7sCN0ITrQosRkgHjAakWD6O4TKrWn4MvOgilpv8L0cvFTDtqoBadz +Wrg90EtnJNj9aVQldUEf25q3XFJQRBThgrj9nsfWAQrBnLVQYYRNEUYDXr/dUPz8 +jYEKAq/++V1QViOdRQVDVgvPLQkhOxlx4WogiQEzBBABCgAdFiEEsICXn00EPhnQ +WjacYp747gyLgzMFAmWUXvgACgkQYp747gyLgzOfCwgAw75THwrYnkaZgreXvJ0B +faaJqMwV9A6XTZqhQPfWOluS0uDf2qvb2xkifbYKYFS1+Zh9CoSS6PG6jeN2eiJ+ +pZGlwDnRPnWW6HmNCIVowHorN7/WikkW6VtgIkStyAWs6ZbDNDe6DCmdaUPl80nB +lz8odz2MrSWp8g8X4RwY9Gn9ZzjPMEg9vtsfmE3fqrxAFOFXUwnFelIh/gVSzLve +SFti8xUT1YVp1h6G+idxRtNAa3B4HJmt6J5maYxShGYazDNpECUKbWhhxLZs47dT +p5JSMK7+YEU4R8o3g5l2z67FiwhzyeeDIxiuLp6jHSLBZgLxCDa2BFnGH6Ih3EZU +dYkBHAQQAQoABgUCZaBFoQAKCRAQkK8gpapb5owRB/96vSa7bbmOqnw9qSI1APpS +oSBG55BWcVSYtKK3juAxpoMqECNUcOee6ZNug2UujY8a6e9wQN6XrLZcHC0GfgTW +EjTnOEYLa1DSOaHykeGsbsn7vSTP3yWnqRzVy82A7K48NSJ9WuEMg2L30bQlPzfD +YdxRom6lm9fNCGY+pnXNRbNPzaGXvffEpNO1hydOAXJcLcgjHQU4wARwivwJe3mo +yRroV8dxghzZPwv/Z/yQtv9qi/R8ePURy7TUmHQHFXdB6cGKiRzUqSqPIB4YBG0+ +doGUmM0rcaexLT3bxsATdjlp9BezBMjGfC0zya0qJzgECzQL6ZqP2ZuQcr9VnRHZ +iHUEEBYIAB0WIQRZXh5FmqkINaZCDETxSlpMnlsyegUCZaPsvAAKCRDxSlpMnlsy +eozSAQDvFfm/GTRBffAwz0vQz63G6OLvk8fEQRfRmCk7Oz7KVAEAy2xbAIR6be4s +K7269dx836xUGMhnlaHNEeJm5LWoeAOJARwEEAECAAYFAmWdqGoACgkQEJCvIKWq +W+bsIgf+MZMeWKF6trlGEMMA4AymDy1noGNh4RhCIMTIMNyNbwolafGgAqXm1SU5 +XWmy5DFX73shK8AUylHbsQgNWP1DvFrDuSJxvV65A7kAaxLZL6iUM86ROU0/JPj/ +sIAu1zXAS4dApZxfoalhtPO0khA3NwsLsRC5KoMhqnflAMqjCLJGU+hUeoRLaRl6 +Wbc+DJDK0Tku3bSe955jQwWSX4n4jvXEY8uWCz9O7Jpdbq3InopxipjaRAI2eZ1c +x8+giU+dqf+t4PYFWG2wEUj0nYhiJPelPlTZjeoj139wYa4LaQWQNsx/DuNaN/qh +eLAsSJjEBCLilcGeMjmwxTB1Ye12V4h1BBAWCAAdFiEEm8khXcnQ1jYW4dNowNJz +SkuCZC4FAmWyHOQACgkQwNJzSkuCZC4/NgEA1i1SxAKy0iuFJh+SEaRPamBm9wJR +6Fe8ag2puHcGjQgBAOse03HZ16J6dclkKiImzPOeh30OoO7f7XAlfsGCAoIPuQIN +BGWUXHABEAChE2XRFvR487S4XYimW6Srob3N+l1kNjRG7+mJa4z9bGSjP1krRDF7 +hAoNoMB3xvFePCiBQsoI0uh6I9N0SfCq8/bNbIJ4mKmbFfRQ/Ute+qVjqCsBjVIw +9BAzXriUzIenVcx/Vc3qGVxOIj0cFVVD2BRz4KCDk7bslcOFyXB0+4dwAP2DCLxY +Erv5+8woxgCc8bxT+lIumv8CyosLYSzEbJ0rsEowQzYwoFs20HrtKphz7Laxekav +e7cWySDRmnJ7Ka7QO6Cnno+Uq2MCEV+pyXCKUkhS+tdzTJtOK8wBh0dgJATkgLg8 +fv5prFr5hzZol/2/RNdupHjNbpYY0S+9TiVErbmPwcZ53P6GAVETL/RtEHSFl/D/ +ZSa6cjf3iMs1xKLc5PZOd+7F7VG5YULzJzWZjDNUV33cqdbAb6LtyHIMISkaq53p +AcUIG0z0OJ8rDxraxCfPB6i9PKLJd30Lor8MJrhZDig4NkY/8Ai260FWiEP5JFQF +P5gRXAVThSJh8sSmDz9rWP3Ojhr5twnUtQzoACAkMvW6+OW2gu1wZ/PiUkdOavG5 +mPmSqyiGcX2tUdawdXuWCfbdkcuW5lmeFF7SVd2QZBRh2DtvkLDf3v9BgsKhtLHD +iYxDwFiGTRiBC6m4foBm+r/LybbZTaD7VAvn7h+2g+NXrB4u7BDlOwARAQABiQI2 +BBgBCgAgFiEEirBj16TFk52pwB44xAZah8cfaEQFAmWUXHACGwwACgkQxAZah8cf +aESmrw/9HmEu0OVw5TSt+uG2nGixGa3RDUSvruJgRrXIkYh8u3ce0FqwCPcNrVMj +oMVlQbHR7B1TNxIc/HxN/QoObziDM7xCICRw90KgG9KBR5QkkplrVJhUWwIYmVOH +SI8GJ4cdKxcMqqBTsoXzgVIbY4DYRLgBTbTbw+udhfB6cRFnzwo708cgOgz6AFdW +X77KFUnkpKSnSIjuoKR6yHoxjoS84dY8Ob/tZ3XPtWGFJdsWjQTuCUh9yfzmgm1W +4YNsWe6B9JXtbGeV+L7TOmtEA6ZVPUXggWfcAtCpRvDDG7ZLEM8UE1WSqg/48XG6 +novP/rR3btWbg0esNpo+CN59gTjeBRVdar2zwUcefHDOejqvt71X6VPRHOmAlg1c +2SS38X0ws4+6icv1BIOQwfJue1XaQueREQP40kzyTHfTe37UEDfW2sGJlkq70wVv +qK/2Qf6f8FQ71agIT7NAGEA3v1fphAXNcjoNDZvDNYJjxYJePV96b3IjLZk/fxDR +esdocQEXxSQYXOFnKpFLfWInJ2FfbDeXHMCv4agPsr7/jeGP86rTDm4RnbONCueE +hdLxDtjGiyNBoGE0v8eYvxrvvxexnANI9Hjj8U25OY7xIw/J8b8+bFvZfnCNIZju +0kBpsSGZOYdsp/To02UB/B9IfnNxgwe7H4CAg49/YIDOFEmm2lI= +=2S83 +-----END PGP PUBLIC KEY BLOCK----- + +pub rsa4096/0xCFF9F96740ED9550 2023-01-12 [SC] + Key fingerprint = 8186 4A03 75F2 7810 64FE 8E4D CFF9 F967 40ED 9550 +uid [ full ] Sendmail Signing Key/2023 +sub rsa4096/0x592DCD45F765BAB2 2023-01-12 [E] + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGPAfZIBEADhYk0WirJ5B3qPnExFOs2UXD07+64hyIUT1UahQC4T0JIUQLyo +mVgKIcD9yWDdYEFlEIasifCGfE3QaNJCfxa7yQZK7bmXfKYEAhSxUk4RNcQ7e1lL +v1/Ngq7r3P/7aNp5YWZMobG4qeS8+6VneC/+f6SPajNEj97q8XuGpEw2oNivnb0e +hJcMDmwC3A2E7OT2drjdO9fTs9GnqX7HwoDO7dopZbU+ggVFPHYXUxvagBqKsnWh +2QLbJHhiWDgGmjX13s2yIdbq+aHyfYjTvAN2Y8Ej6HERz06qe+IAwRMzC1medASB +PZlScf3iWfVeoIuUb3nrDturpZ5tWctzrGbX86gJ5QArKMF7W2Wkgo3pDHBpojnj +T+LTzDBC6DOAlBHxMnwbhnFMhLGkUFaB95Swpipx+Ax+dY6J5/KELSYin+DbDbLQ +/82U4Vl5mPe6/+4W3Rxudt6kJDqgOvV14brp54fDXNFvTav23N1AeapkVv7CH7JM +KQ8COVtHlazqi3a8NGiaRPLHcvFl0kpLJAFLePHCIfbgt9O7KKKFbVvm3Npt7z7z +5c3xV8UnaTw5MCML6diJTVrPdiLXSIhny2WFjG4Igu+MyZ+9gJkbb4E9cl0Eg2Wr +FFWjUO6SxBjQuoeKqOAKRutHVB2emnGjdFp7RhGZxWl+k0KCXCCL+Ii2PQARAQAB +tDFTZW5kbWFpbCBTaWduaW5nIEtleS8yMDIzIDxzZW5kbWFpbEBTZW5kbWFpbC5P +Ukc+iQJVBBMBCgA/FiEEgYZKA3XyeBBk/o5Nz/n5Z0DtlVAFAmPAfZICGwMLCwkN +CAoMBwsEAwIGFQoJCAsDBRYCAwEAAh4BAheAAAoJEM/5+WdA7ZVQwu8P/2DZZGhX +eVuWGqss2bGNJWOKjagl1LCHU13OYkWs4Cc90ojGZ2Ls8+wPNbl57EPcUOLp2VF1 +h+gozkmT3XOZaJICno8On17MSbZh9tHwKsu4XnQ6vvDvB4J3dyusU1HJ6LKpBWcP +3ih6JGaye8X1c0jCxVvdzB0QSns+A4MZ70X0o2ymrM16aPs8qcMAsB1fZ0iUEsA9 +o7DysAK2zOW36sAiAYiOCMsQWbTwdOeFUfmLgVkuVioxFp1+Tuy8LyDvelgkcA7n +aFupVw7ke+rSmFLNkZ7txICaxVPXqy2m3719k9GY/Ra9Q6Vt3iL5V69sWSnJodt5 +tPOEquApq6pfZiH3FDDKy6rxPk0yYMDh+ReAASXLG48idc6Db7kvhgqRio70C3NA +rwM/l8x4YVBB5LhNYB2Oh5eR88OCeHjjgtb2pO2SgXhXOHzA46SP+pxX7E6XSmnE +DBOeBtx/Xr3viw06lBFEXw8AigARMXs0CvVAxdTHr5NkymlZMn9IIvPTS6P7pikI +KHRK/s53UCOiazNmIJUqpwPkZKwrMtG79ewAYsKkDZ2vZ1nQlhzIahbv39OkJGzY +x63GIOrc5QfFV0ZVip66BoKulA05HcFfOBS21bQq4bgwH1fAMUkd40XhBCHE3PrN +ZjSETS+YJk7zFIUoAzIQIrnp/ieQXChV/hsNiQEzBBABCgAdFiEEsICXn00EPhnQ +WjacYp747gyLgzMFAmPAfpkACgkQYp747gyLgzOsEwf/YZs7y4fYA1K/qN6GaUtX +SqrktwJSafO1zfzCcXDDr1vkRjGr958Ckd9e+pDvPebBHRCnztFVr0bq7zfVZI6W +kkp2BNt+6LsJY7Eh1uin/VDLx9SPHjfO3gubyoW6RD9HSXRXuwBJ5eMXclymNQLW +AR8oeAWl6RMZRe+iwdEXUwS4iVPlJwVd3OOluaRrQ2Lgc1/pbFIPSmgf1dpDGkW9 +8wtlWCQ0rPgKFN+IL7A5s25YQf/rdv2xhYxVpTtzfTto/6Pkznf40O2zB7pbHNqx +Dtz9AFAWHxy2q/Dd1xELiVAKO63OcHyLJ3jXa/MIYmgD6L1A5w15Xkrb5zQXnfZy +64kBMwQQAQoAHRYhBLF1lkRTA13O3XvpGWBN+/KFQQq+BQJjwH8kAAoJEGBN+/KF +QQq+5F0H/18B1V7RcXLbdUUoFxXdAjAi8q3xrt4Q9K8qU7CnwjBiEEVJOs9BLilr +lYGWglPzoidXFH4xhkU5NIZml4TNTAz43dC7JHshrTiYT/47RlK6ZOiL3TMlGlfB +k/WxziZmiq0s9LzpKbtzHNYUwPlvajF5XhhB56CgLaHMcJvV/0h7aupxXpSaPRJx +sL7TpxRbHwUMMHZU8yTg/hqoUPiaOxGrCtDEGPv68I7JDFnJ3mCDJ5HofFp+umo1 ++BeDxwA+Ww3M6qOU9tZEcGbeDwbaq4K3DlOT0zSYBWsTebABvUt+ZI7YM4Dw30FL +hfoh1DqL+84XmGwVh+uehTAQciLc5XCJATMEEAEKAB0WIQRYcmIYqRNADeZgNgE5 +pMd9qXiEsAUCY8B/NQAKCRA5pMd9qXiEsFiaB/9YtG5NUXPb24BR5+kJRHorRzsS +FxXtqggrCZvKux5Pxp/PB+B6mFBu+Lzs1lH7p3FRWjFe6lCtjuHZ02IzVY+S8VDi +tfn+RY04Ie3gmLPj7m7oIxwtpf0xAhNWw9WsrC/dqRk+Z71m9ZAWgLSUQOEdVjFe +S9GrVsMzZAGR1khN9tTuSuBWIvf959A92AcppVKt0BeZGiX1hXuD2jNlastn7FDx +Th7tNs1jEwcvB8N3/HleziUtRdNLTpHhyL0Kj3MAoFWl3vYScfQjUsyzmvp/xqX2 +IFJ+Wl+R+GX5lRvim/L8mUhFqtdoi9gHKi4zQeSX8euthSKqQIeE9YJ6vbg3iQEz +BBABCgAdFiEEynqPOaJBn/+wqasnjlrp+87u9DsFAmPAfzkACgkQjlrp+87u9DsW +vAgAk7MBqFo7zWs/50346LqeP/D6DBRJ0JQ9k0b+WE9C9hnm69B/k/y1lwye5nJu +3O7P97WQ7Id90tdAPfiFGpiIVf5bTog8Awps77M1A2m8cuTtkyevm3C7IA+UeETV +5K6v0Mq0xF4AM5aQkpmlRWUfkDJrmePOO0onlKtx/qgGI7wRUlpcBXa9c80U92ug +3zuoGLkCNFK26NFyWKW4TcJ3JazqqY0qYKZvem84zypx83+9RzLbAO+MbOFZmt5V +ltQvNe3+Jr8eM4/QAMI0JamRWnYiaPrqXd0LKNm8tjgT7g6OougGE6uz2X2ZnowX +GjnQCSayuqKbaIsjzwyi1o4JKYkBMwQQAQoAHRYhBLh9RWmG8ZSEB+XMtD1osl1S +B8rTBQJjwH89AAoJED1osl1SB8rTneQH/0F1YGWsDVYZmJuwk9YdCY92PDznDWqB +jRNRhLvvCwFlDfuOsdRMxE7JF+n9J5jtxS56+Qgg9GZBeH4t0K0QuxFr5UTO1pg2 +HacEAkjCajqWsj9eiNqM+FkSvqZlhJ5bsQrojbz0HbvjSBqz0VJZPPFvFfW5PnRf +Ks+pYgsYYYJJr+1pr2gAd632MXXeVVoq59bHfvSSsSBj5pHIOk3avRSUlexKQAKK +Zguue9Iz/FbHlwtS6JU3zF3GXlVEx1dKi916Pj+qZc5NWqeVj2BFSIkFMzHRnbnC +5r1J0wnmnrEAbNjXLRyUUAiqygYYNjoMD5ICSdAQlHaIlTelTNZrGjKJATMEEAEK +AB0WIQRJ9qi+hHM5SVGRbzth3hHs4nY6cwUCY8B/QAAKCRBh3hHs4nY6c24iB/0X +vLosenZl+cY1v4ziEb6kmpw5UIiq4dk/qiu2E7LSHdQsiRcgMc9OJSiE1Txk2w2d +RndDoGHmUc5fWHM1L87a1UwQkGDtUcZyvktIRY8C37Jlqa+o39Rfmoc8m23ko4R9 +xg1YfHswPjIw0KeDC86mFkjQ9l4lCVj3FNy8SZ7+XGLPGLonnAp7y+bMqjIPPSgx +a4ze2V8J8PiQisUQ1qoBGLupUShdyXCo3fasIVcaHBniVamsJIdWU8bcLxLeT6rc +10JjiYsY86xiMNeDuSQeamBV9wRD9SK/65sa67ZcJKEQxlDbnj6COhHWtNiPWn4j +7kQoZ8rzJmbG+rSj2g63iQEzBBABCgAdFiEEMLynRwX6QVRVcx17qvW13gW9zFMF +AmPAf0MACgkQqvW13gW9zFMVNQf/Spe1/kroQ96SexHLif2N489Uk5yQkyHePY0T +IgyIy+zA39vGcSKeAP6GY0jNaB5tSqtPOhsMzbcmF1r3R9/6BXPRYiXFAYmodqY2 +Azi7DN0HGZXvZ06Vax1fktPQM9SkM1aIo1tPR29QIWB6n3PmoQbfm8azPP7sLkhY +h3SrEY45836PyYhNv144AhcVNt9DH+X9ghPzOd3+pxxODfcZONFI0zxI/sHVUmzw +n+vvoG9QWYkubHf46hWKUdPZS53Nr8lJdGJ6Q14MaQROc0WXSD3xDDxpTb3/LhVB +L8ChtjbFW3DO2LZaAGzxlhajceTHkZhsTl4zFXpRtgqq392u64kBMwQQAQoAHRYh +BA9clq7I5p6cjlQuXG1M0ZQp+wPeBQJjwH9GAAoJEG1M0ZQp+wPe4ckH/i+wcoKc +By10pwp+PEa19icMw1yHw8nf/z6y8CNBx8w+dv6c8DAwj4V66A0jqzR1M1JhXHGj +kawT7tz6xCfb1fFDz4142sujfALzUoBhnUVZdsuhLuUbP8yfqvy8ZzC0eJyL3x2u +DyNJyhf6QGT3n0sNzMgoKPrfHJ95RiBBK2bZB7Din9hs2Dn+Rwmh78yRzxrF84pp +KRSlIm/tK/oyriggFjUluw3QJUoXQ+Dr/W46vGq2Yd/Q6z0dmkZaXrhckSsNOZgk +2PZq9Me5sZqqUJusFKqp7uqrG0Ck4SqYaDPlVRW3MJqpy64PGiFpSbz0ZcgDMEkx +DTK/3s8EuZPM66uJAjMEEAEKAB0WIQQ8ih6Of0TK3hFP7UZLyb2ma/cmrQUCY8B/ +SQAKCRBLyb2ma/cmrSihEACgDA/XzgwagANu3Ckz7lHKcoMn4FEiIpiWoV8y4wF5 +k5Ku20QYsODBaJlVxn/d+4l7sRrlVd2VqlTNuR4J8Gqv0504iic9vxhIhDZ1AmLy +Whn6L4eildS6fxIplSLPtippMbTiDuWATuHNy/nC/kym2eZwfPhA/D5XJGvBYadK +6oRGEW8FkQXINe0EPID4kk47w/tY3BwVNc6IwBL+ayvdH6OgK1ojctYkJDGH7JGU +C4/EJb+gQH5x/B6vzh2hCqxUMjI60v1Y4bKGLhMDmHEzJnRAEC04m9d8D1VIGBwM +dhE1wFlwha7BbMoBxeyx502Lqi2T5UYYbC3lVvN70Du5NKTRvgNAb305nKLO/u1r +l5UrRocediaZA+aKxzgrOH0DVuPumlkM55LmyQh4+SG+/Wx8wQIKrI4mvF6AAQms +V+YUnhMZDbttTN65wDgIVuWbx/rbooV4UC0UTTGXQgA32XMKBrjF4V6v/xVEvD21 ++Pv8hsERngyPg/DmpVhdH1nfzwBIILOeVKEwUfxqat2M28Nh+Rtud/tloqcTBRD/ +CeweYnfE7bHOWa6wrdHgs4ePE0qRKp68aJkZwB1AEU1f3zLHjYTEPA7jsDXpQ7Kk +UszUWjXvaOTo69TATJOKE+JqcSgPgHAocdfnq3jusyOVsxv70sADbhHHXAMWbr/r +1IkCMwQQAQoAHRYhBKaHPSSk1tYoSuQqdfBgWf1dx8w/BQJjwH9MAAoJEPBgWf1d +x8w/e0kP/iCb3A4w3WEjyff2/Rg/+l+MLj/2sQTUn4ESPJXoSzv0k8Ug0HYIp7oQ +qVM03KFJDkzgrKOv18LQmFmkxbhgPblDr+rmfuUhuEGI8EfJalyn0OWUo5K3Mlb1 +1Uu7JsDfaY/YgLGuCavRU/QmPVkiut8PZe2CcQTCsI+YaSGK2p8bzZKxYDR6/Wft +p+Wi/UD/K53goa5fr2zH3aGlXT6jwewgbocnq/hrlREhyKuiaYj/99mpi/LXX0/a +829ObaLO0hysSrSvf6xgDvAdbbkBF3RGAXPTshfDfzaWppCLdGdBSut8t4fw4wEu +UA9SHwcW6zo3gs++lGUOSWv53KKMI9oSyIJFn1SQAIeRC6qPSPSmu+LkejydaKlO +/B3nmDdNwTNZA7U3W/amRrFzmhg+vwBWQraLnsAoBO/MdVDrVR9OOypvj/PEK86J +kF1H1Y6YbbGz9Xv/XxksAeEKafHx1057QR8aZpec47WJRaZqqh3g1D86uMowjYrm +LKD7mKGq54RkN5FP0/HiYPev81yc8vAOhHsnTx37DGj9sGiloiOSZI+V/D0MoZXb +g/LoxJEKL616hVdFhloJP4BaRwUVtC0e3kKayCe/ND6IzCLGsG3ZVUihIghz/bLL +7nN4jdkiIQvOqGnwGQoho9hzI728ZcJDQXonTX/pbWGCvZBs7exciQIzBBABCgAd +FiEEUKMDCY6i3XvL7iraCeAfoDwMUE4FAmPAf1AACgkQCeAfoDwMUE49mhAAxgOA +zA8tKzto0jM8GXYHhopYA/xFmFOjfXAgnUIN2CruDqUdEoRcmh55B4VpfA/yH6XW +EnY7Ll/bT+v5SgR0cZ37bmfqsWLWJZ2qFRF2xLBMQdBWhtI8ZckrfPV286bHAoEX +iDERHjaGYfGI4KV+gVfo99/SMCMc9J7cirIBXdAhZl/oZmLPZXDdYwso8p9Ypls4 +IEU3u/DSr/91XVk0QxjdusXi+sE0aoAPYZXzgU33S/Ze2VmYK2IW/3FQqxEi8fp6 +JdhCiSuOuPSzDzOHHZ69PkkJrAMR9q4pfHGRFeqHDtR1IIsHgp6x2Nllsn3wXybH +ViBPW4iiCgnGO1cUyeej+okud5zM+T57D7wlC5YSuTtAhFp2T46ZfY8uMzcAtREj +17M7yZfJq5CIl3//jRp6es5PrxNIADWlQcJugx+Bqb920uoF/wq+4P3boVL5KQB8 +VPRC7TpJk1Kr2jUQ8AsIue3sNPAeRyLeOSdywL1Nc4LJ/PVLOG3CVMd0/GvpDV7r +bbNiQ99epowSMhe2tX5BfThA8gvXpXCnryH9ZP9gMYL9aReBgB+fWEQubR2C9/fL +ChHQEXUFjVbzD9AAqrP+IsI+k3BEx/xC0mqdH+K9r/snmsIvJZpHnEDI5FDlFcK8 +OFsnAJeUHgxnn5YpzftpCiSEt3/4LGKUJsAX5jqJAjMEEAEKAB0WIQSt/bcJ/h6m +guWFWXHVgyEO9RRxpwUCY8B/UwAKCRDVgyEO9RRxp3QUEACSDSNLfjchj8I7cWIP +X3H/I6pWBgLfNSaG8HOUJLWtVy1sBa/CjahoARqqAfVrRyxmmlWZaqkL7/MSdHCj +Vub7QdXoTrygw32CKcEgDhuRfB51DxWzqD6uZg7a5cdpMzWcbyxFXa498CLG6YZS +0DUYkhxCC7lolyhS+TX5JhLfv2mEYUn0Ut5WFPASEX9ImYDypSo8xMeBNoMaU8GR +NCDVfrFHXFvMVbJIohy4tLWprSZ0tCiSQqGeqj1kwfu2CaXu0nT+mppv+YN+0kJf +YG1SGGcjZvMBYuN7TAEk6k5dhUK5oV4NkN6K3av74GnOenjo+9RU+ovS2TSGP5vf +IAq1mOYL972sB3tSryrVakhNrsXF1Pp8TOXcU0nu0yX1hdZVaZyglmJyZWWydhGP +h+M5RFPEqzwan3SEUm+VL2IR7DYf2JE7nQ5eNOZzUFHpFqMGGhMsLG96vzct3KiZ +8EGp4ohGrkP+uomyAiBKTqyPuyhFkV0edWCQfblmXsENi8w3VJN5z+fvcMZ9UDzg +mU5Pz6XSfh8bQf9gdRB5803TcIbj5bpYsA23UPeJYwa+MlLLVYLl3n+Wt/HwwSLk +me8dZW6BzjRWiDQ0hPjM++TxIPUzeI5p0VJlaBWcNarKe+z3XwJlfQ/hGLjiuDzn +v2gH1bJvp6OuiVeWl/45quB1xIkCMwQQAQoAHRYhBPTOImMhAlPWqfl5sExm6o1L +7hvuBQJjwH9WAAoJEExm6o1L7hvuohMQAKCChgHK1Y/JaLMGkoFBThyaVKCaw0FT +z5zvjfqunNgFWnip1wQhi6inxvGcjoFFtp4GwQO4yMDkN7dkn5NIcmgePhJMm3xU +cgLvVuhimNmvYyH2TduMvFOlfrJEPURjxRGc6LUUXincvwo+C+ydYFJCkWIoEgKW +RzSY3qsISDZmXRY3JLVRjXqO3nnvsR2aB2bgOP/EKS5oK4fjpi8nMBJXX6w6cXFH +4V/evwpi0IlvELLzILrq4hPoK1jpp7UIUOEC7FJkoFmrNoDvR9WFEC16xoKPpcc7 +ophote6HyhxZc9NKEinTHmy6ICAuCbGL2ADdD6UJKQfclnutw6cjEzA1Huc93MSe +1LOECsRq27wZ0Gb65qQNiS50oIpMaLSRwxMywLiNbyzdBOoS9P3mtOQLPihwW/Zl +BdLW29LqTf2NPD/YGWHn4tA45BaTA7Q3nvWIXuoupWfboW8yOxplGSxaDSGfmWhf +1nWPWHQm12fSHWHTBOX2DL9LVmzERzbjxKJVK20acvwFWbkbJnTcNZCYUqh5DBHA +FKOFjJ5LykxqIAkLaibqwxsHtaXgWVM8us6UY8fQikt68qMZnd3CUAeHF6xUVWfh +nJLXjqGcGl7QMbp7c7AuchnXSVNw+ziluzgOV8/ADHAy2vBwISirb+9RylhpRwxK +oOcSf2vSNE9tiQIzBBABCgAdFiEEYyfdy15+gOSYfqO3/XncDIHZIQoFAmPAf1oA +CgkQ/XncDIHZIQqAUw/8DKw5e/TRjFx9a87GaE+sPKn1oOMPmqq5lUmTEoFDtKxa +KCMw15eoGokmy1Lb73bxHHdpShHuo0ZwwtJpGOQC9aXzoVOLw9PJ6QamU61yoSGM +oAI7rhbYuVVTf8i2Oa/UV4sK+Yc6kzFgM7kZManj0/MF3y89JTnUYkhZ0pvw8ndE +eRqqElV7derO6ANWwNv8PntkxUB4uP5NanoyvScYqiruIWN3OgPEfqvf7loC6yMe +g6I0/UdJeUAGERkiGpVh9HnMxZpIxVIVFmA8hFdvR1rDkxTaFVxx6rlwObNy2ewM +yeqdF/eJm7P3g+z5tX/f/LscoFXDEHPJUf8BUbQCsHyQcvCcHh3dLa++tTMEpHdy ++zjSH/u1CNTfKL8EaHMsffQbUEKqD9Eo756mULzNcsdScEQoCwOyX0+nh5uoZ7UI +JMhVXDfIXQ1fhtGv3vSy+LdAUeo6yA6F4V4KTp3FrcpBRtcUdmmD377wr7Oz0n8X +k0Yhty3O3rlRAh+ZWF01sKe3ghYN5J5nktszDOh22rc2KmJn8VbTaNyzBzxB/RQl +RqyQYxNaBk9jRLRiafdjGjBHvt1eVo5/WyqknD+j/SrpcY508OLM524o27Npl2MM +xoOwvBX93cVmZpDYJFwNJloyT9AcFLs3qeKfsntevolwbPoE9pLCB+6Mn1DU77uJ +ATMEEAEKAB0WIQStIOGqi0E2cKZCUti9J20ub8+ohQUCY8B/XQAKCRC9J20ub8+o +hSOrB/427yQ7WhIsmadnyGOL8HUcE1YGgAz6fWiNnIZiFntHbBKZfxxugGXLj56G +TqZeoTy3cte9icOaZxbOKNyQrWwYGhPueShbAEGqU837OA0vWOF3Whbw27EPgAsa +9gBbQUc4QPM2KlNOglZ7e3m3wMEFEdOVTxw22Dthq5xr6U5gj86sug7qOFax/MEs +1RMCFdy3DLMpS+lbgwoSYeYb6flTN9fqdtsQ1iTzt/XYyP2PPE5LImpDY0oh0RqG +EndfTbCi5hvnOgb99Ws33ynLzNVBlNOalc0QOa6zexbFzrsAqipFBlarRkHzW7GN +B6p/o9CP/rdaMsfJFPbPCgotkIk3iQIzBBABCgAdFiEEKWyU29AoAkW/05HXe1KW +SO6FcmQFAmPAf2gACgkQe1KWSO6FcmQkzQ//ULifrn1CA9hOcFv/wWikZ2ZmdTdN +tBp5JeyfCspKMTk+s3ojMvbD9iXcOTn6bTAzCiVVFoK1vPrwOd6pW7yBxyR1HTjZ +5lu1/mW/lF93ASxEDGOgk2I1v+I6+h73E0S6KYMTwLt/D/RBBkgeRA8/zbY/ig7L +D+mfUrxILwJurPam5Jdfg120zidY/k6pQdHdAtNk6Lb3z0px51SrdSZSKDiPMu8+ +idoCEckl1EUoWXwrLSc1794S6Aa6PmfpJjvkjtV20Kz+4IaFtZWbtFrCid4jBI2g +HUTQY6ZaUFL5ac/k5alefjRo5PmSqCJgTMPjC0ZeVjbFmhructO+/4dBjaUe3Kxn +iwsfEVy3QAte6VTA4nORD89UyX4A+vtiosEccKTSIXIS08VW7hJ7OfAzI8HWiTxe +FBHuROCgIeEqQ9EHNJ9zDqC4nEF/uqWdekdRaKMygkdFI+XY/YC/f5iMSEZgyaQR ++AMRhA6WCXZ8zwbKlbXShsB7nR0n58YyNxiHa39faLTsKXgPGFI4NI6nigwSuo0V +5E1k0LaqLnbUpAJHhY3F28XO5Tw9hn9EHYesHFjFrtk2V7aP2ZTLKEqUAd6UDJ5I +AKYQDV1asbFE/DIOmVGLx3Rn/DWqs/EAnRF0kvKPAShL1YFV3Woq4wx6x51EAQUl +wwwoTWZoVVVTj1WJARwEEAECAAYFAmPBLE0ACgkQEJCvIKWqW+Z2gAgAkiljOYsP +2M7b1odb/W9MqC9a02pXPYs72QIV4EYG68XwogrifZEzwH3Nyatt8OW/MxyFGbM1 +MyV4N8ESQYQuzrbbESsZj4/pd8gYMugewuOkBqpiAsYQMN7mPk4AQlE7+EVrUv1e +0ILz/X6Mvtf3v/Oendz3GoLSC8G59wN8CMmiYfKVBBvBOHkMcAR54DcG5qUm9qrH +9Bj2xsdT85vkjBP57A6QJA8CIPL2whTIj4uh6ITdNJ5Ux8naELn79+nWN6I3XzyY +mpxIp2k9l4O5kPKnq3O8RQyA0bkKEHo1vEglEntT8+Jp6rerF5T3j610Uzjqorpo +acXp4TPhzqBT0rkCDQRjwH2SARAAqg0B0q+BxY903PLJ+J1Hl7paYPeSpyFj+SbB +gck9M7sCBzVFlclkLMsaHyc1GHVzJNPcf0gRmknmb9hAmJFEwEle5aGbSxuTbG8j +Rww8vzP6KHwlBW7ifenUvqjrBuBxGQW/jnvZTtSaMEaLYQVS8e9PxzToAKbUylc9 +Qqj4hWU2hMQN/YQq5jOAv2RMvNTMX/fXR+hlhsnAy3NeXQRltzOcwHBbY95kQ1sG +3UpcDc3soEaZCYNCZdwQuaZ+YZ+ixEGTxfQv59HR3eszGrZoe2lfkW0VaO/wXsau +Gs1xruD3oqnNIDTuzSgz7FKXgTv4QhF4UEf2EtUd2Wt+4IjcBpUPSt5+fDyCHtpI +bP0FbOmFhGjubi75iFa8H997a0EQR461Wde7/MP4+dgOTaR3wdUqGM6nBKhSgbvW +C4pXWOHrrh3BzBR9nArVwRTovu40NpoWKAbdIkz67KHVfBLNq84zUFMU6WACrpGw +0zhE33EQJzb2h/TZH7OsFxOSwiFWYPy9MTDOgdqJftKKWYhWeZVVeHnD+3tbvrag +OuRCHwmfIaV03vMi5cCJQVKMSOExG4VGWSeMrRWcRzSkLj4gSA3R6mb4zzfo3kDH +mUW2UfLpx7Ru4Lswm3AAhsClqZn9/bI0oNVyuErQdm8hFSStUQCJwPrMzdtw7Fum +le/unx0AEQEAAYkCNgQYAQoAIBYhBIGGSgN18ngQZP6OTc/5+WdA7ZVQBQJjwH2S +AhsMAAoJEM/5+WdA7ZVQf2QP/13LppaOwx2NAvf7wZWf6d67M6EOmpBLPSqtGkdi +umr6Po1A940R9lAWAk4w8DZRC1MaHyXNb2G4GDcnynL5xb92DLq27VAMZy+fnCTH +g8Qk0k9WaBuyBAragSinHp4R0ts0uDxBjAwMm+3wjopgJVP0eCm6P1gbXgc1dE74 +xvsK1ak0SEjNJXAyxXw0z6pNOQAoDMYFJglYP7nr/ygh0YsB/EisVxoxCB8jczu6 +6vblp29TzcEapCgWQ5JgG9XZFo8xS0COMb2BTf4kCjJQvkUQ3J7ieDlbbKjO39YB +Md8WcbZ/lBn7YN1E8XTQoz1NvJ6F7vdyPJvsVfu/Mii/eMKbmKyCHoT9p7vrXCGF +L9LAHkWA1yDe1uE5h2vLSo7iAoGkAWlZ+BUPV/PEzsusllOUcWl/0GSzJPvMjCoP +oiRKHqC/wrMw3d2KCEO2y3k7/b1ka7n3ZrUkL9NegX/igRaDosowABmHjoH+/YJ3 +9zzQVGb0q8VqkIyI/r0QHfreaSzU9BYxVe/U4kis04jT4tgVDqeO8cWbIykAQade +uiF3SDtJ0F5IKEwrpgYBg2jV0cj64hVZMOZ8lcb00LEiA9/7pO5SVPsDKZL7cRmD +led0tZf4baoNVgr7rosixRvmbkYotj1qxw1rhhVDy/cg5Wskuw0Z5Fwq4sd6vclA +kYi0 +=c0eH +-----END PGP PUBLIC KEY BLOCK----- + +pub 4096R/81D9210A 2022-01-22 + Key fingerprint = 6327 DDCB 5E7E 80E4 987E A3B7 FD79 DC0C 81D9 210A +uid Sendmail Signing Key/2022 +sub 4096R/03142938 2022-01-22 + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGHsknQBEACuy5ofFGpq84xVTF77J5aYl7lmQ0dzvUfUmnnFBPU4A81LFxjt +zjFy3t8Gg6RQUoznK38iSsHpNYaipgzKdk02XRWNLK1vNhPhWePDYqDMewysBnqc +bJC0vX4z0XFP6T+apyjb58G149Qlc/y67T+b8Jy65rNJUr99rQ1EX5lwuz5Sj9C6 +ABmG4u4fZcLsbBZCP3QFC+Vnn+deTr5zzj7qqDv/w0bQad/jzEal7RE3tgJ9E0sa +I1SoOMUgt7bo/osJxZjAzWCrf9yT3Dps8ZhEAATP4rRKLRbZXiGJiSLXT8y88JP6 +LBtpwU+KU6uApVSKDw1OFUC0bE3/hKUKvKe1BUXOEieP0kBdjclGSvX2iDO9Bn89 +o2KxAZ2kCC7GCHBHiSn0vkWxuQd6Wi2N/sYPdqLd2JHpZ58ltBtUE/2jYWNXQZju +iRDHWHf3zZCbB93VS61xpcJm974f1caMtc636GROWTqeF+Nd2Hrx1hKEbJerjqZf ++QbE65waP0Rrcfxt1kECEIjG+v86SucfcyEPfTqBqK6+49dhIgmA/6b+2UgVkvpf +BqM4PZBqRXbwzyfp2fkM6jfTKWhbeJb5JQxHfnzsigJzZhcDfQllhUF4/ec8dEpC +3Y64Er4qL8IcRiMf+Dyaie3u7ZqtRqSQHMDZ0fYKDtjKmTkUrHfwqHWR/QARAQAB +tDFTZW5kbWFpbCBTaWduaW5nIEtleS8yMDIyIDxzZW5kbWFpbEBTZW5kbWFpbC5P +Ukc+iQJVBBMBCgA/FiEEYyfdy15+gOSYfqO3/XncDIHZIQoFAmHsknQCGwMLCwkN +CAoMBwsEAwIGFQoJCAsDBRYCAwEAAh4BAheAAAoJEP153AyB2SEKoHEQAKouC0qg +f0OBcyw5EWd0ja2bPakBlNkdE2FGvtOF81WvZ7f0M0kLNRzGRIsRRBxDVw7Vyin5 +wLxxRHxoSrRMTS+3LbKCrtXqUyMO7Ce/SY77yXKbXfnVCmo5pq0QhNVGE1GSuvxF +R/dGKb9wV2LNbuXHo8xj85yFztFfGRLhkZs5aAaFmq9mRYu8IObf42xCFYALTAnB +95T91EQbixJuT1AjohgMXHhQQ6nNo5EfND21c5a72Ntzfj5gPfUUITSshxSPmE2F +/H/WfaVhkALKdMD681bSoXtC5yByTGkM4UBqNOnppplKFW8YFGiJ3Xzm5vN+5Lyo ++a+8lSLIRkBMJrVK2L80r3qQk4xh0lZiG5sFHvkGYzeWqKb0z9ADIz7TEUCUgpag +vYuSLexegNlYzRG0aL2PbeqVb6Yhy9ghj+42HNmiRGCorixKFJHA70q1uKvcDZ9I +Q4j18hlxM9B6Aj27MSXqwISNEDCiNIYbSI8UfmJ8NnWnhqNbQ3a9lmOVC0JB5TdF +enjTuMb3VovjNWo4LTvQdhAgsQn0MzWgdMLgGzLWmR0fBiyTKS7kMOU3SQqaJd7s +eUTOv3SxdkVGcsqpFlbJGrXwFkpzcay84qeS0afxEpc9yhewzMU9Y7Xa1+vFpqfW +b7eIeBIB38PwGhp76kQ4P3/mDdlRWIHxK5eNiQEzBBABCgAdFiEEsICXn00EPhnQ +WjacYp747gyLgzMFAmHsk2oACgkQYp747gyLgzPEswgAwOi7pq+JoQtQiXYlE83w +QoTUsaBYA/38IuYo7Yf7LdNlpwIQamGNVJtNQAYT4AhMdZELyJUtV5Wa4S/D48Vu +EvoVLVZmdsbcaRWpWvfptjFsdcC9Tc2W8Ww0Vd+lmphMR049vMuqbR+kYlUxelIS +CNhKwyg4GFUL86C48TDvRedvLWRX8moahLntVN1QtDYQ3/bn+JsWzHiXOKQ66Wsu +gg97G7cectwEJnJd8HIRTo7a84LN/gTwt9Uo1cB56pULEA2Xde+oySg+T7pW1eTQ +Vjq8L6gaHl2tyy7il9tQAhs8Ibzlcahh2BfYENss3pPUpMcASrSXlGBuYKofGt3t +9okBMwQQAQoAHRYhBLF1lkRTA13O3XvpGWBN+/KFQQq+BQJh7JOEAAoJEGBN+/KF +QQq+hmQH/AubZHpKbUVstoAa/CJMGtLpox6Enwl3J/FPYsjJXx+xpRZrE9w514tw +SGD8B9DcAM/JC8ZLeo58OuIDGaxovP7Y96El+9a73bGw2HtVzqlIB6rtg3xMNHCR +RvYUziIKi1Axdwgn/LLu9aUOduOUtrG4zgNEp46ZjEci87asouUrw5yqyeSDGSRd +ryYbt9Hgm3WD2cksZUmqYvXfCun9teh5pBn8gn28HPMYzpw2/iTjs894xIW450D9 +BiVIxU/WNub3CA9GjGjB/GRdbVkAEseBmxGBeRx3qjAyYNs+9YUsG5x9bx9zpGd1 +ktNEJ0b9mIgLMhPVC/6z7ye8MWhVzuCJATMEEAEKAB0WIQRYcmIYqRNADeZgNgE5 +pMd9qXiEsAUCYeyTjQAKCRA5pMd9qXiEsL+rCACOFWzHtgEEtJheKj38MVWzgimL +Fsr7V4M+ewmDc0FSAboBzazZiDtjryJ9u8r9nIklfSL9DxjVPSV6s0mS+oUpG/x4 +FI8eb4VSMue98W5kMIC6k9MfGQAccn41iPd25nCp2VcnkOhXIv9s/XXoo74ZJIKb +uIRu7fkFwzhn4kxGiphqy7DFsTwLlsbFEGG7USJXT0QtIj42Wvz086622vjAFmVA +70icww1/0I7gBIVgGmv64AdctCXCJUEa63DGj7Ylqy/t+vG263BBIbz+rM11tCPi +ah0Qc5L5sX3t4ZkJ8eTSbUzqwpD9BYiXVWc6XTLMc5OVjJ3l/OZpDko4Vnl8iQEz +BBABCgAdFiEEynqPOaJBn/+wqasnjlrp+87u9DsFAmHsk5EACgkQjlrp+87u9DuM +VQf+JcdL8c/F3s6IZ+seglYPfLOkfUUaCWKcQ7hYaf31DJULMpTPx6QMB1x4DVns +b+GnSlY7OEmvClv4iDT5s5pRpAxOjJ3Tyud1XqwQ7en45ZvRNbMOsYV1Wzp+JnBW +WU5aI1Fg3K6PFMLDP2p5zgzD3m5MD9+5QJ8mx8l12TbtC/h5yWu9f+PV6DsB7m/Y +zqjiRGf8R3S9+gE9Ve9opnWx6gnEVhqQCNSz2fpmcdxEyTG3Nz8/hJaplVzhdC+E +neuvD7xOJpcVHG14l2A1uf1gv11Wh5HFnA1ESGxyuQuRHaiHN4tbOpH93eVL73Na +OS2rlm8YyDMm1sS43YuB2iNaoIkBMwQQAQoAHRYhBLh9RWmG8ZSEB+XMtD1osl1S +B8rTBQJh7JOVAAoJED1osl1SB8rTuP4H/A2Mqkefj4zFy2HwfrFJ4BOSJDXtZpI4 +SrTmf4+N2WsjsRys21NE+uchZ7+YpkPlj0t+OeXaEMvxe83xOJnJ5w2xpqTy8XMO +73pqvbQLssl5gjcd9e4V+VQKzXMaywGJnU7DJ1+yMrvZqgmdVUm2SVwixViMxDf1 +c4i8mnTU02J0rNUoSn0pZURu7wwimiRisPa0EfS7O8T74C4Qx+g8Z7uTBbTdtEJt +rtPectAGS85MxISqaqZshMzc70NhYzanliPvq3XaJ7UXxCSWjrI/8pvZVND8i2JH +QdqUruYOj8CdtAliz9+XOJFdYE949a7Zb/fXu3cHQqDeOpAxJaSzuLKJATMEEAEK +AB0WIQRJ9qi+hHM5SVGRbzth3hHs4nY6cwUCYeyTmAAKCRBh3hHs4nY6c9kOB/9l +OYFFG5vg9ODyQ9TgGH4onZRrTNBZjYtKtgGekSg9u9bIMk/S1MYDaVyV/07ZV+4+ +DKqrk+PQijg3ujpNxguap6eFhuGPkwj73MN/xSNSiplpNDxLP0EKrVbxG3gQhZey +gyr6gqlYtWCsIuXWV+MOEhd20SrIXzPsX7IDw3JdgGxNkjS01cVvsoiKL17Nr0BX +Aevyuj+8IdHjsreucBgyz5OG2tRfpK/VQSmzhpQlYJKRsEg2pCANOJiEEBeGBgm3 +Dj5MouGL8ajkl49s38zoMFpxr3KoFj2rF3kfNHTHV5aybjwqLhE9Kquw3Pp59Q6Q +Njewgf4+S/czLfPLxl22iQEzBBABCgAdFiEEMLynRwX6QVRVcx17qvW13gW9zFMF +AmHsk5sACgkQqvW13gW9zFMqbAf9H08Gdf/qAdYe4CigvOu147hr89RH0LWtqvXD +R13cJgwkUQLPQZ3/xt/to/3QNDyETjcQkJcfqobTGPZs83ebXlICTfAkC5uNvyoJ +Dtgw/e8zf13XhWTP+Dn4+YnhBdCLkH85XvI+QLen73PzlKmgUc+Rf3UoXcDgdSVu +A/ouNC1A1ZKO1f8zQDM9MTppuRUJis11EO0nkqxu7o9ZnjR/GIr0eAYb5t5YoNLz +lc0IGskX3IHfCFcrQjBnUkWbUn3CBZTTLLgBX/sGTLqkrzi9W0dSCBsX/gF4nGAS +hyrpV9yP7bw71LDDdKaI3Ze/gviwyml/9b1UyCLhS6Y0UGRPSYkBMwQQAQoAHRYh +BA9clq7I5p6cjlQuXG1M0ZQp+wPeBQJh7JOeAAoJEG1M0ZQp+wPeQ4YH/jLO4HtX +zb7N6+fvH1IoebtpzkIxvyIqunCLd9wmMOd5/E2GWcHwzsi5ImnlfrpX9jdzuPGa +lFLFMSnK5WQA+G8j7tm9Zs+pmN1E5IcKi08BIDj6UY9NRwVVAxDQFQwNfNupCV2v +4wEi115eD5inb3uPfETZwgTh1IbMMYQu96vWCjUCwavAiTP/PWiAEdmGTFCgFrsm +chLHuXiRTLgfnrVdtblvZ+2GIWsi1IbJcOpT2Nt+I9HPksJKGpZWX5bzyHt8t3hv +tfHWFdX9BZv2jMBJFc8C4mNXX06fnA/OK39GbTDr3qJ5efjP7FxvCTatpuVxpUeo +bQoiz6yqLtHk11KJAjMEEAEKAB0WIQQ8ih6Of0TK3hFP7UZLyb2ma/cmrQUCYeyT +oQAKCRBLyb2ma/cmrao/EAC0QcShgqI/EEhInt1ELOXXqWzwyW4GxKZaATBKznYN +KUgCImW10QxQRG8TK+/x4mtAriPk6ANHHdt3ehzstrmcFlo1TmFqd2SoXHwLWz+D +ffX0WE1Slmnd4mGvz25LhftrGuGAzOZQ1v9QnlBmE9egZrF7x4sIGrHrRfKDAzec +rcgNf8zv8nZW0YqbHNMmxh1xFQ7yVTzs48UipyWxfTsje6LxEvsGYAuvSp8AUWhV +ILJ99c8kJRGdyiVum2SOk4MtP+Nl0w5686kO4Aj4gbiDMdCDGhwxFHDt69HmbHVB +kDyErjcjlEy9Qsg56YFe70861c5nJXoMslnjRN9F2EyDOFKGorI4jdinNiR7E069 +KXEwnouW0ZuN/RIIUSgIWzalGCkOPCPFEShZKKPWJ3mblEuXyfe4ayL4DVQo+5ha +/1kqRP7kPgjBkDyRxR7M/UuZVyPuHo0HkETQUlTMDwLAQH/ADSlW0zhqJgKFzOzS +kJyAciEzW/s1v3pwQR9/7+6LNJEoXE6ANNOnlnEz0hPWgm55XnyTmrLBqpW9XP1V +jTOm66j4vbS1MNRxtIbvkCKyw/Fv9hWmPauzEi7TepwgY2w4m+EV/0mNV3LTg0OB +4XH9bJ06LUvp1urY1jVoYD5ID5cyNeblmhXLI9bXQpzEjuw/fkqVaOCLMyiyXYFA +BokCMwQQAQoAHRYhBKaHPSSk1tYoSuQqdfBgWf1dx8w/BQJh7JOkAAoJEPBgWf1d +x8w/lJoQAI+SrlWdn+KcotHe/DZiY+HrmYdIAmdvr9xupsqpK5FrcHAZt/lX4iNz +Cb0/W3bQpgAr1SntGPo69SvZMZiuXLaVZvAjAtFfPAaE6qBOQOfMQM8I9CQ75Olk +ZTuX9syqqLRx90W+0buI2EnB1m8xdw3Zp03/+JYqXP+8qI8yEEn0+tGPTYOCYDQ8 +C9NnUwc62GVln/b5Cvvr5khURn/OzUAmSv7ah8hHhc4cfxnFjSgErnZ7MPRMm1O/ +aVaqV4Lu9OzT91bhLaJ/aOSPqI5kuKZjgEcOpJhjh2gxLKualF544sTei4GNXgTZ +ddpZZmRpGCLcOS+nsqeGeKobV5Ixz1ddCJMAX8BKDV/mimiDK4yCckNirK0AnTiF +bHnqkpPcmmZdp/GFtOWPoSu8qGJpl7T35sFpEFn3Stbd/sfImWhIhue8x3I6Qimw +DW/23SQlf6r5u0ZbO6ZWMdC3RR+6TfztHv7UDkBWEGRLGkQ/cw36uW3OiqEUS8wS +2uk96vnJJQTcXP59BYQgH/Oqv5QXfl5l5/h9MnTJDAHiM4CBsZIETl192nBT81Mh +D0swDdaU95NwMFtSmW+aqd9k+FFaJT019BndzSYZXcpjkBwpXF/HmzrdTLHZfFN0 +28snq/TTG3K3KoTOeW+6HeXlDrsl7HHmpvUo+gF21f8+2X/OuyvtiQIzBBABCgAd +FiEEUKMDCY6i3XvL7iraCeAfoDwMUE4FAmHsk6cACgkQCeAfoDwMUE4VGg/+JHaT +yujXRVrsH1dOmhjXc5nyDINZakUBT6fdYxXGsu37AmgYoZrBnTyAmNQd4zSAZ8Mm +uXGxN8LE23nO6c4/436kt7gH1ySPxlhdsiti0m7pl550i9aL1YAFmdXNzIBQUF5K +4XFqhdqy2tfdVbF/h1o8dZqrX42vvVba4p4PybtHtRMaiTPFLb5UNYMkf/+u4VfM +CbCqW/aZyhdoS+tsb2l3lOF6uRx1fv19KVhqnqIt1/+bUiTYVcgPQFKUJK3P0ilj +tDexFF2niftdgUJLrqbR+bDCPZ5ykfXuZXeCLmpzIqFPvj7dMPpM7WylAInyaheb +9m1JXJXtIHwlJDdVOYLfOo8U9TfLO/rvDKeeDXm5WCGgQdqEYrTbYNv3wg2x+/io +BF4dalE9lVrMt9acznZRemFzhihVSc5lHhb+FX6fJRCQh/vFjrMY7mj7SV4yc1X1 +OtdGJMvL3+p+N6AlHpYB+4C+dOmNpUq1W7ZCpwi4LRi73/WdOD4nPlQigvpHPy3g +L6uYH3Of2CwTonPY6ToTtKFaXjKQfthAIkN3cu2cf2v2F1QpL3PMN92LreQNAazL +oPpYF4adfPdlK8tkBrzuxN8qJsC6asJ17ztR5h8i5xBS25hTdf6L2dNIene3jwYx +8lizZ0GwtAVb4pNpg1tmlAKcsjOVZbr5DP0b9MmJAjMEEAEKAB0WIQSt/bcJ/h6m +guWFWXHVgyEO9RRxpwUCYeyTqwAKCRDVgyEO9RRxp7MoD/9p3eQq941AzizApnOe +/Hqjp8fkESw6UN1kmZBes7oYUiJGCRMRIKWGATVQDcPzRwkQdqhgc3MHI3rbyy0Q +NxZHTsZDPZ0EyxiHAJxkVnEyV44DpUCb7b/Hswx1jIhQT4OsC8dxKYQ6MPXODX4l +NzYvpwcSv4a0hjKDk+MZbtX6g4zK0hIKg4V7WHm6wHsIzgaDIZrY8s53KV7K8jy/ +n1vrrzstiFPpBtZh/RvS+HGocbHpdSYtdL6Qqh4eY7ng6CHqd4lGAXx1isHEJsc+ +G8Lx9JDgpo/kyFJu0mVQmTHpYt8qYwE6/hwwWZ6XDnifZcd7uJiymv8UPYWwSM/G +vFIqDkMJSQzykK6uzhZsPttcc6DdZ3bx+97qFfIWvQLpFp6iG38T6F0IT+iQDlDM +Z4KaswIntaDuldE1VJ3D9F0ndDlCJvCXJn9I+jwUKXj2Uqy/1OecLgIz9KULoim6 +A4RmLLRDtoYwXbwsPA1BEVskq6kkfd95VtjqXU2V/sh8YnZP2O1f5udIP8g+KUhA +zUp4Cppl8jALBlEJ2mBI5GfkWJgnARFu36nY0bpeiOn+1+CumFAC5p0QHZFDCD7I +7XB9VThWCnAW1mNhxie/o43CByfAM5hXieQeml4dDEGxazW3JCuCV4jpTnogArCC +5xSoNkIFXsMbSRexC2SFm1pDv4kCMwQQAQoAHRYhBPTOImMhAlPWqfl5sExm6o1L +7hvuBQJh7JOuAAoJEExm6o1L7hvuYbEP/1Hizeq3tkm8FZey5VewtvDCJNXTfkvg +3/+Cu1GxjeT8bfWGQKNEalaHQ1xU/pHpqD7QBvdt4pK3TaYp+kqfM87i1+JkCoy2 +Qv6YsP2Sf+VL7rLHGFF5JWKOj4mmL4Sy2ON+NhrZUN5qGtYSKu3P4y6NP5u5YxzF +kpCL1rYugc801SSGI4dagLyTEan0vwToXPDGYrS3Px6HGgKw7JL60dl9DqNsvEiU +iU/VNYoSklU9SHYIbDA2siGGkaEwKX9fGaeWsgErFg57G+az8lzvvm97da0HIQP8 +jQBQt9Q8gqUaISsVlrAL0fV3Eh/pGo+LabpufMXqcO1CoHIv4hD3HS0CTouAvpUe +32igiJyrE5esk7yIOPMuTaNFWUQvjioXO3mLh5qBsKtRyY05g9zAuhOzEefOrBue +0mx/uROL4dJht4v1b/UGdf2CT8JKtj6NZgQpJqMu9410EEYYhaFqIjAC5tDBe+K1 +ngHqr89u85nrwbuZEs+KGWYnD5jlHsz2bbwPSsMZkP0Y4oeZ5uqUDjPHBB7npnCg +Kp3McmB5dw32rDqolEkKXxRCupYeRb8KlyoN6DNriU0yjSQgqeQTCtHTnWAjigLn +Z7zJHOmDfE1t8p+e9kXAm94N2jAI72gWGD2bI1HM7kUgUbOqIgj/tafIA6wpMI6u +U+m/D7JBScmjiQEzBBABCgAdFiEErSDhqotBNnCmQlLYvSdtLm/PqIUFAmHsk7MA +CgkQvSdtLm/PqIXJ9ggAs6cAy7yKyO7sneFbSUJXDAAxH6tfN+/qPKYasakSkiYw +xQc0fU9+mcbrSXl6uNrQFdVBQUEUb1OWSOZN64Cy26KAa07RrgcJijEGVrQ/qg1i +IpaJxu7wheE1fE8wqfU8VGBsjw9pEn7LmsY4L5IbptCHMfN4l3Q6nKj25hosy6R2 +wiTdNHs77HP3IaAekHfy3QwnrcOdQjSQykcHb+DkC38Qd14SDxRBTkwq09LNigF/ +MNqpvA47i/Jc9bqn/SBJ5mki5v9Li5Nj6eu0dr7BDgzr5ZqGiKAXDe0rJxJ/n93l +qjBA3vEDs6m2L0vuujQj4y2Cp4Qrp5/yy+a1eHmSpokCMwQQAQoAHRYhBClslNvQ +KAJFv9OR13tSlkjuhXJkBQJh7JPHAAoJEHtSlkjuhXJkFGoP/j1E0YIUZLAtnJl6 +yTIn2RRebYHXKyZpwFQlbckgvkliezJHDO6EmN7UZcK9CLUTMulr2kq2o3BLTnV3 +7Qm+ROSSIQuGwZEzWliRlJVouZ6gMkfuhoxyYaxOCceIBWBgzZ6cbXnneRvtap7E +aKr57W0sO8QiFd0uq4gk5a4LYv1YiDgJMtHSsSrA//TGmInptvFQ6WQtPJ59HH4y +BQwCeEc1o6MRUL/fqIDGbkZTwjncczNbC4ZUIBlfeC57jzPUYih4C1feTk2YuArd +QhPEQQAlQHggFzLAc2iHgxRkk8gtZfeZ6Kk4vcdyXufn9Br2Nu7QT5v7wM3lmRks +EAcQucWOH6Mh1H6WmTOOyDUevzZxtx0Cb5G/l1TF1Bj94FNggsRdni7NUCc00OpO +ptsPFdIOYqm4jxe9ykoi4IDVkx1OgV7C/ND9V8VXZOi7hbAR+8Rc1pWzIXC7qMtL +T6PAbtE3H76nKsdi802KltAitFGSZTc/WkVm2Y7dcJyShasSSN7p2Y0NoCCM81AL +Lq+BYBO18yu6kQyXaJgN69n45Miui102cDpZKDWBOU2tP0YXVJr2M9fg9gmH64w+ +BzLGl8HcrjZkhgcM9hxQqDSzxYVodny/NMfEezyAsiK9bf4YPlhZx6YEy3uq6pS6 +ZLvOOWMbDn0W0EjHZfv3xIrtu9uDuQINBGHsknQBEADC/9jm2xZwcF8NgNc74t/u +ZPD6k7qqwb3Sz0DL+Dla/x9wbp5tcZsSPQIP4Nk8UQfxZoid0g0nT6tImrWBTxtZ +u5MYoaioDQ2FjE2qIrqjOypOckmFHVsWzYM4j7EJNn1JUZ72Ye2sdy0cGKDFhr0r +JwBrBQENM7QiuCu6fHMbwCvC1NE8IBx2SpLzFKDqemtMQ2Beao+5R2ix2xSoNYso +GQJwO+RIv2fKYY3cl+JLeGlNQU0eeBbBDtXVcnqs00KUxrDh6LLfjuzYRtWK0bBF +iw7Upq4TehzNlzGp8yE1IL2N2o1+/Ism3/BexUWamduY3HAu6l3MnPssS7AKUKIe +2tQSCZ7LsuqyNaH8diZykRiSFF/H7NduwzUc6QBVbXE5pFvzuraJu3jL3q6+DMtD +EVzjyeK/trF79jGlQ9dioNRuZj2DYqvXZ5/7JvGYOKFd7XcLEkSm9n4Q3Zt6GpWH +wWIimNgsjFo4ZYdv6JawXAjsZN4X0+nnAuWG3Mbj86gYNjJMDxgy6wovYLwwf1tg +WHCy8jUcOejFH7XKyjuQR8vTm2o/jHKoXT0FG+qtyA1P7cEf5VaJ80n0Vg24xXnE +I6tRrDUqH79gogOp9z6WnbC4+jKFgUCkyiQJuB6Y1rtLBFV+x90aL9KsJYMiyycP +bE3WLqL9TGhRXuYhJ3lZ4wARAQABiQI2BBgBCgAgFiEEYyfdy15+gOSYfqO3/Xnc +DIHZIQoFAmHsknQCGwwACgkQ/XncDIHZIQp+9Q//bdbiu1QTFRHRHSi7d5bTxqt5 +jCXtkFWSvyTf40/ul0t6sjdq8MkI94ZNb8/omOuMen8BgGtNBgC0SJxeXfYhBk7e +gBCGz3Ryu1Zz65nmca+WXaGNleMJRwnuK56XZZuTg1/dWYoC7FiRbUwt0FvImIZT +nWr0kAfdIkCdIbPHwrH5l9BTdOIVi03kfSG8ci54DEJ73PmmZrvH6PtFleUJvo7g +U9iWNhOFGffi0v/UAMK8UZAoEsGIY/JD8JFHerfJZbmEJPPgbgdi+ZEaopVYibdb +w56sTb79J7WiTrjxL9ngIn55zza3eOSDPeIulurpCebjb6DM/r/e+srQbhe/3slF +IA6F/BB8dX/qdUG4NWQHP6Tcruu3rUwN9cC6iPW5aYt6w+dOqZYXN3qbDu745CYJ +gfCyXeSTcHp7xsKXmTYBGZthB+LcHNt7t4wG/k2X5D+5VCR63V4NUq3P6uvHvH9j +hl1R4YsB4Vi/fqPUSK/MAj7VxE7Tf/4W/rBzHQEP9i9hkmgunOkQ0wbjaP44EqO1 +JHPB24py0dIBY9JWq2DqVHRAmvEZ7unbihLzJ+uzepsM84ujvipoT6Rlb5224unm +yB3NrRwSOHn1BpPIqBwNbt/lZX6AByTaTNyPoC2pitK2mJoMLU3kIwktpFEfVOmh +0Kb4rGd12E5b+czXoxg= +=LSBA +-----END PGP PUBLIC KEY BLOCK----- pub 4096R/4BEE1BEE 2021-01-24 Key fingerprint = F4CE 2263 2102 53D6 A9F9 79B0 4C66 EA8D 4BEE 1BEE @@ -363,7 +982,6 @@ ra/bqVWSpZTlHZ0xT9seCUSs1urxGw9Z =3HCo -----END PGP PUBLIC KEY BLOCK----- - pub rsa4096/0xD583210EF51471A7 2020-04-08 [SC] Key fingerprint = ADFD B709 FE1E A682 E585 5971 D583 210E F514 71A7 uid [ full ] Sendmail Signing Key/2020 @@ -557,7 +1175,6 @@ gmOJ78JKVfONBpmdVsw/emTMU5I/C/8m9l0nO0P4Q6diao23krgWk73x7dBoBqDn =jgHV -----END PGP PUBLIC KEY BLOCK----- - pub rsa4096/0x09E01FA03C0C504E 2019-01-09 [SC] Key fingerprint = 50A3 0309 8EA2 DD7B CBEE 2ADA 09E0 1FA0 3C0C 504E uid Sendmail Signing Key/2019 @@ -739,7 +1356,6 @@ HcRQfq7rqZkS3NE+iD9D/lUyXVYfH9A= =jN/3 -----END PGP PUBLIC KEY BLOCK----- - pub 4096R/0xF06059FD5DC7CC3F 2018-04-24 [SC] Key fingerprint = A687 3D24 A4D6 D628 4AE4 2A75 F060 59FD 5DC7 CC3F uid Sendmail Signing Key/2018 @@ -883,7 +1499,6 @@ fvZ+LS/6hJ9C77uOaBqoDPmtpn0WDqc3oDeT81Ans73BZhwhFAjzpHp+XnJQ =K0Kz -----END PGP PUBLIC KEY BLOCK----- - pub 4096R/6BF726AD 2016-12-31 Key fingerprint = 3C8A 1E8E 7F44 CADE 114F ED46 4BC9 BDA6 6BF7 26AD uid Sendmail Signing Key/2017 @@ -1069,7 +1684,6 @@ FtJxkIHVIx/VvvBqS3HEm8QCRvr+o10/Ue7NljolDV13B7fljxgvLFyJ8T91jWsz =Lt+h -----END PGP PUBLIC KEY BLOCK----- - pub 2048R/29FB03DE 2016-01-04 fingerprint: 0F5C 96AE C8E6 9E9C 8E54 2E5C 6D4C D194 29FB 03DE uid Sendmail Signing Key/2016 @@ -1269,7 +1883,6 @@ j68I =MdUt -----END PGP PUBLIC KEY BLOCK----- - pub 2048R/0xAAF5B5DE05BDCC53 2015-01-02 fingerprint: 30BC A747 05FA 4154 5573 1D7B AAF5 B5DE 05BD CC53 uid Sendmail Signing Key/2015 diff --git a/contrib/sendmail/README b/contrib/sendmail/README index 50cbce25e169..468d29fcaffb 100644 --- a/contrib/sendmail/README +++ b/contrib/sendmail/README @@ -4,11 +4,12 @@ This directory has the latest sendmail(TM) software from Proofpoint, Inc. Report any bugs to sendmail-bugs-YYYY@support.sendmail.org -where YYYY is the current year, e.g., 2005. +where YYYY is the current year, e.g., 2023. -There is a web site at http://www.sendmail.org/ -- see that site for +There is a web site at https://www.sendmail.org/ -- see that site for the latest updates. + +--------------+ | INTRODUCTION | +--------------+ @@ -40,6 +41,7 @@ the latest updates. Sendmail is a trademark of Proofpoint, Inc. US Patent Numbers 6865671, 6986037. + +-----------------------+ | DIRECTORY PERMISSIONS | +-----------------------+ @@ -197,14 +199,6 @@ There are other files you should read. Rooted in this directory are: This sets a word in a smaller pointsize. - - with new groff versions (1.18 seems affected) - - GROFF_NO_SGR=1 - - needs to be set, e.g., in doc/op/Makefile: - - ROFF_CMD= GROFF_NO_SGR=1 groff - +--------------+ | RELATED RFCS | @@ -248,6 +242,13 @@ Important RFCs for electronic mail are: RFC2822 Internet Message Format RFC2852 Deliver By SMTP Service Extension RFC2920 SMTP Service Extension for Command Pipelining + RFC5321 Simple Mail Transfer Protocol + RFC5322 Internet Message Format + RFC6530 Overview and Framework for Internationalized Email + RFC6531 SMTP Extension for Internationalized Email + RFC6532 Internationalized Email Headers + RFC6533 Internationalized Delivery Status and Disposition Notifications + RFC8461 SMTP MTA Strict Transport Security (MTA-STS) Other standards that may be of interest (but which are less directly relevant to sendmail) are: @@ -325,6 +326,10 @@ DB 2.X and 3.X. If you are upgrading from one of those versions, you must recreate your database file(s). Do this by rebuilding all maps with makemap and rebuilding the alias file with newaliases. +File locking using fcntl() does not interoperate with Berkeley DB +5.x (and probably later). Use CDB, flock() (-DHASFLOCK), or an *** 16317 LINES SKIPPED *** From nobody Wed Feb 14 03:53:44 2024 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 4TZPST2DdTz59qPr; Wed, 14 Feb 2024 03:53:45 +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 4TZPST18hxz46Ql; Wed, 14 Feb 2024 03:53:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707882825; 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=XiQTXxLvY7H3a3rAgjpmh8DZi2EtHuMULu614iDpUgo=; b=ZW/PlQ443ROXyh6eGHRkjW1HHGOz3H8qnzoo0YwunjCyhmC63xV27YKnXsEu9cp4NWsJ1U RiRircYPIJpGhfedJm3nUdipG0zop02nXqKfDXsz1iZ5/GiviOzvMHlc4QU09jmF5Y39mE 6wndDUTMfe4+TzuAQAsKp70/48vjUWBl9HYI2lRU6TumJo8xIF360vI6aCmT2Dv6N0T/5K Q50x6LDJHQrR1nH3b8iq2QHp+i44xHq9hbTB+p1Q41r2HaUaG/WgPWnvv5iPsQ+2lxM1Eu 9OhYEZfWRzArhiuoh2tN1rdZi2U6Peic7FXyBZG6Uo/1U2XOgCby+H4SLNsgVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707882825; a=rsa-sha256; cv=none; b=gbN0KZYFIrgw61Da57483vOBDwihhUBXcPiiUL52nSnw66Tu7umhz98+47pEE4TvKl0RW/ USm65XlOuuK8Fc0PF8z/X2vUPEWaiXMRvnAyLPSdzphaW0oyYGVs0+mJJ9iVM8sLmQh7zD 08dB4nqdO70F+1oK6w9hZfmC1MXUhqarTy5pMSP1OCDUDJY3cEiOjxoBFWwocsIwOrsjKj VlGHIb7Ifmql1TiMduBer+Dud4XkME0rKO2AUVKcWBCrrdB8nFZCgDp9QfNeQj7HhPtsI2 FE5V+B8T6oaxefpniZ5mVrnWmSr1iRRE+SqhGMiOHAmW9xLYyq5ZkgYPHI013A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707882825; 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=XiQTXxLvY7H3a3rAgjpmh8DZi2EtHuMULu614iDpUgo=; b=fR1FsmXU5LNYGdxv8oDH0kUxasfh/TE3kjPFtFqrQiGDtOP4+hXeadkj0ZZzoH99tuqusS JWgZRuJwsvxyqPZt9k1NfKYRnMoVIVu/B0ow5/M1zN2kS9OJwEgDnJImhu8f10a9YaRIl/ 2iXO+9PGpgj5/wFexyIxQmnhlIDHKVRVK4It5cuGVG20y/Y7cT1wM4PI5vRRnozsKyl+ky 52VZRLOKcx6hwVPMXr8RKbJdOaJXdZ2GmVTWxCOU6iwc+5oLHIOs2K8lIX7wL4r5yBoQ9W RorkI0HSfutb6P0wiBdx1foKFTI5w9U38HFyemFYDBCdFORbJTc9Awa9Nu6AeQ== 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 4TZPST0D4DzjkS; Wed, 14 Feb 2024 03:53:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E3riAj064441; Wed, 14 Feb 2024 03:53:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E3rikM064438; Wed, 14 Feb 2024 03:53:44 GMT (envelope-from git) Date: Wed, 14 Feb 2024 03:53:44 GMT Message-Id: <202402140353.41E3rikM064438@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 16b1438c7371 - stable/14 - read.2: Describe debug.iosize_max_clamp 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 16b1438c7371d31daa95595957330d97bc343405 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=16b1438c7371d31daa95595957330d97bc343405 commit 16b1438c7371d31daa95595957330d97bc343405 Author: Konstantin Belousov AuthorDate: 2024-02-10 09:40:07 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-14 03:41:54 +0000 read.2: Describe debug.iosize_max_clamp PR: 276937 (cherry picked from commit 3e9515846f8cbff0ecccaab65d9f70890d04429e) --- lib/libc/sys/read.2 | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/lib/libc/sys/read.2 b/lib/libc/sys/read.2 index e3b5b21d1c31..94644045afc1 100644 --- a/lib/libc/sys/read.2 +++ b/lib/libc/sys/read.2 @@ -25,9 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)read.2 8.4 (Berkeley) 2/26/94 -.\" -.Dd June 4, 2020 +.Dd February 10, 2024 .Dt READ 2 .Os .Sh NAME @@ -222,7 +220,12 @@ for this file system. The value .Fa nbytes is greater than -.Dv INT_MAX . +.Dv SSIZE_MAX +(or greater than +.Dv INT_MAX , +if the sysctl +.Va debug.iosize_max_clamp +is non-zero). .El .Pp In addition, @@ -248,7 +251,13 @@ The sum of the .Fa iov_len values in the .Fa iov -array overflowed a 32-bit integer. +array is greater than +.Dv SSIZE_MAX +(or greater than +.Dv INT_MAX , +if the sysctl +.Va debug.iosize_max_clamp +is non-zero). .It Bq Er EFAULT Part of the .Fa iov From nobody Wed Feb 14 03:53:46 2024 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 4TZPSV327Fz59qSG; Wed, 14 Feb 2024 03:53:46 +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 4TZPSV2SLdz468g; Wed, 14 Feb 2024 03:53:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707882826; 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=kimryfuNwgceXRg0xa3Po2BoWxIiHs5hyAim9iwVgUU=; b=vvlYu9HqAXYMMdSuUFNsqSYh+TSbVaBLRkulyXS2G0OzcLt0Xx3KDBkyVVjlZ+hkrZ3g55 xsa/dk2/jXm8ULtXfgZDWzAJ57JHgS6hSuD5uOvml9AoWl29JTxmWyQ87Bd1G3VcNDmq5Y NpF368U/ijemPOCJwgLOo8B82THxINBHRzGysb2Zpkv3UCDGcc6oWB/NlMOYa3lBkcQVox b/XbvMYxkK7XfqO58N2mG3IAZF6Os/4k9dUVA0/v428+4chg1UISJmylDiEuNX730fWh/t PQg74lPV4jvQNv3hOb5+t4hlgRICfhnYlYaQEtGOodwKcJwDZ4WfgxHr3YfOMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707882826; a=rsa-sha256; cv=none; b=tRx4i+i3ViWsIBbi0f+6BSsQdp2z1cuAFAKeZFS7VJFoAfTSTOk0uI2PU+heNAZvlcOKZf 6MEBSc3HqBg4o2qMlEwlJSqI8ccKYZcgYoP+0QQo4usgfnCpQ/BK5NmFHZv1MOZPd8YINL Pb26zJ5xjWyE6DlbHo4G+P792va5tlL7j/O236HBPC+Tj0IUFrJeX7BvjYIWsf3HSzZdjA WpczQsMkI9CP47AbkJlwZyn412ZDKFLV3inCPapkYzDLOz9vvjtqzUKxcmdv1jF+dhzDhP 1GqVPxjUYJlfI61bSESGzQA4mTEtSm4AdnlhKpasJOd+2IIZyUtHsmhIMRuddw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707882826; 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=kimryfuNwgceXRg0xa3Po2BoWxIiHs5hyAim9iwVgUU=; b=PLpa7UtRbvSUkpCxK9E4jGeMppXgQJ1wTPonyVLFgbM67hbPZHeKvd4LgUIvMrE213k8PL 4mO4/H9DK0yvhlQlL3kj8T6+R84QsPMC65qjqlH7O5U4owldoMG5ABfivCHvSZk/rHEYfg luU3KPMAFgXrZ5CEHShcdAlTQJc0fSmVqHXNdWMb7EIjRbX6gVs27cSfQRWTka8+aO6mj6 rGNvkUCPkj4gUr7P8CC0yL1dOaieHjAZj3C8WicHCcSfPdYt5+08Tspfkh5a7Iw5KS+Zu6 WhqVdBeGD7PD8s0ywea+0Cspm9UhwPsiQToLJ442m1AAOMQWAkjo7kY7m9D/2Q== 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 4TZPSV1XGPzjnd; Wed, 14 Feb 2024 03:53:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E3rkW5064498; Wed, 14 Feb 2024 03:53:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E3rkDi064495; Wed, 14 Feb 2024 03:53:46 GMT (envelope-from git) Date: Wed, 14 Feb 2024 03:53:46 GMT Message-Id: <202402140353.41E3rkDi064495@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f35c790206b8 - stable/14 - amd64 uprintf_signal: add space between %rax value and code bytes 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f35c790206b87599fa76d091f14804088b569e2f Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f35c790206b87599fa76d091f14804088b569e2f commit f35c790206b87599fa76d091f14804088b569e2f Author: Konstantin Belousov AuthorDate: 2024-02-10 05:06:00 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-14 03:42:39 +0000 amd64 uprintf_signal: add space between %rax value and code bytes (cherry picked from commit 130bad217bd8bbd7531539e4f5eb83d3c284e991) --- sys/amd64/amd64/trap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 8114105655f8..f5ea035b3e3c 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -626,7 +626,7 @@ trap(struct trapframe *frame) ksi.ksi_addr = (void *)addr; if (uprintf_signal) { uprintf("pid %d comm %s: signal %d err %#lx code %d type %d " - "addr %#lx rsp %#lx rip %#lx rax %#lx" + "addr %#lx rsp %#lx rip %#lx rax %#lx " "<%02x %02x %02x %02x %02x %02x %02x %02x>\n", p->p_pid, p->p_comm, signo, frame->tf_err, ucode, type, addr, frame->tf_rsp, frame->tf_rip, frame->tf_rax, From nobody Wed Feb 14 03:53:47 2024 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 4TZPSX13jPz59qSH; Wed, 14 Feb 2024 03:53:48 +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 4TZPSW3Txjz468p; Wed, 14 Feb 2024 03:53:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707882827; 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=WMjzN/J9dR92Btm6jNxW25KdayYIbtuy8ZU7sZTAk+k=; b=v06XLAl8IjO4Da3rVJ6/+BFstWcK2gs/CBB5tlZAMMjMvvP75nmOBCMw7ua/ssOu+T0qy0 ZC6EvfOCrefxypEQF/v7BT6UKJvtjQe1tMuVvFXBw1i+dLAGqZsEKkRnbpQJwBt4i+PrVb AJFcEaU8/Jn36BmyFN0rXSexBRHd3rF76ibdnVPwrW+OWILYkK/joLwbzQGbu/porpFaYm KXKArKKDLtV438YybCEjhChLwBXfHP9FuvG6WKGTyaVxpvqyZ5N5Up2jaY+j9862KMagxQ kYKs0QmA/PNWx0M3X0XMsbIgM80jSDxsMpVPAa57t81N3bdi3stno65l52YMng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707882827; a=rsa-sha256; cv=none; b=LIenTser4acQzA2ZNxOIgQT7X00hKx5QlOzCoCYPNF7bcYZ++2QhigdI3h3ec2o9rCYUNy qH3dQerbnHDK4ZYls8wgiM2dMPsBpUlv/b6qdXPag2/oGqYCHLW2pQXlC+DdXZufrSOQp/ 7ye6ZGYvyM6ZhWk7Z4UKOf17VhwVwklYMf84rFNCkzbzWad4XwzKy99YzbbmFTgJHBD9LC jngheO/8vLPBz2iSOXnX6ZQnyP/OZPTMXDtv0c/k5dc2T6JnVULIJ/KcLYVxzltwnmVy4l Z1Nrvz4uiNAdgLzSwbxLeBpc+XqB1zWSh97LjO0Xp65bc4KrJIFl/VZ6fB9eRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707882827; 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=WMjzN/J9dR92Btm6jNxW25KdayYIbtuy8ZU7sZTAk+k=; b=BxzQ0KNAMljVOaqo+bNbWE0BoFGP1JzKrxnXWwxMQGp2MhYwbkNe5is1TcuCfxeWesZAtl RgYHkggFfmqIf3bs4fEC0oVoQaKQxBmqKG+120Fk5IKQenrNFkjCxlLG/mGOrSz0UVcrJW AvhsWNrDyAV+3u3hT0CB7HdubIZ5dZa+9ShMQd3K7NJtkUC/GG7Zc7CgN76/dZ5oEm5OFN 8xZUe7azz90jBRYANZL0Z84J7bhy2DsBac0TSlq0xueS2vtuReFNc5QpxBvZjPC19Aw157 spFff56cMr5uOgGzPc426kq3thRLIpo0HXWEAR8Oa0fJZYZ7B2eUkXkgpegWlQ== 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 4TZPSW2Y5Xzk04; Wed, 14 Feb 2024 03:53:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E3rlE4064540; Wed, 14 Feb 2024 03:53:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E3rlG4064538; Wed, 14 Feb 2024 03:53:47 GMT (envelope-from git) Date: Wed, 14 Feb 2024 03:53:47 GMT Message-Id: <202402140353.41E3rlG4064538@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a3d021250769 - stable/14 - imgact_elf.c: remove sys/cdefs.h include 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a3d02125076915865647e79cfbb141d301b2daca Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a3d02125076915865647e79cfbb141d301b2daca commit a3d02125076915865647e79cfbb141d301b2daca Author: Konstantin Belousov AuthorDate: 2024-02-10 01:02:33 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-14 03:42:39 +0000 imgact_elf.c: remove sys/cdefs.h include (cherry picked from commit a67edb5616c1514726ac1c8596ce0ddc2771e2fa) --- sys/kern/imgact_elf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index dfa874e307e5..f22f9addb45c 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -31,7 +31,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include "opt_capsicum.h" #include From nobody Wed Feb 14 03:53:48 2024 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 4TZPSX703Fz59qSJ; Wed, 14 Feb 2024 03:53:48 +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 4TZPSX4HJrz4695; Wed, 14 Feb 2024 03:53:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707882828; 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=dPF5lyQ1XSvUfOfWTLvYBYXscHhpyKAo+wm/VwHK5EA=; b=VW6JZpHDE2mM5JUTYP1vn4YGSUq4V+lPlLZVthj5CuMfYjmDXzX4ztbVuXLkbC6IjKjky5 BGAQvE9xCTNZWHcZHfsZg8EzwiSLt5BhaENtaKW7BLx4I7G5eT5E6570KYiUzJeRpwQy89 A7h0nbrxGkw8CMh8q9fRNshW5NGtvKSsOAXAR4BcjjRBxroclxy51SA7nMcUXIgpRX6LhX w8vsrr7NXd2I8HeHZgXz8JbXJKe7BlZPOCNxUbfoovtCPTDZNaSNBijZUDMo5Wgd+AB9lF iLQwBRqg02WmM5gNxn0owDK3miX5uhujFGKXPmnI3CABFo8E7oOz/fyPTn3fsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707882828; a=rsa-sha256; cv=none; b=ymz+UYF6fzmwrD/kUYBl0HRfrB/OzwBVUz8lkooOnWHtpznWcT6w1PQXftAmlgv2nhusNy 3DfriTK//bK2k2Vo5Urw2xMMnCSn5FAchjb36KQIt3hB+dZqcEsJ+uqhkPRsAJX34GnwUy UQVjsaLa77WO+6C7bO6aeNfTe8LE2fwaeXBrvosHFCKT4M8Fr9PEsgr8CKcQ3CoHIUrOMg X5pXWlpqaZ9Ed8cXqURrSssAAjHjzS7laek7ebhjyRtddi1xdOqT+XdniCFe/9QbYF8eL3 hNXWkh1tcpVPhruF2kzAb/zo54g8M6zj8g+/+Q6CsoPobzo2YQNwQ1qyx+4bOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707882828; 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=dPF5lyQ1XSvUfOfWTLvYBYXscHhpyKAo+wm/VwHK5EA=; b=PyZ/s/zMJegu48TSSTWEKEyAxBk4ZxGLsKtePKvHDNu9aqtQ+ryYrJyfgMqVkbyC5Afvva LQ0c8v1XdyB4KtOOvrVchBzO4S4scom2bcO+ZeTAQyup5pepHDNB9JIbbR+sM1Nl/7Z/8Y EkxA10D/ZZv0wr7hKpHRtQW3w6pbNuB+hnpc5HER8Z/cujBZ81/vse55cXAu1RjlK7uB4j Xb/64A8cG6WgPdyDYNECOv58YZM2nQuytRCGFCHfgRqePPHc4JC7Oj1WlRumzWIczDVch2 I2bK+Zt6Ywr1ua5dSWKWmhy87CI3Iwfm22y9QudqeNV097+cla3oTyaEBG6vuA== 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 4TZPSX3KTCzjVZ; Wed, 14 Feb 2024 03:53:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E3rmuA064595; Wed, 14 Feb 2024 03:53:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E3rmhb064592; Wed, 14 Feb 2024 03:53:48 GMT (envelope-from git) Date: Wed, 14 Feb 2024 03:53:48 GMT Message-Id: <202402140353.41E3rmhb064592@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: bcd7b196c83b - stable/14 - ELF note parser: provide more info on failure 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bcd7b196c83b9a1ed5f2e2215c15542088d88aef Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bcd7b196c83b9a1ed5f2e2215c15542088d88aef commit bcd7b196c83b9a1ed5f2e2215c15542088d88aef Author: Konstantin Belousov AuthorDate: 2024-02-10 01:36:58 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-14 03:42:40 +0000 ELF note parser: provide more info on failure (cherry picked from commit 29d4f8bfc642f0196c27eb469ea7eb326ff529d1) --- sys/kern/imgact_elf.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index f22f9addb45c..85f0602fe584 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -2704,6 +2704,7 @@ __elfN(note_procstat_auxv)(void *arg, struct sbuf *sb, size_t *sizep) } } +#define MAX_NOTES_LOOP 4096 static bool __elfN(parse_notes)(struct image_params *imgp, Elf_Note *checknote, const char *note_vendor, const Elf_Phdr *pnote, @@ -2743,9 +2744,15 @@ __elfN(parse_notes)(struct image_params *imgp, Elf_Note *checknote, pnote->p_offset + pnote->p_filesz); buf = NULL; } - for (i = 0; i < 100 && note >= note0 && note < note_end; i++) { - if (!aligned(note, Elf32_Addr) || (const char *)note_end - - (const char *)note < sizeof(Elf_Note)) { + for (i = 0; i < MAX_NOTES_LOOP && note >= note0 && note < note_end; + i++) { + if (!aligned(note, Elf32_Addr)) { + uprintf("Unaligned ELF note\n"); + goto retf; + } + if ((const char *)note_end - (const char *)note < + sizeof(Elf_Note)) { + uprintf("ELF note to short\n"); goto retf; } if (note->n_namesz != checknote->n_namesz || @@ -2765,6 +2772,8 @@ nextnote: roundup2(note->n_namesz, ELF_NOTE_ROUNDSIZE) + roundup2(note->n_descsz, ELF_NOTE_ROUNDSIZE)); } + if (i >= MAX_NOTES_LOOP) + uprintf("ELF note parser reached %d notes\n", i); retf: res = false; ret: From nobody Wed Feb 14 03:53:49 2024 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 4TZPSZ2Cq1z59qSK; Wed, 14 Feb 2024 03:53:50 +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 4TZPSY5Drtz46TH; Wed, 14 Feb 2024 03:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707882829; 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=YHMggSwlmjAg2DdlOtEDvMF9vJxkn6hBgxdo3lb853c=; b=nN6BO2UdjbwIeck5Ywz1WitkJq4Y1HJOGbWx/y+Fd/9qDK6U9ciXElXd32x/phsgYw+SUe fbKFRg41VMrhQPmCD3Nq15AJPmlEtpeDRDbhClyIzKmFoCr+quHf7tVfMUtQQ3NRiB2CFL 3BjUUZAZpF/WRHlq6kURD86VLFrYV7j91eZWibejPZk8wB+vg9BJ2IF10tGxuz/L9MGvR5 SWG5nKJN3CatuEtOMCade04moCLpAd0/dL9H2xDFDFL3uTOnXmczgoRrissvmatLC4WVaP 5c+P3n/Sx8P1hi/C0Y6Clm0xupuLCZOkQCfyWaYRj+1Zek7981aJ0AQjhWe20g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707882829; a=rsa-sha256; cv=none; b=cNG7Ii9Kt+uTClp8heAXy3+apSyQTErgLyVXOhEzfdFwUHCYIhdLPV/3jlM0PCOThqOzGY R5OlJsnwQXVmdzmNooGWhbIZQixygGW+BGlZdkXBSiJIbNrcZ60++tLPxAVIl0hFb/eERD 1nPri+U3JQ/VWh6mVSPpXdESiNUtRJICaTDVaJOa9NYkGHd7p1e3StKb6+2CVoGu4HtF2K BiejzRpXLZ63doi12hwa7b1tceJuC2ZcPg9XNtnzHQjA10mJd8uKWbOElX7+4Thu5z+EMe KJtRWs3LE/KyNZwbsjziWmZR/5WLOHhl1A81l1Zqc+lSN2oqzrTzMPg5Nwj4mQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707882829; 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=YHMggSwlmjAg2DdlOtEDvMF9vJxkn6hBgxdo3lb853c=; b=FT+pAuO3O6/BLqYuUmNdhkeRmuu2X7LgEB/kNhoWEAvFksD+uGov26XSkWafZwniRuNgit vrminRKMpvcJbugXIcPjanH0W7hZXaWSmi474dd6YkAVWwZOLGNx1BSJMX9/ZfDjFCX/4m z6sn8S/NH7rSbfMk2aIl1NkGwAslng+JxqdDrP3YC11KsFsKpqlcaLlYKbB3XfjtyS99Py JnTDUqG0zU/LpB3efrPfZrVX+WgMUv4GDGjCBR6NwIBXyfD85roZjHFeG3+6M7Sy85MrCD yKs+WaVWDjMn0WAm0FTdn/SaEoeHZgXqyM7M5+mVDrHD7rqmcBHN54MEuk9azQ== 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 4TZPSY4LddzjSm; Wed, 14 Feb 2024 03:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E3rnhf064641; Wed, 14 Feb 2024 03:53:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E3rnlV064638; Wed, 14 Feb 2024 03:53:49 GMT (envelope-from git) Date: Wed, 14 Feb 2024 03:53:49 GMT Message-Id: <202402140353.41E3rnlV064638@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: fc738836d153 - stable/14 - amd64/linux*: mark brandlists as static 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fc738836d153fad9a755f41159ea836e9586deb1 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fc738836d153fad9a755f41159ea836e9586deb1 commit fc738836d153fad9a755f41159ea836e9586deb1 Author: Konstantin Belousov AuthorDate: 2024-02-10 01:01:38 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-14 03:42:40 +0000 amd64/linux*: mark brandlists as static (cherry picked from commit be707ee09556a3fa345bc30c04aeeaa2a5d2efa2) --- sys/amd64/linux/linux_sysvec.c | 2 +- sys/amd64/linux32/linux32_sysvec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c index 757986f94ae1..9c3d7e6405c1 100644 --- a/sys/amd64/linux/linux_sysvec.c +++ b/sys/amd64/linux/linux_sysvec.c @@ -898,7 +898,7 @@ static Elf64_Brandinfo linux_muslbrand = { LINUX_BI_FUTEX_REQUEUE }; -Elf64_Brandinfo *linux_brandlist[] = { +static Elf64_Brandinfo *linux_brandlist[] = { &linux_glibc2brand, &linux_glibc2brandshort, &linux_muslbrand, diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index 1002648c3df8..19b4af7661f0 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -994,7 +994,7 @@ static Elf32_Brandinfo linux_muslbrand = { LINUX_BI_FUTEX_REQUEUE }; -Elf32_Brandinfo *linux_brandlist[] = { +static Elf32_Brandinfo *linux_brandlist[] = { &linux_brand, &linux_glibc2brand, &linux_muslbrand, From nobody Wed Feb 14 03:53:50 2024 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 4TZPSb1qKhz59qSL; Wed, 14 Feb 2024 03:53:51 +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 4TZPSb0c8Lz46WV; Wed, 14 Feb 2024 03:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707882831; 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=o95w5RbuAc/i6PtfOF1eOUKsJDQd6dCMfjkUbEDzuGs=; b=N2MM9XhlVJjkcn5Kpzira6uGYZb3WNizTwctf399+pw0sfn/MMTuUQi896kSwMw9s9WWF+ Up4XjeyToFTZOotmnqlfUDkkgwWmKjIZ4St7nF7t+5XMd/gETE3QIXaeovTjjphLx7C265 G1ZH9EnKusAuk5wKFrE2iwM4giNwLl+XhGYj3JFPjJpgE88YsblVIBGgM8t8i0P4oH1oeN 97zEfS95uNPWkF6Pdlpt+zk/F2UGQliPItLRcLnIQbUWrOEmVMXOP2S2h5NSne6Z+gbnOr ZUeXpwdYfWP6xnAB4K4c0kilyKlHXLQwdecvJXJTbs63FNX5Asg5FW1Ks6s/wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707882831; a=rsa-sha256; cv=none; b=h7OxZAnZYfQKz18Scb+qOTMg9DLHdIddsA1sUFJW2L7Jn/Rm4X+k0zAcwljyGpPrQlZCHU ESD+85j3zvPgWsDcTmQyEuK4b9CD4ilz+Mm/mlPbla0RnugnxpcQs4jfFDiqQ98tfqJBNU ZosC26ZolN/Y1vcOrmGZR0gkc358GhvukViUyqGIgK9T/6nQfGqN1/tqSYFroi17NHX9zb 4qOfRBTb/2xbGAn7rENdoGMTGHKd1c08kFyYdgZi+MtgTiky7EL5u5Fg4VuoZoTXMqFA0n AxpbCaAqrqTOC431PxGNU+Z1c/ERFCtbFo5dyQKp55MIuOzbCRZFTk5LCM8dUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707882831; 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=o95w5RbuAc/i6PtfOF1eOUKsJDQd6dCMfjkUbEDzuGs=; b=FPu/xXnlt685XFXxzFRWSMSrNmEC1N+PMliUbYMdRMt/Hg/Mo2NUTomARn5mjH5Hiby/hH Fmp2O4+2TH7Ys0iQzO9HJNsBzasLtQWkMUAaTGDZPLkKbHk5cXRS3Rutdv9lvRE5fx3HxX OozpfqqUczTXnFTkj8BSdzgN2SMQ/4j42bgrKBfvY/USG9ELIyuvivpc6BsBo2h+WIh8xf T+NpmIuLn2gj0Rywo7Bcx0I4eyFvm6pavBMe3SlsP4NTcD9lmlhgSX1JIJhOaEfTtwuS0H GOZXuunb4zps+s8xkEX8avS3AYe70y6svZarUVHZKd70kF6QIv2UKLpGjV0VDQ== 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 4TZPSZ56FczjkT; Wed, 14 Feb 2024 03:53:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E3roXC064684; Wed, 14 Feb 2024 03:53:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E3ro9L064681; Wed, 14 Feb 2024 03:53:50 GMT (envelope-from git) Date: Wed, 14 Feb 2024 03:53:50 GMT Message-Id: <202402140353.41E3ro9L064681@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 10896d25a536 - stable/14 - amd64 gdt_segs: use designated initializers 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 10896d25a5360ba654faa17a7b544944bcbff0c0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=10896d25a5360ba654faa17a7b544944bcbff0c0 commit 10896d25a5360ba654faa17a7b544944bcbff0c0 Author: Konstantin Belousov AuthorDate: 2024-02-09 04:59:48 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-14 03:42:40 +0000 amd64 gdt_segs: use designated initializers (cherry picked from commit 1d6230b07ff29b4d3ae527dbc0fc3f9775a7542a) --- sys/amd64/amd64/machdep.c | 52 +++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index f235d72519ae..ea440f46a12f 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -356,8 +356,8 @@ CTASSERT(sizeof(struct nmi_pcpu) == 16); * slots as corresponding segments for i386 kernel. */ struct soft_segment_descriptor gdt_segs[] = { -/* GNULL_SEL 0 Null Descriptor */ -{ .ssd_base = 0x0, +[GNULL_SEL] = { /* 0 Null Descriptor */ + .ssd_base = 0x0, .ssd_limit = 0x0, .ssd_type = 0, .ssd_dpl = 0, @@ -365,8 +365,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 0, .ssd_def32 = 0, .ssd_gran = 0 }, -/* GNULL2_SEL 1 Null Descriptor */ -{ .ssd_base = 0x0, +[GNULL2_SEL] = { /* 1 Null Descriptor */ + .ssd_base = 0x0, .ssd_limit = 0x0, .ssd_type = 0, .ssd_dpl = 0, @@ -374,8 +374,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 0, .ssd_def32 = 0, .ssd_gran = 0 }, -/* GUFS32_SEL 2 32 bit %gs Descriptor for user */ -{ .ssd_base = 0x0, +[GUFS32_SEL] = { /* 2 32 bit %gs Descriptor for user */ + .ssd_base = 0x0, .ssd_limit = 0xfffff, .ssd_type = SDT_MEMRWA, .ssd_dpl = SEL_UPL, @@ -383,8 +383,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 0, .ssd_def32 = 1, .ssd_gran = 1 }, -/* GUGS32_SEL 3 32 bit %fs Descriptor for user */ -{ .ssd_base = 0x0, +[GUGS32_SEL] = { /* 3 32 bit %fs Descriptor for user */ + .ssd_base = 0x0, .ssd_limit = 0xfffff, .ssd_type = SDT_MEMRWA, .ssd_dpl = SEL_UPL, @@ -392,8 +392,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 0, .ssd_def32 = 1, .ssd_gran = 1 }, -/* GCODE_SEL 4 Code Descriptor for kernel */ -{ .ssd_base = 0x0, +[GCODE_SEL] = { /* 4 Code Descriptor for kernel */ + .ssd_base = 0x0, .ssd_limit = 0xfffff, .ssd_type = SDT_MEMERA, .ssd_dpl = SEL_KPL, @@ -401,8 +401,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 1, .ssd_def32 = 0, .ssd_gran = 1 }, -/* GDATA_SEL 5 Data Descriptor for kernel */ -{ .ssd_base = 0x0, +[GDATA_SEL] = { /* 5 Data Descriptor for kernel */ + .ssd_base = 0x0, .ssd_limit = 0xfffff, .ssd_type = SDT_MEMRWA, .ssd_dpl = SEL_KPL, @@ -410,8 +410,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 1, .ssd_def32 = 0, .ssd_gran = 1 }, -/* GUCODE32_SEL 6 32 bit Code Descriptor for user */ -{ .ssd_base = 0x0, +[GUCODE32_SEL] = { /* 6 32 bit Code Descriptor for user */ + .ssd_base = 0x0, .ssd_limit = 0xfffff, .ssd_type = SDT_MEMERA, .ssd_dpl = SEL_UPL, @@ -419,8 +419,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 0, .ssd_def32 = 1, .ssd_gran = 1 }, -/* GUDATA_SEL 7 32/64 bit Data Descriptor for user */ -{ .ssd_base = 0x0, +[GUDATA_SEL] = { /* 7 32/64 bit Data Descriptor for user */ + .ssd_base = 0x0, .ssd_limit = 0xfffff, .ssd_type = SDT_MEMRWA, .ssd_dpl = SEL_UPL, @@ -428,8 +428,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 0, .ssd_def32 = 1, .ssd_gran = 1 }, -/* GUCODE_SEL 8 64 bit Code Descriptor for user */ -{ .ssd_base = 0x0, +[GUCODE_SEL] = { /* 8 64 bit Code Descriptor for user */ + .ssd_base = 0x0, .ssd_limit = 0xfffff, .ssd_type = SDT_MEMERA, .ssd_dpl = SEL_UPL, @@ -437,8 +437,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 1, .ssd_def32 = 0, .ssd_gran = 1 }, -/* GPROC0_SEL 9 Proc 0 Tss Descriptor */ -{ .ssd_base = 0x0, +[GPROC0_SEL] = { /* 9 Proc 0 TSS Descriptor */ + .ssd_base = 0x0, .ssd_limit = sizeof(struct amd64tss) + IOPERM_BITMAP_SIZE - 1, .ssd_type = SDT_SYSTSS, .ssd_dpl = SEL_KPL, @@ -446,8 +446,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 0, .ssd_def32 = 0, .ssd_gran = 0 }, -/* Actually, the TSS is a system descriptor which is double size */ -{ .ssd_base = 0x0, +[GPROC0_SEL + 1] = { /* 10 Proc 0 TSS descriptor, double size */ + .ssd_base = 0x0, .ssd_limit = 0x0, .ssd_type = 0, .ssd_dpl = 0, @@ -455,8 +455,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 0, .ssd_def32 = 0, .ssd_gran = 0 }, -/* GUSERLDT_SEL 11 LDT Descriptor */ -{ .ssd_base = 0x0, +[GUSERLDT_SEL] = { /* 11 LDT Descriptor */ + .ssd_base = 0x0, .ssd_limit = 0x0, .ssd_type = 0, .ssd_dpl = 0, @@ -464,8 +464,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 0, .ssd_def32 = 0, .ssd_gran = 0 }, -/* GUSERLDT_SEL 12 LDT Descriptor, double size */ -{ .ssd_base = 0x0, +[GUSERLDT_SEL + 1] = { /* 12 LDT Descriptor, double size */ + .ssd_base = 0x0, .ssd_limit = 0x0, .ssd_type = 0, .ssd_dpl = 0, From nobody Wed Feb 14 03:53:51 2024 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 4TZPSc1sw7z59qMx; Wed, 14 Feb 2024 03:53:52 +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 4TZPSc0C3pz46Th; Wed, 14 Feb 2024 03:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707882832; 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=rR0WU7eX0P0H+sga7UJyZzIG1Ly1jxxbmEcSbU2IsRc=; b=GV3p4wGtIjky1gQ48Xeg0w4xDOluCn/Gd7rfT5CgXEre/lX6XZEbY3biM0f0ZeYQ/D2NXv ZlEcDRhTmZc1GzLfpqyZq37vhzGDw2dWltG5u+9wgLw+EOk67SGUNkX5W0YqM19da4Qs6R XiKnTukAVUibtvOeR97+O+qNH0nFsHPChvIlhuD2jJhTXs7lvwSZJ3VbX27qiTcTpHvPOu JPcUEQQUa4ZgdY7aypmpZy51+jmloKrwW7JBngiV+vOGk/eMk/dreXOF6uLaV9CUa95tH+ +LSObjodiYgxkaVQHTKbIP0FuWoTQFv2MiHN5VwGHfBI0D0lmrwhyYnJXkxgTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707882832; a=rsa-sha256; cv=none; b=JOAYpY8ZCThecYzE/WMQ3MuGFcwSWeJdlTpEkVOc+KR5o6Chfvpk4nON/R+nGYYCuc5K8y eBRVDQ3qEtL2VDDfBjKrLIZDKe01guGJNejVQDxujvRnVmzawRlXyqRZLpIwYopTla1kYD VDi49ieawG1JLjTBJjlQBcPjthEAlRFIoLNVLaOuEyDEtTB+iVa5zd7dE4Mdx5lux0yHFw XEadta4x7M1w94DbLk8bPlQfyao3rAD3WJLAWMtYIjpsNSTfZAMaRC4RmL+09wpDA2JyQy l6aixsqWuq1tiVzyCEfGidOWuj0yL5pNcqkZOlDqt0WR3nKwgQUAkLIft9HxKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707882832; 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=rR0WU7eX0P0H+sga7UJyZzIG1Ly1jxxbmEcSbU2IsRc=; b=wD/9tniXr5u2QqIjfxwCS62F/uurvq2ysBqhcSYxtZRyvrzDPZ99cfyq0aANrueIty/XS2 jw5jqScCORlrNwe30j11h1j957n940MwxznURyI3RW4w4JbjVnMSJnEVjXtYCD85HQ9T4/ NGE32wmjao5usNAEOA/rhdKC2OFvvv8YDPXpC/VEgm4yaQPqwXd1eLG0QF6aPpV7TXdOe4 yh7DuLeC0gMdAPKo440RwphM9VbGYnIfjQuQAhtacnF+XXqRscv1nd+O4fQkFnsvM1t6MD RjVvnfT1EZQStkd11cNJfhImcGUp4NIofp5QAsn7vzdpWzUHunX96795DIhanQ== 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 4TZPSb6QdbzjVb; Wed, 14 Feb 2024 03:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E3rpl7064738; Wed, 14 Feb 2024 03:53:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E3rpRJ064735; Wed, 14 Feb 2024 03:53:51 GMT (envelope-from git) Date: Wed, 14 Feb 2024 03:53:51 GMT Message-Id: <202402140353.41E3rpRJ064735@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1f7c8f047f8b - stable/14 - amd64 pcb.h: use 4 hex digits for pcb flags 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1f7c8f047f8bdf67fc13ba9cdd05b7ace8790d37 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1f7c8f047f8bdf67fc13ba9cdd05b7ace8790d37 commit 1f7c8f047f8bdf67fc13ba9cdd05b7ace8790d37 Author: Konstantin Belousov AuthorDate: 2024-02-09 05:05:02 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-14 03:42:40 +0000 amd64 pcb.h: use 4 hex digits for pcb flags (cherry picked from commit 5f7ac491eef4994b23b4de250927a85c69a64a31) --- sys/amd64/include/pcb.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h index f98e5f68dd96..2205607fa6fe 100644 --- a/sys/amd64/include/pcb.h +++ b/sys/amd64/include/pcb.h @@ -78,14 +78,14 @@ struct pcb { uint16_t pcb_tr; u_int pcb_flags; -#define PCB_FULL_IRET 0x01 /* full iret is required */ -#define PCB_DBREGS 0x02 /* process using debug registers */ -#define PCB_KERNFPU 0x04 /* kernel uses fpu */ -#define PCB_FPUINITDONE 0x08 /* fpu state is initialized */ -#define PCB_USERFPUINITDONE 0x10 /* fpu user state is initialized */ -#define PCB_KERNFPU_THR 0x20 /* fpu_kern_thread() */ -#define PCB_32BIT 0x40 /* process has 32 bit context (segs etc) */ -#define PCB_FPUNOSAVE 0x80 /* no save area for current FPU ctx */ +#define PCB_FULL_IRET 0x0001 /* full iret is required */ +#define PCB_DBREGS 0x0002 /* process using debug registers */ +#define PCB_KERNFPU 0x0004 /* kernel uses fpu */ +#define PCB_FPUINITDONE 0x0008 /* fpu state is initialized */ +#define PCB_USERFPUINITDONE 0x0010 /* fpu user state is initialized */ +#define PCB_KERNFPU_THR 0x0020 /* fpu_kern_thread() */ +#define PCB_32BIT 0x0040 /* process has 32 bit context (segs etc) */ +#define PCB_FPUNOSAVE 0x0080 /* no save area for current FPU ctx */ uint16_t pcb_initial_fpucw; From nobody Wed Feb 14 04:05:32 2024 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 4TZPk43Fbrz59rK9; Wed, 14 Feb 2024 04:05:32 +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 4TZPk41sbxz49sw; Wed, 14 Feb 2024 04:05:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707883532; 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=u4jZEJXeyV/6uzJvxtEl6Y+ViQ1bbYSPRFpKrJo9G0E=; b=KvMUpPDhFnTyYN3+1AZmwMB9YqjbO1xgo/UHL978BWVJxUZHxoktzPKzGJ/6TBDNW+WK/i R3yW0pJoV9paBmDy4F2klRFFIZPkplXPXzgcXUs0M8KttqJ1tjjtu46p0jrtT5TAjFLc8g PbOMgCspbUa4ZULuEoV+FBZAEmEVtD8L5i2zhZ4nS/lurJGax4Bmpi8x/iLekJvAWBToHe ZK6b58UpcsEZweGowXWwMiHMeW84rrNGMUcz14MdexlZHjhkTsecOpDu+Lm5oOhEWSnbxQ 8KDOinXI1d7k9lNuD/0HZf3OpuSL4mBx6hltU/yIIc+9NP9XMEPze48Qp6xxOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707883532; a=rsa-sha256; cv=none; b=GUIQu/J684aT957eGfblKEPiM/Q8hpWfoql1ip19BZstSeXL+X+5Ig482VPQRpIs7C+VmT W9ycxnEcthaUjSpQodL/5QosO9Is0y01qlj3FDbSJbdAHg6ay8NHb3vFx5nsuvIyhLZmRp pXY9REU0RQGidxkaQ30AsjeTEJvbJsOfczN8RbG07uKN82LhvelIMSqbGzSuq1Lyq9CA8Y G6Bqfy3UPRgZHoi7BCIJOGp3Nze75qaNq0NFNmjhKomNWWSrGSB4c2Umww7Q/JV4Tqn5q8 k+tmFVZCN1cfqcy/7B8xW2JdLTOyoVv5NpXFr/8C7u8za4SJ7Kuo+7aGNa7E/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707883532; 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=u4jZEJXeyV/6uzJvxtEl6Y+ViQ1bbYSPRFpKrJo9G0E=; b=eWMHICs+OqU9kZcgFGgTZdMwfJ++5nKwRpvAkQLyJ/yQd0JSGr1DrrafOr9z7P05sP8aex 0MdCkd3gNQRu0wNJgQqUnwrayJMxiqVFXU2NsVTO+qd1PhAELVaj1fgObec+Jk33hyPfYB RthAULrSoAKdZB2+4oMQeSYKt7X7Ix39qcI2zn5HUe7kDYvNFGaa+bqyv+jx254V9M23TF k1IZkZ8q5oxBEuV3feqdgd/+VVeGn+Cyb2eF40Cqp4Q6L92mrSN3HfYZ9A5PGudhrl0oxn wi5y2nam0cUmlKpTX6ppCbglqgh2MJT5UcPuFd9KalL8Ydq9GRyeJtucoq9SoA== 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 4TZPk40wxWzkBB; Wed, 14 Feb 2024 04:05:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E45W0K082264; Wed, 14 Feb 2024 04:05:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E45Wmk082262; Wed, 14 Feb 2024 04:05:32 GMT (envelope-from git) Date: Wed, 14 Feb 2024 04:05:32 GMT Message-Id: <202402140405.41E45Wmk082262@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 42667ceb9d00 - stable/13 - read.2: Describe debug.iosize_max_clamp 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 42667ceb9d0026f7d1e5f95297b942af576cd929 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=42667ceb9d0026f7d1e5f95297b942af576cd929 commit 42667ceb9d0026f7d1e5f95297b942af576cd929 Author: Konstantin Belousov AuthorDate: 2024-02-10 09:40:07 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-14 03:54:00 +0000 read.2: Describe debug.iosize_max_clamp PR: 276937 (cherry picked from commit 3e9515846f8cbff0ecccaab65d9f70890d04429e) --- lib/libc/sys/read.2 | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/lib/libc/sys/read.2 b/lib/libc/sys/read.2 index e3b5b21d1c31..94644045afc1 100644 --- a/lib/libc/sys/read.2 +++ b/lib/libc/sys/read.2 @@ -25,9 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)read.2 8.4 (Berkeley) 2/26/94 -.\" -.Dd June 4, 2020 +.Dd February 10, 2024 .Dt READ 2 .Os .Sh NAME @@ -222,7 +220,12 @@ for this file system. The value .Fa nbytes is greater than -.Dv INT_MAX . +.Dv SSIZE_MAX +(or greater than +.Dv INT_MAX , +if the sysctl +.Va debug.iosize_max_clamp +is non-zero). .El .Pp In addition, @@ -248,7 +251,13 @@ The sum of the .Fa iov_len values in the .Fa iov -array overflowed a 32-bit integer. +array is greater than +.Dv SSIZE_MAX +(or greater than +.Dv INT_MAX , +if the sysctl +.Va debug.iosize_max_clamp +is non-zero). .It Bq Er EFAULT Part of the .Fa iov From nobody Wed Feb 14 04:05:36 2024 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 4TZPk86KLjz59rHR; Wed, 14 Feb 2024 04:05:36 +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 4TZPk85dmKz4B8G; Wed, 14 Feb 2024 04:05:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707883536; 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=wzk23J9wYzLX1Xug0H+qgG8RDpLbG6A04JrfFw9kfbU=; b=AQBvaV4P1cGOx/nqObTGiHGrkmqU5RldNDv5HAPi6tJDPW1ZA3c9F3cVtltmOD7Ve4TYAZ GdCPRLycvn9tjtV/dxiGOA93WS1a78Q8qUjnp1EqSTUIB9xpDNpDXYursKI8UTiqx3y8S0 02SBDrNY3yOgq3SpvWOFyyrXoRNoChpgHWHFrCBo+vpp3kFd1MWa5cieXCiyR88X/qsCL9 TKdPIIOabENiEs1fpVpWQ7YZjIZKwGjkIih31R9j4s2HYFVTKwW3JL/kbc5iejwqGqvODg NHlde2FW53rzjp4Z4e5fvlK/6QlvfaDSbxPY22big3s9hGZKEoNcVf9Up+1Bxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707883536; a=rsa-sha256; cv=none; b=tdTSWX/Urej4mApWW6icdiKJdtgMZyc0GCvQG3/hp4lx0uo0p1FY96BSXErPTQL9hpmh6N j0T2grbQaNYebA51mXAPNe0vXdA0KYfzrsEDIsLi3y4cbF/d7fk+/JhguQ4Ak9Q9VsbytG D+fp6xmdyVlUFMK+sPuSOD+kNPsGB13Cyu/A0c7iolL7SMb4EUWm4XebcvuB3rIXqqe2Go BjulVLR2PC6WjrJVCRaSnDB41KIOxVPul4mayogPw10Ep5FbusMPigXdghn3clv4BXyWbU CQDvj/WuVeoYFB4ZU3Z+AMlQJha+6y1iXm/hF4Vm9uPlHJMl4deJSsjdtYQCQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707883536; 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=wzk23J9wYzLX1Xug0H+qgG8RDpLbG6A04JrfFw9kfbU=; b=bEcY22f9BRx9CsZNFYL/KxL+htoyFbkbUN/9jd5rthdiEKqHHk9NasfPAyyBM5FUVaVbRd cTBkSRGy+hbK6419urOO4AwRXAvBB+oBiITFyIEf05cn87QOwGvKxtPonqieY8Q1EcO9p+ 69+XfDo0GC9/7DsjxKTOD/MEB0ol0cuJ0UsZs5lxgkJi4DPDd7sxZCeeV35bDUPZ5W0SJX sp3IYGrl7Y0MInGElHVgIZEZEekALw2ns55FWRX9ktwa/OyE9/5rsJu3/4tP1JZBiqKlmK jx57QspUzJCOMfuRdwgnTgk8PeHyRoojAIvg5LYcYeWCHp3LJEcYLYiLC/LzCg== 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 4TZPk84j4yzk2m; Wed, 14 Feb 2024 04:05:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E45ahQ082464; Wed, 14 Feb 2024 04:05:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E45aoF082461; Wed, 14 Feb 2024 04:05:36 GMT (envelope-from git) Date: Wed, 14 Feb 2024 04:05:36 GMT Message-Id: <202402140405.41E45aoF082461@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a6ee29582219 - stable/13 - amd64/linux*: mark brandlists as static 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a6ee29582219bc8f5c7ecde009f832a027443307 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a6ee29582219bc8f5c7ecde009f832a027443307 commit a6ee29582219bc8f5c7ecde009f832a027443307 Author: Konstantin Belousov AuthorDate: 2024-02-10 01:01:38 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-14 03:54:00 +0000 amd64/linux*: mark brandlists as static (cherry picked from commit be707ee09556a3fa345bc30c04aeeaa2a5d2efa2) --- sys/amd64/linux/linux_sysvec.c | 2 +- sys/amd64/linux32/linux32_sysvec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c index c8dc40ea0a29..92993c4548e7 100644 --- a/sys/amd64/linux/linux_sysvec.c +++ b/sys/amd64/linux/linux_sysvec.c @@ -908,7 +908,7 @@ static Elf64_Brandinfo linux_muslbrand = { LINUX_BI_FUTEX_REQUEUE }; -Elf64_Brandinfo *linux_brandlist[] = { +static Elf64_Brandinfo *linux_brandlist[] = { &linux_glibc2brand, &linux_glibc2brandshort, &linux_muslbrand, diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index fb817ea2b1ab..b4fb9fd1b1e9 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -1003,7 +1003,7 @@ static Elf32_Brandinfo linux_muslbrand = { LINUX_BI_FUTEX_REQUEUE }; -Elf32_Brandinfo *linux_brandlist[] = { +static Elf32_Brandinfo *linux_brandlist[] = { &linux_brand, &linux_glibc2brand, &linux_muslbrand, From nobody Wed Feb 14 04:05:33 2024 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 4TZPk54DFhz59rPt; Wed, 14 Feb 2024 04:05:33 +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 4TZPk53BNsz4BMw; Wed, 14 Feb 2024 04:05:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707883533; 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=+AVSORTF+5Ne1fhcAL9deE9vdBuohL5VsO8DoEucwS4=; b=MejgvxO7ovbh1i4coE+GDakBGZra0U8zfklfxcdLIRRY8WqP6CEF4VKuIiClZOz7frR0P1 B+MGIMggOjfINAcmK//NnsNWO7dGuL2QwB5Ff2oOo29wL7Zy5yR2YX0NfKfUc3N4KFgYlA IUE925lK2zHdUC6g8I0HTi3zp3B3rnQ7efzBCITPFMzqfqgnafpv8QddAJ+OsFUuKvMTjC 5Exde7fvAOIMxsQzGJPhkEbyo+nixvjlCtZyxI69Ka2Epbs/5+K7h6JH89Z/NhiR9YyTil BSdDzrYMYH0ao53ZUoT5UApIBhOdc7gOttRi2j8pItmaubK0DRIuwT51PIoDUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707883533; a=rsa-sha256; cv=none; b=LJuLOXgnH212bTD7NQY0zw6ThPWs9BLa9LzfPKXawEAepYmCDa8RYMF0ec98EtI71KvQwZ NOAMTmaYeb4kzUjzUNdpxQ0Pvy+rdYNPFDmvQ3EgVnd1h8VVomc7oF7s6o2HX/5bF5HFEy A4zyL1dWvjlzG2KZkHtadWSroGkbyis2qfI7/1jmqvY0YopaoYdKt/w4ZNW+iNOGNMocMb 7XIuuO5QcIy1IWuf1V8ytRQKsUOLLoFyGkhoIx/gEXTqfkjCT3z6SEBIwvomqh3Lb3jL95 WGcowDC9zZnB9LP/g7uqJyKiwUjQ2t1n6K7r/1OfbHJ9FRzuTNDnnDOE+bRqfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707883533; 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=+AVSORTF+5Ne1fhcAL9deE9vdBuohL5VsO8DoEucwS4=; b=bqOVPGJU1TnR5xXdGIQ89JeKJmsoM3aKgTCv+1MhIaA+MvYu9e/ru9tEvS0WQXW689MxGH F88d6QHnemRPz3WYaudYm7EMarkev42phZifkyWqY3bL4bKNF+otqZlmU2tihuhlPAfcgX PJYTWdHHNbfob6sF4PdC/8/g3PCA7TDMcO0gXFFUdzoy0V2IQOKOZ6RafyQLoIGXdsMiju 0SJr6Fn7YW8qd19zFiegVsxYB7tktEcp2E2woq9+QIwhQDxzZjyZHWqY3/VpzlWVNLcrKJ eZm4P1ZJG9mkWbTExkdGvGIYoCOj5kbNSIO/vTmr1FuwcWl+BrbSA63kaq+/IA== 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 4TZPk52FMtzjpT; Wed, 14 Feb 2024 04:05:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E45XMM082322; Wed, 14 Feb 2024 04:05:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E45Xuu082319; Wed, 14 Feb 2024 04:05:33 GMT (envelope-from git) Date: Wed, 14 Feb 2024 04:05:33 GMT Message-Id: <202402140405.41E45Xuu082319@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 9c1f5e270eb3 - stable/13 - amd64 uprintf_signal: add space between %rax value and code bytes 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9c1f5e270eb3e30dba62baf0b4d42a0b643207c3 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9c1f5e270eb3e30dba62baf0b4d42a0b643207c3 commit 9c1f5e270eb3e30dba62baf0b4d42a0b643207c3 Author: Konstantin Belousov AuthorDate: 2024-02-10 05:06:00 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-14 03:54:00 +0000 amd64 uprintf_signal: add space between %rax value and code bytes (cherry picked from commit 130bad217bd8bbd7531539e4f5eb83d3c284e991) --- sys/amd64/amd64/trap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 9f50de795ca5..9b01ecbc2d53 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -625,7 +625,7 @@ trap(struct trapframe *frame) ksi.ksi_addr = (void *)addr; if (uprintf_signal) { uprintf("pid %d comm %s: signal %d err %#lx code %d type %d " - "addr %#lx rsp %#lx rip %#lx rax %#lx" + "addr %#lx rsp %#lx rip %#lx rax %#lx " "<%02x %02x %02x %02x %02x %02x %02x %02x>\n", p->p_pid, p->p_comm, signo, frame->tf_err, ucode, type, addr, frame->tf_rsp, frame->tf_rip, frame->tf_rax, From nobody Wed Feb 14 04:05:37 2024 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 4TZPkB0V6Lz59rQ2; Wed, 14 Feb 2024 04:05:38 +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 4TZPk96dyGz49l1; Wed, 14 Feb 2024 04:05:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707883537; 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=VA8FaPVpcb3Sqige06ygWCbESdbRvYBoUPX6L2hNCTc=; b=oEbTZpIr68BjJ4rQ0oc8de7O/IcTeEzHbUD4R2cJKmhF091VQw3ofmAIherG9uhySGNS2n u2t2ZnVGXc7tx/AJFiOzMNE1lYyy+S8QCmEG3edu1qOovwTzPAm5hQKep7vldXhbII9dyR yJrJOiK/fp3WcEUnZlz5jSGQFM20yH3ZonodLKAOrt/8EWtw9SKDXrDxRj8DOyHacoxmnc Kx/HvUxC4rCibl2jFiFxqHKYMNlla46n2ohFgwwSFnjsZswFG3uOygFy4UoZDCtULJUA7S ayvBDSnnnm3s6kL66Fz/Yen1JSd07ubZAtZ8gjmYLOhbCn4Q7ylbcsbPShwlpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707883537; a=rsa-sha256; cv=none; b=RZCqTH9NS187zandwf3LSeOINChIfER6n82Iz969tqKwAevs7+82/rVtUAOxPqkZZSSzGZ eiCUDXWOIZo56pl+olOREBP51rE/LSNx3F46N/v2QzthtV90VIljRAqb94qrsfV3RBvXFx kr50LEDefhInXp72CM0lq0JVbs2JSpSC9axC6XxnJXGcIS14UPuryVxYNVOFsnzwrEMbG+ /bXtQHk8wB8CUWPic/K1oIvjBoytiZSOLnjlbMBe4y+hGc3VxoPIdjpyMDC4N6ZWS26U2W NcGY+4lmdiGG+N/kd7b/jzsTwejWfWVVOQkHeLQDHKqvsRpHYN7jOrjXnGWSfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707883537; 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=VA8FaPVpcb3Sqige06ygWCbESdbRvYBoUPX6L2hNCTc=; b=I2nxZ2u8hM0lCB50C9GCbVRDJnXWlNeUwgVbV9KVDF0AMN5p/X3TZaiMZ6eY8hnBmf6dyN WxguXBdDKYDNfbsa7+ylGVVMZR4bOflfMKD19Pp8DwPYbZTRZ7t94qQOV5N++/QJAn7tpE TuW3RxgqcxWrYWmQ3zVp14yUWHd51CXXkqh2lAk73Xqq9qo6r82ORJnD6EJVeAgTOZKYYr LK9dV31UX1rnc43gQBpG6eWfXgWe5x8aIzGCCfRHnrkMkcfyzPzSdWw/1EvQMF2vJFukYv MW4nng+2boRWIDf1E8dsX4DbTYMTLzZyyocipjZtJpNuO/9KKZvgNkvjzoj8Vw== 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 4TZPk95kJCzkDf; Wed, 14 Feb 2024 04:05:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E45baZ082506; Wed, 14 Feb 2024 04:05:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E45bGr082503; Wed, 14 Feb 2024 04:05:37 GMT (envelope-from git) Date: Wed, 14 Feb 2024 04:05:37 GMT Message-Id: <202402140405.41E45bGr082503@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 976b3cf86d79 - stable/13 - amd64 gdt_segs: use designated initializers 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 976b3cf86d799de4d53c56d83ce47ccbbe192a7a Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=976b3cf86d799de4d53c56d83ce47ccbbe192a7a commit 976b3cf86d799de4d53c56d83ce47ccbbe192a7a Author: Konstantin Belousov AuthorDate: 2024-02-09 04:59:48 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-14 03:54:00 +0000 amd64 gdt_segs: use designated initializers (cherry picked from commit 1d6230b07ff29b4d3ae527dbc0fc3f9775a7542a) --- sys/amd64/amd64/machdep.c | 52 +++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index eef11f0bdddd..928203a690ac 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -357,8 +357,8 @@ CTASSERT(sizeof(struct nmi_pcpu) == 16); * slots as corresponding segments for i386 kernel. */ struct soft_segment_descriptor gdt_segs[] = { -/* GNULL_SEL 0 Null Descriptor */ -{ .ssd_base = 0x0, +[GNULL_SEL] = { /* 0 Null Descriptor */ + .ssd_base = 0x0, .ssd_limit = 0x0, .ssd_type = 0, .ssd_dpl = 0, @@ -366,8 +366,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 0, .ssd_def32 = 0, .ssd_gran = 0 }, -/* GNULL2_SEL 1 Null Descriptor */ -{ .ssd_base = 0x0, +[GNULL2_SEL] = { /* 1 Null Descriptor */ + .ssd_base = 0x0, .ssd_limit = 0x0, .ssd_type = 0, .ssd_dpl = 0, @@ -375,8 +375,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 0, .ssd_def32 = 0, .ssd_gran = 0 }, -/* GUFS32_SEL 2 32 bit %gs Descriptor for user */ -{ .ssd_base = 0x0, +[GUFS32_SEL] = { /* 2 32 bit %gs Descriptor for user */ + .ssd_base = 0x0, .ssd_limit = 0xfffff, .ssd_type = SDT_MEMRWA, .ssd_dpl = SEL_UPL, @@ -384,8 +384,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 0, .ssd_def32 = 1, .ssd_gran = 1 }, -/* GUGS32_SEL 3 32 bit %fs Descriptor for user */ -{ .ssd_base = 0x0, +[GUGS32_SEL] = { /* 3 32 bit %fs Descriptor for user */ + .ssd_base = 0x0, .ssd_limit = 0xfffff, .ssd_type = SDT_MEMRWA, .ssd_dpl = SEL_UPL, @@ -393,8 +393,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 0, .ssd_def32 = 1, .ssd_gran = 1 }, -/* GCODE_SEL 4 Code Descriptor for kernel */ -{ .ssd_base = 0x0, +[GCODE_SEL] = { /* 4 Code Descriptor for kernel */ + .ssd_base = 0x0, .ssd_limit = 0xfffff, .ssd_type = SDT_MEMERA, .ssd_dpl = SEL_KPL, @@ -402,8 +402,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 1, .ssd_def32 = 0, .ssd_gran = 1 }, -/* GDATA_SEL 5 Data Descriptor for kernel */ -{ .ssd_base = 0x0, +[GDATA_SEL] = { /* 5 Data Descriptor for kernel */ + .ssd_base = 0x0, .ssd_limit = 0xfffff, .ssd_type = SDT_MEMRWA, .ssd_dpl = SEL_KPL, @@ -411,8 +411,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 1, .ssd_def32 = 0, .ssd_gran = 1 }, -/* GUCODE32_SEL 6 32 bit Code Descriptor for user */ -{ .ssd_base = 0x0, +[GUCODE32_SEL] = { /* 6 32 bit Code Descriptor for user */ + .ssd_base = 0x0, .ssd_limit = 0xfffff, .ssd_type = SDT_MEMERA, .ssd_dpl = SEL_UPL, @@ -420,8 +420,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 0, .ssd_def32 = 1, .ssd_gran = 1 }, -/* GUDATA_SEL 7 32/64 bit Data Descriptor for user */ -{ .ssd_base = 0x0, +[GUDATA_SEL] = { /* 7 32/64 bit Data Descriptor for user */ + .ssd_base = 0x0, .ssd_limit = 0xfffff, .ssd_type = SDT_MEMRWA, .ssd_dpl = SEL_UPL, @@ -429,8 +429,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 0, .ssd_def32 = 1, .ssd_gran = 1 }, -/* GUCODE_SEL 8 64 bit Code Descriptor for user */ -{ .ssd_base = 0x0, +[GUCODE_SEL] = { /* 8 64 bit Code Descriptor for user */ + .ssd_base = 0x0, .ssd_limit = 0xfffff, .ssd_type = SDT_MEMERA, .ssd_dpl = SEL_UPL, @@ -438,8 +438,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 1, .ssd_def32 = 0, .ssd_gran = 1 }, -/* GPROC0_SEL 9 Proc 0 Tss Descriptor */ -{ .ssd_base = 0x0, +[GPROC0_SEL] = { /* 9 Proc 0 TSS Descriptor */ + .ssd_base = 0x0, .ssd_limit = sizeof(struct amd64tss) + IOPERM_BITMAP_SIZE - 1, .ssd_type = SDT_SYSTSS, .ssd_dpl = SEL_KPL, @@ -447,8 +447,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 0, .ssd_def32 = 0, .ssd_gran = 0 }, -/* Actually, the TSS is a system descriptor which is double size */ -{ .ssd_base = 0x0, +[GPROC0_SEL + 1] = { /* 10 Proc 0 TSS descriptor, double size */ + .ssd_base = 0x0, .ssd_limit = 0x0, .ssd_type = 0, .ssd_dpl = 0, @@ -456,8 +456,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 0, .ssd_def32 = 0, .ssd_gran = 0 }, -/* GUSERLDT_SEL 11 LDT Descriptor */ -{ .ssd_base = 0x0, +[GUSERLDT_SEL] = { /* 11 LDT Descriptor */ + .ssd_base = 0x0, .ssd_limit = 0x0, .ssd_type = 0, .ssd_dpl = 0, @@ -465,8 +465,8 @@ struct soft_segment_descriptor gdt_segs[] = { .ssd_long = 0, .ssd_def32 = 0, .ssd_gran = 0 }, -/* GUSERLDT_SEL 12 LDT Descriptor, double size */ -{ .ssd_base = 0x0, +[GUSERLDT_SEL + 1] = { /* 12 LDT Descriptor, double size */ + .ssd_base = 0x0, .ssd_limit = 0x0, .ssd_type = 0, .ssd_dpl = 0, From nobody Wed Feb 14 04:05:38 2024 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 4TZPkC1CcFz59rXl; Wed, 14 Feb 2024 04:05:39 +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 4TZPkC0bP8z49qb; Wed, 14 Feb 2024 04:05:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707883539; 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=pMT5X3wIy08irtLb6k6tDe9RkTlXJcm/Gc3ATIWoB9I=; b=ohJBU+3beFW66n4sRMcFaaLv5AW+RPCUFYRvpY9xMrTNBZ7ZgigwoHi+e/hgZcyAKvPn5t 0/O605KbuJswP5/quKM6aktY2BO9JLGhlEkcMRV6esN9HR7VMPgZu6fDZNWYFiBSUvFomc aOXwXYuI9/JGVRhKfEW/KwyrPKoQJXQGSQtXrtjc4n2blWHyQBldU6RU2yMbnmlazL/CwM czFHR4DKPZT90QHDalHKGtgyY1cqV2PXxkAWaq+bWr/Ik7RdWCIfH1QvbJiuhAmUOBuLFN knbZHzg8dubUD3zGJNyshpOgq2Sw31dg7J49EkP7Eb15xj7VJ1LWo9t7yOBa9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707883539; a=rsa-sha256; cv=none; b=Pn6ibJka4V3RzQhNUJDsgG1SuTTIQDzWQlkCk2waUoQnOxuZ1yUk0fNuWXff5nLaGTeOWJ Z1Bi9zZDwZA0Oi9VtDZuEe0M/9Rtc1wspv+3GXDc2EM1jH9WpfT3QySC7l44HLSUjoP2XJ 1e2X5NDeh8/RVm0eNsQDHMgz78jJL8o/Pn0kzIZoj7E2oXS5+CrJORXKqd59Q/PlDOpJgK 2sbSQM31dYuO8WPh/5+E9WmvmQbSuF7C1L76/WSMgUL7ooKyF1ZRSTgg6LdoZSeHZuKKvr BB+CLOq7DH4x2+plwIyaO5e4Tw/d4XqAuDaKZi6yeM2BRxBGegNpXep87QdkjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707883539; 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=pMT5X3wIy08irtLb6k6tDe9RkTlXJcm/Gc3ATIWoB9I=; b=SxbCLsQk7IePsyvPGgxaad78EwX0ki6xzkYVkjvJ/uzW23/DmG9QA+YdYWROX0YNPOlLl6 k30Vz+hZnQr/9oTI0wjsQikKCY6AwKcVHIy7Keq5hJkdVyobslS8nHHF3Vx6bZrv63L6nn spNgtWUn/MTfKHhlkAouTqiZJXBWUXHYibG1ZlTuBaHQ7rzPuT3S2rAgEnOScQLNqDBkj5 89tUIzEOigNW9y6hoJGe+Anh545cy3odHCstx5YsilhFcwEIIv21Y0aRHT7N4Y3uRUq+fE MnXZriz5xtaZgQG+ZbDyg9/Tu9TKUsUkvFBIlQQfDMms9coqBlgoIQ5F6kSV1A== 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 4TZPkB6pZ1zkBC; Wed, 14 Feb 2024 04:05:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E45c2K082560; Wed, 14 Feb 2024 04:05:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E45cmh082557; Wed, 14 Feb 2024 04:05:38 GMT (envelope-from git) Date: Wed, 14 Feb 2024 04:05:38 GMT Message-Id: <202402140405.41E45cmh082557@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 391d212c42cf - stable/13 - amd64 pcb.h: use 4 hex digits for pcb flags 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 391d212c42cf2a64639425126c48bb6edbbbcdcf Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=391d212c42cf2a64639425126c48bb6edbbbcdcf commit 391d212c42cf2a64639425126c48bb6edbbbcdcf Author: Konstantin Belousov AuthorDate: 2024-02-09 05:05:02 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-14 03:54:00 +0000 amd64 pcb.h: use 4 hex digits for pcb flags (cherry picked from commit 5f7ac491eef4994b23b4de250927a85c69a64a31) --- sys/amd64/include/pcb.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h index f98e5f68dd96..2205607fa6fe 100644 --- a/sys/amd64/include/pcb.h +++ b/sys/amd64/include/pcb.h @@ -78,14 +78,14 @@ struct pcb { uint16_t pcb_tr; u_int pcb_flags; -#define PCB_FULL_IRET 0x01 /* full iret is required */ -#define PCB_DBREGS 0x02 /* process using debug registers */ -#define PCB_KERNFPU 0x04 /* kernel uses fpu */ -#define PCB_FPUINITDONE 0x08 /* fpu state is initialized */ -#define PCB_USERFPUINITDONE 0x10 /* fpu user state is initialized */ -#define PCB_KERNFPU_THR 0x20 /* fpu_kern_thread() */ -#define PCB_32BIT 0x40 /* process has 32 bit context (segs etc) */ -#define PCB_FPUNOSAVE 0x80 /* no save area for current FPU ctx */ +#define PCB_FULL_IRET 0x0001 /* full iret is required */ +#define PCB_DBREGS 0x0002 /* process using debug registers */ +#define PCB_KERNFPU 0x0004 /* kernel uses fpu */ +#define PCB_FPUINITDONE 0x0008 /* fpu state is initialized */ +#define PCB_USERFPUINITDONE 0x0010 /* fpu user state is initialized */ +#define PCB_KERNFPU_THR 0x0020 /* fpu_kern_thread() */ +#define PCB_32BIT 0x0040 /* process has 32 bit context (segs etc) */ +#define PCB_FPUNOSAVE 0x0080 /* no save area for current FPU ctx */ uint16_t pcb_initial_fpucw; From nobody Wed Feb 14 06:05:40 2024 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 4TZSNh5Wrbz5B51C; Wed, 14 Feb 2024 06:05:40 +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 4TZSNh4PlZz4RTZ; Wed, 14 Feb 2024 06:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890740; 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=IgcFt4+3Zu8M+kMvd07QA4GAuUH3jsUY6kh/6XC06OQ=; b=R4QERgpljRLVH1tlgWvTHPQGqTPea8UoOEIG2kqm72xaxtDabvfAcED9d0sA3ahEqRn+V4 jKEqugkNTTYUj5MmEzduZpCGvI4lTMR2rbBC0quZSBaat86o2bksKNfSn3dohSJPpqy8Hd sXSoFBH7+q2P2lQ9rCXkjqTnlvK1hVvMYrA8q7HVGwzB9A2J1EF4uoNC2Um6QNLpGfs3pK lRmYNPYYKkQXHB5iYYhhVLrPsCqoPWybQJlnQ7F+PiWRLH2D8P3g5LnbsizG6jMl+h8l5m 7SbD3Af24k/1IRDyTmUxxGvRHGxetZk7fDUEkZjV4a3opV+Qlg2JneiVhWsamQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707890740; a=rsa-sha256; cv=none; b=HJYY+rKqx4Mu7JT0RvWTevtMcOo+MsICaHFjC2KdRLaX+RTIAFC8NNj9g7xIpSFcFtBdFw 3FNo6vFDXzXBMZEItJwN1hstimr40mD/bugSC3vYdJ5eJXPbDEmy4fEVSYUcBg1VEDSEAC 5r4zoJT5Id/5BkBk4a7ZfkAGDmqCGjgYZQ50O5Nlg0+fo2IaK5Yc4CblAOoBwut9jHL7ke k6C4r/N2jdMu6BUf1PQq4Iz8XDaqrjsvqQmr2OGS/vZ0BnHNiYrnH1Tw75v5Xw2BmlMYiA mvLO07gCq18ePjvCzwrWJZiGWF3Q0WrFNSRkkBM6TGLyCA6GxonjzFP3LJXFoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890740; 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=IgcFt4+3Zu8M+kMvd07QA4GAuUH3jsUY6kh/6XC06OQ=; b=TgCzi4ZzI6/SNed0hHPyw5Lies3CGmGuWLNMQMgWHk+kLQ28PtwlYrRwb5fVfiPD9nLZb9 G+GRcapf0YfEa8ZMc9Fl4NNFD4qGZbiNqXQW2NBORgppeUCgaa8PMZxF1Ts6waBYp/WvxD JYMSyrz1ycvw6bW1HJtGc5TDRzdG9dKl9YJm3igti/kB0Fp45zGpH322LbxhhwygykKCic J7tj/tsGOvom0kRCvoTINvwSf0l5z3veZgTTobSYDaTMCBYTliBCsuTu9RmNyiYF8+SsX7 4Q6wqRYuN4RhLE0pgKXrtFLNfWfHQi7ePQzO1QJKzk8iH1Oez2hD6MPw5NCpog== 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 4TZSNh3Stpzmtn; Wed, 14 Feb 2024 06:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E65eYZ084469; Wed, 14 Feb 2024 06:05:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E65eCa084466; Wed, 14 Feb 2024 06:05:40 GMT (envelope-from git) Date: Wed, 14 Feb 2024 06:05:40 GMT Message-Id: <202402140605.41E65eCa084466@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 007b8b8ecd96 - releng/14.0 - contrib/tzdata: import tzdata 2024a 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 007b8b8ecd9620c2bc7cba81c04a1ac5576223b1 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=007b8b8ecd9620c2bc7cba81c04a1ac5576223b1 commit 007b8b8ecd9620c2bc7cba81c04a1ac5576223b1 Author: Philip Paeps AuthorDate: 2024-02-02 02:01:39 +0000 Commit: Gordon Tetlow CommitDate: 2024-02-14 05:35:41 +0000 contrib/tzdata: import tzdata 2024a Changes: https://github.com/eggert/tz/blob/2024a/NEWS Approved by: so Security: FreeBSD-EN-24:01.tzdata (cherry picked from commit 2723c7ffb7f729a1d3f7c59e7db48b0edf3d30a6) (cherry picked from commit 26fe22019cb244aaaf8f96218e6e74641157e204) --- contrib/tzdata/Makefile | 53 ++++-- contrib/tzdata/NEWS | 68 +++++++ contrib/tzdata/africa | 8 +- contrib/tzdata/asia | 174 +++++++++++------- contrib/tzdata/australasia | 14 +- contrib/tzdata/checknow.awk | 2 +- contrib/tzdata/etcetera | 2 +- contrib/tzdata/europe | 29 ++- contrib/tzdata/leap-seconds.list | 373 +++++++++++++-------------------------- contrib/tzdata/leapseconds | 19 +- contrib/tzdata/leapseconds.awk | 11 +- contrib/tzdata/northamerica | 29 +-- contrib/tzdata/southamerica | 5 +- contrib/tzdata/theory.html | 37 ++-- contrib/tzdata/version | 2 +- contrib/tzdata/zishrink.awk | 98 ++++++---- contrib/tzdata/zonenow.tab | 4 +- 17 files changed, 507 insertions(+), 421 deletions(-) diff --git a/contrib/tzdata/Makefile b/contrib/tzdata/Makefile index 4e45f93b915c..d48354c72df4 100644 --- a/contrib/tzdata/Makefile +++ b/contrib/tzdata/Makefile @@ -53,7 +53,7 @@ DATAFORM= main LOCALTIME= Factory -# The POSIXRULES macro controls interpretation of POSIX-like TZ +# The POSIXRULES macro controls interpretation of POSIX-2017.1-like TZ # settings like TZ='EET-2EEST' that lack DST transition rules. # If POSIXRULES is '-', no template is installed; this is the default. # Any other value for POSIXRULES is obsolete and should not be relied on, as: @@ -274,7 +274,7 @@ LDLIBS= # -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; # the default is system-supplied, typically "/usr/lib/locale" # -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified -# DST transitions for POSIX-style TZ strings lacking them, +# DST transitions for POSIX.1-2017-style TZ strings lacking them, # in the usual case where POSIXRULES is '-'. If not specified, # TZDEFRULESTRING defaults to US rules for future DST transitions. # This mishandles some past timestamps, as US DST rules have changed. @@ -340,9 +340,10 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # guess TM_GMTOFF from other macros; define NO_TM_GMTOFF to suppress this. # Similarly, if your system has a "zone abbreviation" field, define # -DTM_ZONE=tm_zone -# and define NO_TM_ZONE to suppress any guessing. Although these two fields -# not required by POSIX, a future version of POSIX is planned to require them -# and they are widely available on GNU/Linux and BSD systems. +# and define NO_TM_ZONE to suppress any guessing. +# Although these two fields are not required by POSIX.1-2017, +# POSIX 202x/D4 requires them and they are widely available +# on GNU/Linux and BSD systems. # # The next batch of options control support for external variables # exported by tzcode. In practice these variables are less useful @@ -352,7 +353,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # # -DHAVE_TZNAME=0 # do not support "tzname" # # -DHAVE_TZNAME=1 # support "tzname", which is defined by system library # # -DHAVE_TZNAME=2 # support and define "tzname" -# # to the "CFLAGS=" line. "tzname" is required by POSIX 1988 and later. +# # to the "CFLAGS=" line. "tzname" is required by POSIX.1-1988 and later. # # If not defined, the code attempts to guess HAVE_TZNAME from other macros. # # Warning: unless time_tz is also defined, HAVE_TZNAME=1 can cause # # crashes when combined with some platforms' standard libraries, @@ -362,8 +363,8 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # # -DUSG_COMPAT=0 # do not support # # -DUSG_COMPAT=1 # support, and variables are defined by system library # # -DUSG_COMPAT=2 # support and define variables -# # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by -# # Unix Systems Group code and are required by POSIX 2008 (with XSI) and later. +# # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by Unix +# # Systems Group code and are required by POSIX.1-2008 and later (with XSI). # # If not defined, the code attempts to guess USG_COMPAT from other macros. # # # # To support the external variable "altzone", add @@ -427,7 +428,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # The name of a POSIX-like library archiver, its flags, C compiler, # linker flags, and 'make' utility. Ordinarily the defaults suffice. -# The commented-out values are the defaults specified by POSIX 202x/D3. +# The commented-out values are the defaults specified by POSIX.1-202x/D4. #AR = ar #ARFLAGS = -rv #CC = c17 @@ -439,6 +440,12 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ LEAPSECONDS= +# Where to fetch leap-seconds.list from. +leaplist_URI = \ + https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list +# The file is generated by the IERS Earth Orientation Centre, in Paris. +leaplist_TZ = Europe/Paris + # The zic command and its arguments. zic= ./zic @@ -471,7 +478,8 @@ AWK= awk # is typically nicer if it works. KSHELL= /bin/bash -# Name of curl , used for HTML validation. +# Name of curl , used for HTML validation +# and to fetch leap-seconds.list from upstream. CURL= curl # Name of GNU Privacy Guard , used to sign distributions. @@ -718,6 +726,28 @@ leapseconds: $(LEAP_DEPS) -f leapseconds.awk leap-seconds.list >$@.out mv $@.out $@ +# Awk script to extract a Git-style author from leap-seconds.list comments. +EXTRACT_AUTHOR = \ + author_line { sub(/^.[[:space:]]*/, ""); \ + sub(/:[[:space:]]*/, " <"); \ + printf "%s>\n", $$0; \ + success = 1; \ + exit \ + } \ + /Questions or comments to:/ { author_line = 1 } \ + END { exit !success } + +# Fetch leap-seconds.list from upstream. +fetch-leap-seconds.list: + $(CURL) -OR $(leaplist_URI) + +# Fetch leap-seconds.list from upstream and commit it to the local repository. +commit-leap-seconds.list: fetch-leap-seconds.list + author=$$($(AWK) '$(EXTRACT_AUTHOR)' leap-seconds.list) && \ + date=$$(TZ=$(leaplist_TZ) stat -c%y leap-seconds.list) && \ + git commit --author="$$author" --date="$$date" -m'make $@' \ + leap-seconds.list + # Arguments to pass to submakes of install_data. # They can be overridden by later submake arguments. INSTALLARGS = \ @@ -1315,7 +1345,8 @@ zic.o: private.h tzfile.h tzdir.h version.h .PHONY: ALL INSTALL all .PHONY: check check_mild check_time_t_alternatives .PHONY: check_web check_zishrink -.PHONY: clean clean_misc dummy.zd force_tzs +.PHONY: clean clean_misc commit-leap-seconds.list dummy.zd +.PHONY: fetch-leap-seconds.list force_tzs .PHONY: install install_data maintainer-clean names .PHONY: posix_only posix_right public .PHONY: rearguard_signatures rearguard_signatures_version diff --git a/contrib/tzdata/NEWS b/contrib/tzdata/NEWS index 031ba6a8a250..d407342a50e6 100644 --- a/contrib/tzdata/NEWS +++ b/contrib/tzdata/NEWS @@ -1,5 +1,73 @@ News for the tz database +Release 2024a - 2024-02-01 09:28:56 -0800 + + Briefly: + Kazakhstan unifies on UTC+5 beginning 2024-03-01. + Palestine springs forward a week later after Ramadan. + zic no longer pretends to support indefinite-past DST. + localtime no longer mishandles Ciudad Juárez in 2422. + + Changes to future timestamps + + Kazakhstan unifies on UTC+5. This affects Asia/Almaty and + Asia/Qostanay which together represent the eastern portion of the + country that will transition from UTC+6 on 2024-03-01 at 00:00 to + join the western portion. (Thanks to Zhanbolat Raimbekov.) + + Palestine springs forward a week later than previously predicted + in 2024 and 2025. (Thanks to Heba Hamad.) Change spring-forward + predictions to the second Saturday after Ramadan, not the first; + this also affects other predictions starting in 2039. + + Changes to past timestamps + + Asia/Ho_Chi_Minh's 1955-07-01 transition occurred at 01:00 + not 00:00. (Thanks to Đoàn Trần Công Danh.) + + From 1947 through 1949, Toronto's transitions occurred at 02:00 + not 00:00. (Thanks to Chris Walton.) + + In 1911 Miquelon adopted standard time on June 15, not May 15. + + Changes to code + + The FROM and TO columns of Rule lines can no longer be "minimum" + or an abbreviation of "minimum", because TZif files do not support + DST rules that extend into the indefinite past - although these + rules were supported when TZif files had only 32-bit data, this + stopped working when 64-bit TZif files were introduced in 1995. + This should not be a problem for realistic data, since DST was + first used in the 20th century. As a transition aid, FROM columns + like "minimum" are now diagnosed and then treated as if they were + the year 1900; this should suffice for TZif files on old systems + with only 32-bit time_t, and it is more compatible with bugs in + 2023c-and-earlier localtime.c. (Problem reported by Yoshito + Umaoka.) + + localtime and related functions no longer mishandle some + timestamps that occur about 400 years after a switch to a time + zone with a DST schedule. In 2023d data this problem was visible + for some timestamps in November 2422, November 2822, etc. in + America/Ciudad_Juarez. (Problem reported by Gilmore Davidson.) + + strftime %s now uses tm_gmtoff if available. (Problem and draft + patch reported by Dag-Erling Smørgrav.) + + Changes to build procedure + + The leap-seconds.list file is now copied from the IERS instead of + from its downstream counterpart at NIST, as the IERS version is + now in the public domain too and tends to be more up-to-date. + (Thanks to Martin Burnicki for liaisoning with the IERS.) + + Changes to documentation + + The strftime man page documents which struct tm members affect + which conversion specs, and that tzset is called. (Problems + reported by Robert Elz and Steve Summit.) + + Release 2023d - 2023-12-21 20:02:24 -0800 Briefly: diff --git a/contrib/tzdata/africa b/contrib/tzdata/africa index 6fae18c0979f..92d823a0515c 100644 --- a/contrib/tzdata/africa +++ b/contrib/tzdata/africa @@ -30,6 +30,10 @@ # Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94. # https://www.jstor.org/stable/1774359 # +# For the 1911/1912 establishment of standard time in French possessions, see: +# Société Française de Physique, Recueil de constantes physiques (1913), +# page 752, 18b. +# # European-style abbreviations are commonly used along the Mediterranean. # For sub-Saharan Africa abbreviations were less standardized. # Previous editions of this database used WAT, CAT, SAT, and EAT @@ -113,7 +117,7 @@ Zone Atlantic/Cape_Verde -1:34:04 - LMT 1912 Jan 01 2:00u # Praia # Chad # Zone NAME STDOFF RULES FORMAT [UNTIL] -Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena +Zone Africa/Ndjamena 1:00:12 - LMT 1912 Jan 1 # N'Djamena 1:00 - WAT 1979 Oct 14 1:00 1:00 WAST 1980 Mar 8 1:00 - WAT @@ -139,7 +143,7 @@ Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena # Inaccessible, Nightingale: uninhabited # Zone NAME STDOFF RULES FORMAT [UNTIL] -Zone Africa/Abidjan -0:16:08 - LMT 1912 +Zone Africa/Abidjan -0:16:08 - LMT 1912 Jan 1 0:00 - GMT ############################################################################### diff --git a/contrib/tzdata/asia b/contrib/tzdata/asia index 04526c196931..05683b9ebaa3 100644 --- a/contrib/tzdata/asia +++ b/contrib/tzdata/asia @@ -2457,18 +2457,33 @@ Zone Asia/Amman 2:23:44 - LMT 1931 # effective December 21st, 2018.... # http://adilet.zan.kz/rus/docs/P1800000817 (russian language). +# From Zhanbolat Raimbekov (2024-01-19): +# Kazakhstan (all parts) switching to UTC+5 on March 1, 2024 +# https://www.gov.kz/memleket/entities/mti/press/news/details/688998?lang=ru +# [in Russian] +# (2024-01-20): https://primeminister.kz/ru/decisions/19012024-20 +# +# From Alexander Krivenyshev (2024-01-19): +# According to a different news and the official web site for the Ministry of +# Trade and Integration of the Republic of Kazakhstan: +# https://en.inform.kz/news/kazakhstan-to-switch-to-single-hour-zone-mar-1-54ad0b/ + # Zone NAME STDOFF RULES FORMAT [UNTIL] # # Almaty (formerly Alma-Ata), representing most locations in Kazakhstan -# This includes KZ-AKM, KZ-ALA, KZ-ALM, KZ-AST, KZ-BAY, KZ-VOS, KZ-ZHA, -# KZ-KAR, KZ-SEV, KZ-PAV, and KZ-YUZ. +# This includes Abai/Abay (ISO 3166-2 code KZ-10), Aqmola/Akmola (KZ-11), +# Almaty (KZ-19), Almaty city (KZ-75), Astana city (KZ-71), +# East Kazkhstan (KZ-63), Jambyl/Zhambyl (KZ-31), Jetisu/Zhetysu (KZ-33), +# Karaganda (KZ-35), North Kazakhstan (KZ-59), Pavlodar (KZ-55), +# Shyumkent city (KZ-79), Turkistan (KZ-61), and Ulytau (KZ-62). Zone Asia/Almaty 5:07:48 - LMT 1924 May 2 # or Alma-Ata 5:00 - +05 1930 Jun 21 6:00 RussiaAsia +06/+07 1991 Mar 31 2:00s 5:00 RussiaAsia +05/+06 1992 Jan 19 2:00s 6:00 RussiaAsia +06/+07 2004 Oct 31 2:00s - 6:00 - +06 -# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-KZY) + 6:00 - +06 2024 Mar 1 0:00 + 5:00 - +05 +# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-43) Zone Asia/Qyzylorda 4:21:52 - LMT 1924 May 2 4:00 - +04 1930 Jun 21 5:00 - +05 1981 Apr 1 @@ -2481,8 +2496,7 @@ Zone Asia/Qyzylorda 4:21:52 - LMT 1924 May 2 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s 6:00 - +06 2018 Dec 21 0:00 5:00 - +05 -# -# Qostanay (aka Kostanay, Kustanay) (KZ-KUS) +# Qostanay (aka Kostanay, Kustanay) (KZ-39) # The 1991/2 rules are unclear partly because of the 1997 Turgai # reorganization. Zone Asia/Qostanay 4:14:28 - LMT 1924 May 2 @@ -2493,9 +2507,9 @@ Zone Asia/Qostanay 4:14:28 - LMT 1924 May 2 5:00 RussiaAsia +05/+06 1991 Mar 31 2:00s 4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s - 6:00 - +06 - -# Aqtöbe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT) + 6:00 - +06 2024 Mar 1 0:00 + 5:00 - +05 +# Aqtöbe (aka Aktobe, formerly Aktyubinsk) (KZ-15) Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2 4:00 - +04 1930 Jun 21 5:00 - +05 1981 Apr 1 @@ -2505,7 +2519,7 @@ Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2 4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s 5:00 - +05 -# Mangghystaū (KZ-MAN) +# Mangghystaū (KZ-47) # Aqtau was not founded until 1963, but it represents an inhabited region, # so include timestamps before 1963. Zone Asia/Aqtau 3:21:04 - LMT 1924 May 2 @@ -2517,7 +2531,7 @@ Zone Asia/Aqtau 3:21:04 - LMT 1924 May 2 5:00 RussiaAsia +05/+06 1994 Sep 25 2:00s 4:00 RussiaAsia +04/+05 2004 Oct 31 2:00s 5:00 - +05 -# Atyraū (KZ-ATY) is like Mangghystaū except it switched from +# Atyraū (KZ-23) is like Mangghystaū except it switched from # +04/+05 to +05/+06 in spring 1999, not fall 1994. Zone Asia/Atyrau 3:27:44 - LMT 1924 May 2 3:00 - +03 1930 Jun 21 @@ -2528,7 +2542,7 @@ Zone Asia/Atyrau 3:27:44 - LMT 1924 May 2 5:00 RussiaAsia +05/+06 1999 Mar 28 2:00s 4:00 RussiaAsia +04/+05 2004 Oct 31 2:00s 5:00 - +05 -# West Kazakhstan (KZ-ZAP) +# West Kazakhstan (KZ-27) # From Paul Eggert (2016-03-18): # The 1989 transition is from USSR act No. 227 (1989-03-14). Zone Asia/Oral 3:25:24 - LMT 1924 May 2 # or Ural'sk @@ -3430,19 +3444,26 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # ... winter time will begin in Palestine from Saturday 10-28-2023, # 02:00 AM by 60 minutes back. # -# From Paul Eggert (2023-03-22): +# From Heba Hamad (2024-01-25): +# the summer time for the years 2024,2025 will begin in Palestine +# from Saturday at 02:00 AM by 60 minutes forward as shown below: +# year date +# 2024 2024-04-20 +# 2025 2025-04-12 +# +# From Paul Eggert (2024-01-25): # For now, guess that spring and fall transitions will normally # continue to use 2022's rules, that during DST Palestine will switch # to standard time at 02:00 the last Saturday before Ramadan and back -# to DST at 02:00 the first Saturday after Ramadan, and that +# to DST at 02:00 the second Saturday after Ramadan, and that # if the normal spring-forward or fall-back transition occurs during # Ramadan the former is delayed and the latter advanced. # To implement this, I predicted Ramadan-oriented transition dates for -# 2023 through 2086 by running the following program under GNU Emacs 28.2, +# 2026 through 2086 by running the following program under GNU Emacs 29.2, # with the results integrated by hand into the table below. # Predictions after 2086 are approximated without Ramadan. # -# (let ((islamic-year 1444)) +# (let ((islamic-year 1447)) # (require 'cal-islam) # (while (< islamic-year 1510) # (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) @@ -3451,6 +3472,7 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # (while (/= saturday (mod (setq a (1- a)) 7))) # (while (/= saturday (mod b 7)) # (setq b (1+ b))) +# (setq b (+ 7 b)) # (setq a (calendar-gregorian-from-absolute a)) # (setq b (calendar-gregorian-from-absolute b)) # (insert @@ -3501,84 +3523,84 @@ Rule Palestine 2021 only - Oct 29 1:00 0 - Rule Palestine 2022 only - Mar 27 0:00 1:00 S Rule Palestine 2022 2035 - Oct Sat<=30 2:00 0 - Rule Palestine 2023 only - Apr 29 2:00 1:00 S -Rule Palestine 2024 only - Apr 13 2:00 1:00 S -Rule Palestine 2025 only - Apr 5 2:00 1:00 S +Rule Palestine 2024 only - Apr 20 2:00 1:00 S +Rule Palestine 2025 only - Apr 12 2:00 1:00 S Rule Palestine 2026 2054 - Mar Sat<=30 2:00 1:00 S Rule Palestine 2036 only - Oct 18 2:00 0 - Rule Palestine 2037 only - Oct 10 2:00 0 - Rule Palestine 2038 only - Sep 25 2:00 0 - Rule Palestine 2039 only - Sep 17 2:00 0 - -Rule Palestine 2039 only - Oct 22 2:00 1:00 S -Rule Palestine 2039 2067 - Oct Sat<=30 2:00 0 - Rule Palestine 2040 only - Sep 1 2:00 0 - -Rule Palestine 2040 only - Oct 13 2:00 1:00 S +Rule Palestine 2040 only - Oct 20 2:00 1:00 S +Rule Palestine 2040 2067 - Oct Sat<=30 2:00 0 - Rule Palestine 2041 only - Aug 24 2:00 0 - -Rule Palestine 2041 only - Sep 28 2:00 1:00 S +Rule Palestine 2041 only - Oct 5 2:00 1:00 S Rule Palestine 2042 only - Aug 16 2:00 0 - -Rule Palestine 2042 only - Sep 20 2:00 1:00 S +Rule Palestine 2042 only - Sep 27 2:00 1:00 S Rule Palestine 2043 only - Aug 1 2:00 0 - -Rule Palestine 2043 only - Sep 12 2:00 1:00 S +Rule Palestine 2043 only - Sep 19 2:00 1:00 S Rule Palestine 2044 only - Jul 23 2:00 0 - -Rule Palestine 2044 only - Aug 27 2:00 1:00 S +Rule Palestine 2044 only - Sep 3 2:00 1:00 S Rule Palestine 2045 only - Jul 15 2:00 0 - -Rule Palestine 2045 only - Aug 19 2:00 1:00 S +Rule Palestine 2045 only - Aug 26 2:00 1:00 S Rule Palestine 2046 only - Jun 30 2:00 0 - -Rule Palestine 2046 only - Aug 11 2:00 1:00 S +Rule Palestine 2046 only - Aug 18 2:00 1:00 S Rule Palestine 2047 only - Jun 22 2:00 0 - -Rule Palestine 2047 only - Jul 27 2:00 1:00 S +Rule Palestine 2047 only - Aug 3 2:00 1:00 S Rule Palestine 2048 only - Jun 6 2:00 0 - -Rule Palestine 2048 only - Jul 18 2:00 1:00 S +Rule Palestine 2048 only - Jul 25 2:00 1:00 S Rule Palestine 2049 only - May 29 2:00 0 - -Rule Palestine 2049 only - Jul 3 2:00 1:00 S +Rule Palestine 2049 only - Jul 10 2:00 1:00 S Rule Palestine 2050 only - May 21 2:00 0 - -Rule Palestine 2050 only - Jun 25 2:00 1:00 S +Rule Palestine 2050 only - Jul 2 2:00 1:00 S Rule Palestine 2051 only - May 6 2:00 0 - -Rule Palestine 2051 only - Jun 17 2:00 1:00 S +Rule Palestine 2051 only - Jun 24 2:00 1:00 S Rule Palestine 2052 only - Apr 27 2:00 0 - -Rule Palestine 2052 only - Jun 1 2:00 1:00 S +Rule Palestine 2052 only - Jun 8 2:00 1:00 S Rule Palestine 2053 only - Apr 12 2:00 0 - -Rule Palestine 2053 only - May 24 2:00 1:00 S +Rule Palestine 2053 only - May 31 2:00 1:00 S Rule Palestine 2054 only - Apr 4 2:00 0 - -Rule Palestine 2054 only - May 16 2:00 1:00 S -Rule Palestine 2055 only - May 1 2:00 1:00 S -Rule Palestine 2056 only - Apr 22 2:00 1:00 S -Rule Palestine 2057 only - Apr 7 2:00 1:00 S -Rule Palestine 2058 max - Mar Sat<=30 2:00 1:00 S +Rule Palestine 2054 only - May 23 2:00 1:00 S +Rule Palestine 2055 only - May 8 2:00 1:00 S +Rule Palestine 2056 only - Apr 29 2:00 1:00 S +Rule Palestine 2057 only - Apr 14 2:00 1:00 S +Rule Palestine 2058 only - Apr 6 2:00 1:00 S +Rule Palestine 2059 max - Mar Sat<=30 2:00 1:00 S Rule Palestine 2068 only - Oct 20 2:00 0 - Rule Palestine 2069 only - Oct 12 2:00 0 - Rule Palestine 2070 only - Oct 4 2:00 0 - Rule Palestine 2071 only - Sep 19 2:00 0 - Rule Palestine 2072 only - Sep 10 2:00 0 - -Rule Palestine 2072 only - Oct 15 2:00 1:00 S +Rule Palestine 2072 only - Oct 22 2:00 1:00 S Rule Palestine 2072 max - Oct Sat<=30 2:00 0 - Rule Palestine 2073 only - Sep 2 2:00 0 - -Rule Palestine 2073 only - Oct 7 2:00 1:00 S +Rule Palestine 2073 only - Oct 14 2:00 1:00 S Rule Palestine 2074 only - Aug 18 2:00 0 - -Rule Palestine 2074 only - Sep 29 2:00 1:00 S +Rule Palestine 2074 only - Oct 6 2:00 1:00 S Rule Palestine 2075 only - Aug 10 2:00 0 - -Rule Palestine 2075 only - Sep 14 2:00 1:00 S +Rule Palestine 2075 only - Sep 21 2:00 1:00 S Rule Palestine 2076 only - Jul 25 2:00 0 - -Rule Palestine 2076 only - Sep 5 2:00 1:00 S +Rule Palestine 2076 only - Sep 12 2:00 1:00 S Rule Palestine 2077 only - Jul 17 2:00 0 - -Rule Palestine 2077 only - Aug 28 2:00 1:00 S +Rule Palestine 2077 only - Sep 4 2:00 1:00 S Rule Palestine 2078 only - Jul 9 2:00 0 - -Rule Palestine 2078 only - Aug 13 2:00 1:00 S +Rule Palestine 2078 only - Aug 20 2:00 1:00 S Rule Palestine 2079 only - Jun 24 2:00 0 - -Rule Palestine 2079 only - Aug 5 2:00 1:00 S +Rule Palestine 2079 only - Aug 12 2:00 1:00 S Rule Palestine 2080 only - Jun 15 2:00 0 - -Rule Palestine 2080 only - Jul 20 2:00 1:00 S +Rule Palestine 2080 only - Jul 27 2:00 1:00 S Rule Palestine 2081 only - Jun 7 2:00 0 - -Rule Palestine 2081 only - Jul 12 2:00 1:00 S +Rule Palestine 2081 only - Jul 19 2:00 1:00 S Rule Palestine 2082 only - May 23 2:00 0 - -Rule Palestine 2082 only - Jul 4 2:00 1:00 S +Rule Palestine 2082 only - Jul 11 2:00 1:00 S Rule Palestine 2083 only - May 15 2:00 0 - -Rule Palestine 2083 only - Jun 19 2:00 1:00 S +Rule Palestine 2083 only - Jun 26 2:00 1:00 S Rule Palestine 2084 only - Apr 29 2:00 0 - -Rule Palestine 2084 only - Jun 10 2:00 1:00 S +Rule Palestine 2084 only - Jun 17 2:00 1:00 S Rule Palestine 2085 only - Apr 21 2:00 0 - -Rule Palestine 2085 only - Jun 2 2:00 1:00 S +Rule Palestine 2085 only - Jun 9 2:00 1:00 S Rule Palestine 2086 only - Apr 13 2:00 0 - -Rule Palestine 2086 only - May 18 2:00 1:00 S +Rule Palestine 2086 only - May 25 2:00 1:00 S # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -3606,7 +3628,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct # Philippines -# From Paul Eggert (2018-11-18): +# From Paul Eggert (2024-01-21): # The Spanish initially used American (west-of-Greenwich) time. # It is unknown what time Manila kept when the British occupied it from # 1762-10-06 through 1764-04; for now assume it kept American time. @@ -3614,7 +3636,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct # Philippines, issued a proclamation announcing that 1844-12-30 was to # be immediately followed by 1845-01-01; see R.H. van Gent's # History of the International Date Line -# https://www.staff.science.uu.nl/~gent0113/idl/idl_philippines.htm +# https://webspace.science.uu.nl/~gent0113/idl/idl_philippines.htm # The rest of the data entries are from Shanks & Pottenger. # From Jesper Nørgaard Welen (2006-04-26): @@ -4041,7 +4063,8 @@ Zone Asia/Tashkent 4:37:11 - LMT 1924 May 2 # The English-language name of Vietnam's most populous city is "Ho Chi Minh # City"; use Ho_Chi_Minh below to avoid a name of more than 14 characters. -# From Paul Eggert (2022-07-27) after a 2014 heads-up from Trần Ngọc Quân: +# From Paul Eggert (2024-01-14) after a 2014 heads-up from Trần Ngọc Quân +# and a 2024-01-14 heads-up from Đoàn Trần Công Danh: # Trần Tiến Bình's authoritative book "Lịch Việt Nam: thế kỷ XX-XXI (1901-2100)" # (Nhà xuất bản Văn Hoá - Thông Tin, Hanoi, 2005), pp 49-50, # is quoted verbatim in: @@ -4071,14 +4094,35 @@ Zone Asia/Tashkent 4:37:11 - LMT 1924 May 2 # # Trần cites the following sources; it's unclear which supplied the info above. # -# Hoàng Xuân Hãn: "Lịch và lịch Việt Nam". Tập san Khoa học Xã hội, -# No. 9, Paris, February 1982. +# Hoàng Xuân Hãn: "Lịch và lịch Việt Nam". Tập san Khoa học Xã hội, +# No. 9, Paris, February 1982. +# +# Lê Thành Lân: "Lịch và niên biểu lịch sử hai mươi thế kỷ (0001-2010)", +# NXB Thống kê, Hanoi, 2000. # -# Lê Thành Lân: "Lịch và niên biểu lịch sử hai mươi thế kỷ (0001-2010)", -# NXB Thống kê, Hanoi, 2000. +# Lê Thành Lân: "Lịch hai thế kỷ (1802-2010) và các lịch vĩnh cửu", +# NXB Thuận Hoá, Huế, 1995. # -# Lê Thành Lân: "Lịch hai thế kỷ (1802-2010) và các lịch vĩnh cửu", -# NXB Thuận Hoá, Huế, 1995. +# Here is the decision for the September 1945 transition: +# Võ Nguyên Giáp, Việt Nam Dân Quốc Công Báo, No. 1 (1945-09-29), page 13 +# http://baochi.nlv.gov.vn/baochi/cgi-bin/baochi?a=d&d=JwvzO19450929.2.5&dliv=none +# It says that on 1945-09-01 at 24:00, Vietnam moved back two hours, to +07. +# It also mentions a 1945-03-29 decree (by a Japanese Goveror-General) +# to set the time zone to +09, but does not say whether that decree +# merely legalized an earlier change to +09. +# +# July 1955 transition: +# Ngô Đình Diệm, Công Báo Việt Nam, No. 92 (1955-07-02), page 1780-1781 +# Ordinance (Dụ) No. 46 (1955-06-25) +# http://ddsnext.crl.edu/titles/32341#?c=0&m=29&s=0&cv=4&r=0&xywh=-89%2C342%2C1724%2C1216 +# It says that on 1955-07-01 at 01:00, South Vietnam moved back 1 hour (to +07). +# +# December 1959 transition: +# Ngô Đình Diệm, Công Báo Việt Nam Cộng Hòa, 1960 part 1 (1960-01-02), page 62 +# Decree (Sắc lệnh) No. 362-TTP (1959-12-30) +# http://ddsnext.crl.edu/titles/32341#?c=0&m=138&s=0&cv=793&r=0&xywh=-54%2C1504%2C1705%2C1202 +# It says that on 1959-12-31 at 23:00, South Vietnam moved forward 1 hour (to +08). + # Zone NAME STDOFF RULES FORMAT [UNTIL] #STDOFF 7:06:30.13 @@ -4086,9 +4130,9 @@ Zone Asia/Ho_Chi_Minh 7:06:30 - LMT 1906 Jul 1 7:06:30 - PLMT 1911 May 1 # Phù Liễn MT 7:00 - +07 1942 Dec 31 23:00 8:00 - +08 1945 Mar 14 23:00 - 9:00 - +09 1945 Sep 2 + 9:00 - +09 1945 Sep 1 24:00 7:00 - +07 1947 Apr 1 - 8:00 - +08 1955 Jul 1 + 8:00 - +08 1955 Jul 1 01:00 7:00 - +07 1959 Dec 31 23:00 8:00 - +08 1975 Jun 13 7:00 - +07 diff --git a/contrib/tzdata/australasia b/contrib/tzdata/australasia index dc98c1e2de17..0e9c2592e4be 100644 --- a/contrib/tzdata/australasia +++ b/contrib/tzdata/australasia @@ -420,11 +420,11 @@ Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva # French Polynesia # Zone NAME STDOFF RULES FORMAT [UNTIL] -Zone Pacific/Gambier -8:59:48 - LMT 1912 Oct # Rikitea +Zone Pacific/Gambier -8:59:48 - LMT 1912 Oct 1 # Rikitea -9:00 - -09 -Zone Pacific/Marquesas -9:18:00 - LMT 1912 Oct +Zone Pacific/Marquesas -9:18:00 - LMT 1912 Oct 1 -9:30 - -0930 -Zone Pacific/Tahiti -9:58:16 - LMT 1912 Oct # Papeete +Zone Pacific/Tahiti -9:58:16 - LMT 1912 Oct 1 # Papeete -10:00 - -10 # Clipperton (near North America) is administered from French Polynesia; # it is uninhabited. @@ -802,7 +802,7 @@ Zone Pacific/Apia 12:33:04 - LMT 1892 Jul 5 # Solomon Is # excludes Bougainville, for which see Papua New Guinea # Zone NAME STDOFF RULES FORMAT [UNTIL] -Zone Pacific/Guadalcanal 10:39:48 - LMT 1912 Oct # Honiara +Zone Pacific/Guadalcanal 10:39:48 - LMT 1912 Oct 1 # Honiara 11:00 - +11 # Tokelau @@ -963,6 +963,10 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila # Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94. # https://www.jstor.org/stable/1774359 # +# For the 1911/1912 establishment of standard time in French possessions, see: +# Société Française de Physique, Recueil de constantes physiques (1913), +# page 752, 18b. +# # A reliable and entertaining source about time zones is # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). # @@ -2039,7 +2043,7 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila # ordaining - by a masterpiece of diplomatic flattery - that # the Fourth of July should be celebrated twice in that year." # This happened in 1892, according to the Evening News (Sydney) of 1892-07-20. -# https://www.staff.science.uu.nl/~gent0113/idl/idl.htm +# https://webspace.science.uu.nl/~gent0113/idl/idl_alaska_samoa.htm # Although Shanks & Pottenger says they both switched to UT -11:30 # in 1911, and to -11 in 1950. many earlier sources give -11 diff --git a/contrib/tzdata/checknow.awk b/contrib/tzdata/checknow.awk index d722c03fd689..57ff3c02e789 100644 --- a/contrib/tzdata/checknow.awk +++ b/contrib/tzdata/checknow.awk @@ -45,7 +45,7 @@ END { for (zone in zone_data) { data = zone_data[zone] if (!zonenow[data]) { - printf "checknow.tab should have one of:%s\n", zones[data] + printf "zonenow.tab should have one of:%s\n", zones[data] zonenow[data] = zone # This suppresses duplicate diagnostics. status = 1 } diff --git a/contrib/tzdata/etcetera b/contrib/tzdata/etcetera index 865a220c1f4b..29fbed9b9290 100644 --- a/contrib/tzdata/etcetera +++ b/contrib/tzdata/etcetera @@ -5,7 +5,7 @@ # These entries are for uses not otherwise covered by the tz database. # Their main practical use is for platforms like Android that lack -# support for POSIX-style TZ strings. On such platforms these entries +# support for POSIX.1-2017-style TZ strings. On such platforms these entries # can be useful if the timezone database is wrong or if a ship or # aircraft at sea is not in a timezone. diff --git a/contrib/tzdata/europe b/contrib/tzdata/europe index 27f821e77600..c6b5270316b9 100644 --- a/contrib/tzdata/europe +++ b/contrib/tzdata/europe @@ -990,9 +990,34 @@ Zone Europe/Sofia 1:33:16 - LMT 1880 # Czech Republic (Czechia) # Slovakia # -# From Paul Eggert (2018-04-15): -# The source for Czech data is: Kdy začíná a končí letní čas. 2018-04-15. +# From Ivan Benovic (2024-01-30): +# https://www.slov-lex.sk/pravne-predpisy/SK/ZZ/1946/54/ +# (This is an official link to the Czechoslovak Summer Time Act of +# March 8, 1946 that authorizes the Czechoslovak government to set the +# exact dates of change to summer time and back to Central European Time. +# The act also implicitly confirms Central European Time as the +# official time zone of Czechoslovakia and currently remains in force +# in both the Czech Republic and Slovakia.) +# https://www.psp.cz/eknih/1945pns/tisky/t0216_00.htm +# (This is a link to the original legislative proposal dating back to +# February 22, 1946. The accompanying memorandum to the proposal says +# that an advisory committee on European railroad transportation that +# met in Brussels in October 1945 decided that the change of time +# should be carried out in all participating countries in a strictly +# coordinated manner....) +# +# From Paul Eggert (2024-01-30): +# The source for Czech data is: Kdy začíná a končí letní čas. # https://kalendar.beda.cz/kdy-zacina-a-konci-letni-cas +# Its main text disagrees with its quoted sources only in 1918, +# where the main text says spring and autumn transitions +# occurred at 02:00 and 03:00 respectively (as usual), +# whereas the 1918 source "Oznámení o zavedení letního času v roce 1918" +# says transitions were at 01:00 and 02:00 respectively. +# As the 1918 source appears to be a humorous piece, and it is +# unlikely that Prague would have disagreed with its neighbors by an hour, +# go with the main text for now. +# # We know of no English-language name for historical Czech winter time; # abbreviate it as "GMT", as it happened to be GMT. # diff --git a/contrib/tzdata/leap-seconds.list b/contrib/tzdata/leap-seconds.list index 3fe9a1210e3c..e52effc257b2 100644 --- a/contrib/tzdata/leap-seconds.list +++ b/contrib/tzdata/leap-seconds.list @@ -1,255 +1,120 @@ +# ATOMIC TIME. +# The Coordinated Universal Time (UTC) is the reference time scale derived +# from The "Temps Atomique International" (TAI) calculated by the Bureau +# International des Poids et Mesures (BIPM) using a worldwide network of atomic +# clocks. UTC differs from TAI by an integer number of seconds; it is the basis +# of all activities in the world. # -# In the following text, the symbol '#' introduces -# a comment, which continues from that symbol until -# the end of the line. A plain comment line has a -# whitespace character following the comment indicator. -# There are also special comment lines defined below. -# A special comment will always have a non-whitespace -# character in column 2. -# -# A blank line should be ignored. -# -# The following table shows the corrections that must -# be applied to compute International Atomic Time (TAI) -# from the Coordinated Universal Time (UTC) values that -# are transmitted by almost all time services. -# -# The first column shows an epoch as a number of seconds -# since 1 January 1900, 00:00:00 (1900.0 is also used to -# indicate the same epoch.) Both of these time stamp formats -# ignore the complexities of the time scales that were -# used before the current definition of UTC at the start -# of 1972. (See note 3 below.) -# The second column shows the number of seconds that -# must be added to UTC to compute TAI for any timestamp -# at or after that epoch. The value on each line is -# valid from the indicated initial instant until the -# epoch given on the next one or indefinitely into the -# future if there is no next line. -# (The comment on each line shows the representation of -# the corresponding initial epoch in the usual -# day-month-year format. The epoch always begins at -# 00:00:00 UTC on the indicated day. See Note 5 below.) -# -# Important notes: -# -# 1. Coordinated Universal Time (UTC) is often referred to -# as Greenwich Mean Time (GMT). The GMT time scale is no -# longer used, and the use of GMT to designate UTC is -# discouraged. -# -# 2. The UTC time scale is realized by many national -# laboratories and timing centers. Each laboratory -# identifies its realization with its name: Thus -# UTC(NIST), UTC(USNO), etc. The differences among -# these different realizations are typically on the -# order of a few nanoseconds (i.e., 0.000 000 00x s) -# and can be ignored for many purposes. These differences -# are tabulated in Circular T, which is published monthly -# by the International Bureau of Weights and Measures -# (BIPM). See www.bipm.org for more information. -# -# 3. The current definition of the relationship between UTC -# and TAI dates from 1 January 1972. A number of different -# time scales were in use before that epoch, and it can be -# quite difficult to compute precise timestamps and time -# intervals in those "prehistoric" days. For more information, -# consult: -# -# The Explanatory Supplement to the Astronomical -# Ephemeris. -# or -# Terry Quinn, "The BIPM and the Accurate Measurement -# of Time," Proc. of the IEEE, Vol. 79, pp. 894-905, -# July, 1991. -# reprinted in: -# Christine Hackman and Donald B Sullivan (eds.) -# Time and Frequency Measurement -# American Association of Physics Teachers (1996) -# , pp. 75-86 -# -# 4. The decision to insert a leap second into UTC is currently -# the responsibility of the International Earth Rotation and -# Reference Systems Service. (The name was changed from the -# International Earth Rotation Service, but the acronym IERS -# is still used.) -# -# Leap seconds are announced by the IERS in its Bulletin C. -# -# See www.iers.org for more details. -# -# Every national laboratory and timing center uses the -# data from the BIPM and the IERS to construct UTC(lab), -# their local realization of UTC. -# -# Although the definition also includes the possibility -# of dropping seconds ("negative" leap seconds), this has -# never been done and is unlikely to be necessary in the -# foreseeable future. -# -# 5. If your system keeps time as the number of seconds since -# some epoch (e.g., NTP timestamps), then the algorithm for -# assigning a UTC time stamp to an event that happens during a positive -# leap second is not well defined. The official name of that leap -# second is 23:59:60, but there is no way of representing that time -# in these systems. -# Many systems of this type effectively stop the system clock for -# one second during the leap second and use a time that is equivalent -# to 23:59:59 UTC twice. For these systems, the corresponding TAI -# timestamp would be obtained by advancing to the next entry in the -# following table when the time equivalent to 23:59:59 UTC -# is used for the second time. Thus the leap second which -# occurred on 30 June 1972 at 23:59:59 UTC would have TAI -# timestamps computed as follows: -# -# ... -# 30 June 1972 23:59:59 (2287785599, first time): TAI= UTC + 10 seconds -# 30 June 1972 23:59:60 (2287785599,second time): TAI= UTC + 11 seconds -# 1 July 1972 00:00:00 (2287785600) TAI= UTC + 11 seconds -# ... -# -# If your system realizes the leap second by repeating 00:00:00 UTC twice -# (this is possible but not usual), then the advance to the next entry -# in the table must occur the second time that a time equivalent to -# 00:00:00 UTC is used. Thus, using the same example as above: -# -# ... -# 30 June 1972 23:59:59 (2287785599): TAI= UTC + 10 seconds -# 30 June 1972 23:59:60 (2287785600, first time): TAI= UTC + 10 seconds -# 1 July 1972 00:00:00 (2287785600,second time): TAI= UTC + 11 seconds -# ... -# -# in both cases the use of timestamps based on TAI produces a smooth -# time scale with no discontinuity in the time interval. However, -# although the long-term behavior of the time scale is correct in both -# methods, the second method is technically not correct because it adds -# the extra second to the wrong day. -# -# This complexity would not be needed for negative leap seconds (if they -# are ever used). The UTC time would skip 23:59:59 and advance from -# 23:59:58 to 00:00:00 in that case. The TAI offset would decrease by -# 1 second at the same instant. This is a much easier situation to deal -# with, since the difficulty of unambiguously representing the epoch -# during the leap second does not arise. -# -# Some systems implement leap seconds by amortizing the leap second -# over the last few minutes of the day. The frequency of the local -# clock is decreased (or increased) to realize the positive (or -# negative) leap second. This method removes the time step described -# above. Although the long-term behavior of the time scale is correct -# in this case, this method introduces an error during the adjustment -# period both in time and in frequency with respect to the official -# definition of UTC. -# -# Questions or comments to: -# Judah Levine -# Time and Frequency Division -# NIST -# Boulder, Colorado -# Judah.Levine@nist.gov -# -# Last Update of leap second values: 8 July 2016 -# -# The following line shows this last update date in NTP timestamp -# format. This is the date on which the most recent change to -# the leap second data was added to the file. This line can -# be identified by the unique pair of characters in the first two -# columns as shown below. -# -#$ 3676924800 -# -# The NTP timestamps are in units of seconds since the NTP epoch, -# which is 1 January 1900, 00:00:00. The Modified Julian Day number -# corresponding to the NTP time stamp, X, can be computed as -# -# X/86400 + 15020 -# -# where the first term converts seconds to days and the second -# term adds the MJD corresponding to the time origin defined above. -# The integer portion of the result is the integer MJD for that -# day, and any remainder is the time of day, expressed as the -# fraction of the day since 0 hours UTC. The conversion from day -# fraction to seconds or to hours, minutes, and seconds may involve -# rounding or truncation, depending on the method used in the -# computation. -# -# The data in this file will be updated periodically as new leap -# seconds are announced. In addition to being entered on the line -# above, the update time (in NTP format) will be added to the basic -# file name leap-seconds to form the name leap-seconds.. -# In addition, the generic name leap-seconds.list will always point to -# the most recent version of the file. -# -# This update procedure will be performed only when a new leap second -# is announced. -# -# The following entry specifies the expiration date of the data -# in this file in units of seconds since the origin at the instant -# 1 January 1900, 00:00:00. This expiration date will be changed -# at least twice per year whether or not a new leap second is -# announced. These semi-annual changes will be made no later -# than 1 June and 1 December of each year to indicate what -# action (if any) is to be taken on 30 June and 31 December, -# respectively. (These are the customary effective dates for new -# leap seconds.) This expiration date will be identified by a -# unique pair of characters in columns 1 and 2 as shown below. -# In the unlikely event that a leap second is announced with an -# effective date other than 30 June or 31 December, then this -# file will be edited to include that leap second as soon as it is -# announced or at least one month before the effective date -# (whichever is later). -# If an announcement by the IERS specifies that no leap second is -# scheduled, then only the expiration date of the file will -# be advanced to show that the information in the file is still -# current -- the update time stamp, the data and the name of the file -# will not change. -# -# Updated through IERS Bulletin C66 -# File expires on: 28 June 2024 -# -#@ 3928521600 -# -2272060800 10 # 1 Jan 1972 -2287785600 11 # 1 Jul 1972 -2303683200 12 # 1 Jan 1973 -2335219200 13 # 1 Jan 1974 -2366755200 14 # 1 Jan 1975 -2398291200 15 # 1 Jan 1976 -2429913600 16 # 1 Jan 1977 -2461449600 17 # 1 Jan 1978 -2492985600 18 # 1 Jan 1979 -2524521600 19 # 1 Jan 1980 -2571782400 20 # 1 Jul 1981 -2603318400 21 # 1 Jul 1982 -2634854400 22 # 1 Jul 1983 -2698012800 23 # 1 Jul 1985 -2776982400 24 # 1 Jan 1988 -2840140800 25 # 1 Jan 1990 -2871676800 26 # 1 Jan 1991 -2918937600 27 # 1 Jul 1992 -2950473600 28 # 1 Jul 1993 -2982009600 29 # 1 Jul 1994 -3029443200 30 # 1 Jan 1996 -3076704000 31 # 1 Jul 1997 -3124137600 32 # 1 Jan 1999 -3345062400 33 # 1 Jan 2006 -3439756800 34 # 1 Jan 2009 -3550089600 35 # 1 Jul 2012 -3644697600 36 # 1 Jul 2015 -3692217600 37 # 1 Jan 2017 -# -# the following special comment contains the -# hash value of the data in this file computed -# use the secure hash algorithm as specified -# by FIPS 180-1. See the files in ~/pub/sha for -# the details of how this hash value is -# computed. Note that the hash computation -# ignores comments and whitespace characters -# in data lines. It includes the NTP values *** 599 LINES SKIPPED *** From nobody Wed Feb 14 06:05:43 2024 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 4TZSNm0vg7z5B4yf; Wed, 14 Feb 2024 06:05:44 +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 4TZSNl6hvRz4Rng; Wed, 14 Feb 2024 06:05:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890743; 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=+2xB9JoBFaYAInMqiwGa9s1w7zq+Ra1FDk0YVfdGUUg=; b=gfSIpjBU95n/MEjXUn8H3tanndqxpQEfFsXFYIhyGO6Buj13rKWvNBZyekQ0+tACWcg/fj 0duzqmrh1JvUAu17r+yUnWC1EVJNNE+cfHy7RRQ2qs17DdgDix1AXSY4xmHhMSCShuTp8V sulOibQRJnSMeVGKLlwZCfhBQQEbFkSAHlvkVfS1/zpUR2iYlssHKda4BStr77IzwV9jYa dWOLLp8lAeYw0Tnl68JopnDUVvbXQO2uXAvSXH4/q0PcYFUHLPBxqxNh12YEhK4GG+5cZb mc//wCZzfJt3KnbActIJunqxch4GTcBfSzQFcoqAd5HP1aDjyL73BvjU26v10Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707890743; a=rsa-sha256; cv=none; b=xU6SB7LlKEFbL2wbYPiTBCMVkIoCoeQ9JqLbrLiq7nGctpn7UkIwy8KWSGeeLHdI9q4k/S Ko6WPkfSOhLQpqqjfmLg3UA810UIoRhxatb+w0bI3QJ8XXnCEqRwgA7NZB2FaCHu/nxALV WnKPBxUU7C9/pfKXFyfjMhEHyldlHotZYofhgydvkICVeSRRQ0y6J0Oc2U4yhzjHrznKwr bCFMuzXtVlcefUZJB5oihu3QKtU7ZR121CNxFFfPYTtfncxkLPKm66gRHTADWuBWu6Pu/f DvyiqmBk6WfSdxZ/6tR3uFXK446xsui788iC5IEO+N9wwRUfLmptv/xlE0KnZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890743; 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=+2xB9JoBFaYAInMqiwGa9s1w7zq+Ra1FDk0YVfdGUUg=; b=gt1iqdHz9lLIxd9hwLSx09bbGwCfMRmU4GKsgoA7Pk4CYkSbE2MPvtwqUq9U6jR51W/88j diiYtkQIhuvER4/TPtDYkMc2u+QCrdS3zmTKczmlXDYfUNkkBmbmIOOaj4dhPCKff70Bde xVqZxJ4JYRzQXlpz2sMjIH3K2XGi94P5ZdvwotXsQG+7TnoX1/WdyjvdjG88xthHOOU3G6 7/iQrEHmsIAnECVd7gWYfx7VMQKVgGaMKz3R9x8fn+jIoQ3gN1jfRNjkbUccoFIltBSBL8 lnQ1d8IebZv8S4UMDxkCLU82t16+OU1P+xm7EIs3ooj5mFirRH32fjCyhwyPvg== 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 4TZSNl5pJZzn4Z; Wed, 14 Feb 2024 06:05:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E65hCK084626; Wed, 14 Feb 2024 06:05:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E65hQY084623; Wed, 14 Feb 2024 06:05:43 GMT (envelope-from git) Date: Wed, 14 Feb 2024 06:05:43 GMT Message-Id: <202402140605.41E65hQY084623@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 9db5ae3ec45f - releng/14.0 - inpcb: reoder inpcb destruction 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 9db5ae3ec45f069f48808a2916ea1c5374e75e6c Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=9db5ae3ec45f069f48808a2916ea1c5374e75e6c commit 9db5ae3ec45f069f48808a2916ea1c5374e75e6c Author: Gleb Smirnoff AuthorDate: 2023-12-27 16:34:37 +0000 Commit: Gordon Tetlow CommitDate: 2024-02-14 05:40:23 +0000 inpcb: reoder inpcb destruction First, merge in_pcbdetach() with in_pcbfree(). The comment for in_pcbdetach() was no longer correct. Then, make sure we remove the inpcb from the hash before we commit any destructive actions on it. There are couple functions that rely on the hash lock skipping SMR + inpcb lock to lookup an inpcb. Although there are no known functions that similarly rely on the global inpcb list lock, also do list removal before destructive actions. PR: 273890 Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43122 Approved by: so Security: FreeBSD-EN-24:04.ip (cherry picked from commit a13039e2709277b1c3b159e694cc909a5e044151) (cherry picked from commit 2bfe735277b8858dd7ad937e0bf2286bdfb45182) --- sys/netinet/in_pcb.c | 39 +++++++++++++++------------------------ sys/netinet/in_pcb.h | 1 - sys/netinet/raw_ip.c | 1 - sys/netinet/tcp_syncache.c | 2 -- sys/netinet/tcp_usrreq.c | 2 -- sys/netinet/udp_usrreq.c | 1 - sys/netinet6/raw_ip6.c | 1 - sys/netinet6/udp6_usrreq.c | 1 - 8 files changed, 15 insertions(+), 33 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 2586c107ceaf..a54b93812c55 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1405,26 +1405,6 @@ in_pcbdisconnect(struct inpcb *inp) } #endif /* INET */ -/* - * in_pcbdetach() is responsibe for disassociating a socket from an inpcb. - * For most protocols, this will be invoked immediately prior to calling - * in_pcbfree(). However, with TCP the inpcb may significantly outlive the - * socket, in which case in_pcbfree() is deferred. - */ -void -in_pcbdetach(struct inpcb *inp) -{ - - KASSERT(inp->inp_socket != NULL, ("%s: inp_socket == NULL", __func__)); - -#ifdef RATELIMIT - if (inp->inp_snd_tag != NULL) - in_pcbdetach_txrtlmt(inp); -#endif - inp->inp_socket->so_pcb = NULL; - inp->inp_socket = NULL; -} - /* * inpcb hash lookups are protected by SMR section. * @@ -1735,19 +1715,30 @@ in_pcbfree(struct inpcb *inp) #endif INP_WLOCK_ASSERT(inp); - KASSERT(inp->inp_socket == NULL, ("%s: inp_socket != NULL", __func__)); + KASSERT(inp->inp_socket != NULL, ("%s: inp_socket == NULL", __func__)); KASSERT((inp->inp_flags & INP_FREED) == 0, ("%s: called twice for pcb %p", __func__, inp)); - inp->inp_flags |= INP_FREED; + /* + * in_pcblookup_local() and in6_pcblookup_local() may return an inpcb + * from the hash without acquiring inpcb lock, they rely on the hash + * lock, thus in_pcbremhash() should be the first action. + */ + if (inp->inp_flags & INP_INHASHLIST) + in_pcbremhash(inp); INP_INFO_WLOCK(pcbinfo); inp->inp_gencnt = ++pcbinfo->ipi_gencnt; pcbinfo->ipi_count--; CK_LIST_REMOVE(inp, inp_list); INP_INFO_WUNLOCK(pcbinfo); - if (inp->inp_flags & INP_INHASHLIST) - in_pcbremhash(inp); +#ifdef RATELIMIT + if (inp->inp_snd_tag != NULL) + in_pcbdetach_txrtlmt(inp); +#endif + inp->inp_flags |= INP_FREED; + inp->inp_socket->so_pcb = NULL; + inp->inp_socket = NULL; RO_INVALIDATE_CACHE(&inp->inp_route); #ifdef MAC diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 19d281937b52..4844bbee3b54 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -672,7 +672,6 @@ int in_pcbconnect(struct inpcb *, struct sockaddr_in *, struct ucred *, bool); int in_pcbconnect_setup(struct inpcb *, struct sockaddr_in *, in_addr_t *, u_short *, in_addr_t *, u_short *, struct ucred *); -void in_pcbdetach(struct inpcb *); void in_pcbdisconnect(struct inpcb *); void in_pcbdrop(struct inpcb *); void in_pcbfree(struct inpcb *); diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index e6e8b7a56680..04b12b6587dd 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -862,7 +862,6 @@ rip_detach(struct socket *so) ip_rsvp_force_done(so); if (so == V_ip_rsvpd) ip_rsvp_done(); - in_pcbdetach(inp); in_pcbfree(inp); } diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index ffde6a4b88c9..6faf635213b1 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -803,7 +803,6 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m) } inp = sotoinpcb(so); if ((tp = tcp_newtcpcb(inp)) == NULL) { - in_pcbdetach(inp); in_pcbfree(inp); sodealloc(so); goto allocfail; @@ -1050,7 +1049,6 @@ allocfail: return (NULL); abort: - in_pcbdetach(inp); in_pcbfree(inp); sodealloc(so); if ((s = tcp_log_addrs(&sc->sc_inc, NULL, NULL, NULL))) { diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 8b0b3c296c62..767045480abf 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -177,7 +177,6 @@ tcp_usr_attach(struct socket *so, int proto, struct thread *td) tp = tcp_newtcpcb(inp); if (tp == NULL) { error = ENOBUFS; - in_pcbdetach(inp); in_pcbfree(inp); goto out; } @@ -215,7 +214,6 @@ tcp_usr_detach(struct socket *so) ("%s: inp %p not dropped or embryonic", __func__, inp)); tcp_discardcb(tp); - in_pcbdetach(inp); in_pcbfree(inp); } diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index cbda7f536262..708a4e6b730d 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1634,7 +1634,6 @@ udp_detach(struct socket *so) KASSERT(inp->inp_faddr.s_addr == INADDR_ANY, ("udp_detach: not disconnected")); INP_WLOCK(inp); - in_pcbdetach(inp); in_pcbfree(inp); } diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index d790a397f551..66fe0afbe918 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -689,7 +689,6 @@ rip6_detach(struct socket *so) /* xxx: RSVP */ INP_WLOCK(inp); free(inp->in6p_icmp6filt, M_PCB); - in_pcbdetach(inp); in_pcbfree(inp); } diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 4e69608b71de..35d68e164145 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -1203,7 +1203,6 @@ udp6_detach(struct socket *so) KASSERT(inp != NULL, ("udp6_detach: inp == NULL")); INP_WLOCK(inp); - in_pcbdetach(inp); in_pcbfree(inp); } From nobody Wed Feb 14 06:05:41 2024 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 4TZSNj6Kscz5B4tF; Wed, 14 Feb 2024 06:05:41 +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 4TZSNj5KxQz4Rr3; Wed, 14 Feb 2024 06:05:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890741; 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=ZENtM9nh/y3Q9XdbmnJrdPP5kdW5okqbBkGctfFASsU=; b=uxXG7W9/og9v0OjoLb6KzUWmc+cd4aqGdHIy9gHYAiTM95Vt/nJQ152dnc28a6A7PZ82VK RtF++uaHaEzEe7Wy238+kCkjgWGAIqTQFiJzII9kGhccFSmAy/Qi+gclMeFGU6TQSmi99x VhiIHx2K62ATIoESioGdp1/YscU2rmyM+Mq/2GjRinvtmjleGTMpwWoQljqPRj0ypR/dVy 4n7fKGmgVsw9gLU+IffVxgaWxy1+jKyfRe17x7GhSxc7U0IODtyd2xM/cIFOQP2Pz70wGP RgOc5H4RuKF7XIra46rv7yBkjkmOKTNkftEwb/xCGCfU+G4hWiTSNVGhdTUcVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707890741; a=rsa-sha256; cv=none; b=FfcNwkIeBKax5PuRnvKI9AQDCRz6m3iZU8mV4C1q8xPPZWjAGFv7jYDNX9oBVvfCmqdIuY H8srm7agbdQzJ7rfuCZm/EWE+AyVFAprpZXYQsQ+vrPGsd9gQpShD9EzwYFCFiPu0M4/YC EdwTY1/IGwmeNKGv2szUATZlkU9hMSdyO3ly8m2vY2cc/yAQwiHzylE+PKp/hdENr5Hb+S qdbP5paP8qOTIdeNQ+9U54+gKOtHio0Ra09rOyYdyJoYO/9rh+44CE/6vELGFfcMGU4bTq yyiekfjivCmFDeQ7dRZqX9pr0Ga01Hrjry/92vQHvXSqtpfg4uTun2q1+BYm8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890741; 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=ZENtM9nh/y3Q9XdbmnJrdPP5kdW5okqbBkGctfFASsU=; b=qZiRp/JRbmfBQIPC1u1HtWRtcyagfLBZFWDUy3uQ6Z2pXVM2B56YTkssHYdJh8WUb0Lgel Ig2ps1/mU48DBQ0LhRBOSO7R9auAhPqZiGsmsgLkOqnXPerBoBz8X8Q5ktTEv8lsr2cFYx 7gYzKIVGrpjWaMCKhcmmVem5NckIdLUOD0NqwMRw68+nQL7x2QjKC3AI6Z8dy1Jq2kEKPm 8s5LV/RvhYY9cnUWF2dNt5AOzttUF/dlzlS8jnBQdz27kz7cbtUF65tweBsD3LvUGzrS+m VOAGdDX3LYCcrktgQfkX8IsKGrPMPrz5V02a5CfNjKRG1nu6Zhru4ca3GclDuw== 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 4TZSNj4PYBzn4Y; Wed, 14 Feb 2024 06:05:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E65f5X084531; Wed, 14 Feb 2024 06:05:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E65fSA084528; Wed, 14 Feb 2024 06:05:41 GMT (envelope-from git) Date: Wed, 14 Feb 2024 06:05:41 GMT Message-Id: <202402140605.41E65fSA084528@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: c2a9cfc55046 - releng/14.0 - setusercontext(): Apply personal settings only on matching effective UID 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: c2a9cfc55046127176c74f86c24509ceb9da3551 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=c2a9cfc55046127176c74f86c24509ceb9da3551 commit c2a9cfc55046127176c74f86c24509ceb9da3551 Author: Olivier Certner AuthorDate: 2023-05-30 16:35:08 +0000 Commit: Gordon Tetlow CommitDate: 2024-02-14 05:35:46 +0000 setusercontext(): Apply personal settings only on matching effective UID Commit 35305a8dc114 (r211393) added a check on whether 'uid' was equal to getuid() before calling setlogincontext(). Doing so still allows a setuid program to apply resource limits and priorities specified in a user-controlled configuration file ('~/.login_conf') where a non-setuid program could not. Plug the hole by checking instead that the process' effective UID is the target one (which is likely what was meant in the initial commit). PR: 271750 Reviewed by: kib, des MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40351 Approved by: so Security: FreeBSD-EN-24:02.libutil (cherry picked from commit 892654fe9b5a9115815c30a423b8db47185aebbd) (cherry picked from commit ede6fd06726c02e9d2a5c47ac8cf80d8aaec5a70) --- lib/libutil/login_class.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index f561479690c1..596a5663bebf 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -546,7 +546,7 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in /* * Now, we repeat some of the above for the user's private entries */ - if (getuid() == uid && (lc = login_getuserclass(pwd)) != NULL) { + if (geteuid() == uid && (lc = login_getuserclass(pwd)) != NULL) { mymask = setlogincontext(lc, pwd, mymask, flags); login_close(lc); } From nobody Wed Feb 14 06:05:42 2024 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 4TZSNl06gTz5B56N; Wed, 14 Feb 2024 06:05:43 +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 4TZSNk6LXsz4RZ9; Wed, 14 Feb 2024 06:05:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890742; 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=B7L/Z/2DOvbKcloZWWN/OdOnj43QsHgXqCBbdPt1f0E=; b=O/SKXAqyZ43HHTCIyYCVAx6vsOIhM4hHyZBh7MeQ+mR8jb38BTyuViXKfrKpZhvMcWuTVx RRAx+vFVJE9g2QD2C5y6Nl1qWl44mz1/gQnCn5hUvZZBM1A9lZ8M3rMztlzSlEL6+IenEq 14Dnyply3iw1FLPBrTjVMteJ5Yfhw0FQoPCie6wAPkFILHeIP81n85RyoU178HGSTWgTNp pEMIvWKTdSrWNHhmQqvixaLMv0gJnNhYAiwgZn+kQEAoIPXofCs15DxqfRhlC7SqoK3QXT XoHgdht4fWL4J6EH4Y0jxyOPuRxkjX7Zu5cvnwafSEVYVsFv1J9zcVvK0ZE7fA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707890742; a=rsa-sha256; cv=none; b=haVVrKrtYwOB1cTGLSQB8ZYHXP8ABm6zIOvlDh0XElYqN29l3HUxE/gzRBiiQYGtVKI388 C2hohuIDR2kWsQ3w/dHC4GSZfVfjXH4AA+aYftr6z4DSN+viF4963U71kLO2DlzTcehXOY a762IuEAR7MRcZCbm6/4a3swU6aP1qjIRirL8pypjh6l9YkedZPBrT7H2R/WIvzAunAATi BcHzhj2KJm7kY5TN9oFg/FW/WwZAzEpbs10jInaAi+7umBhrj4AJLENJKJr6bf9Kk4nyuc /BCqPDcBAGEPhKt/qwgB0Ez383pkp7s2EyyH0maS3XBrGLWLCOaIcxvImM2tUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890742; 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=B7L/Z/2DOvbKcloZWWN/OdOnj43QsHgXqCBbdPt1f0E=; b=Mvg4Y7S/nWxqGPDbM01hYUU1mMic54AZR3O8V/F92Hn24T81TeC0LaLa/tkxu/3e6M97tf TD8s7Zui8VIzLddvK6EIEsdaF0o0etzdXebXfoGc3OrOOwiVRo5wIxl0e/IYYiuysH0hTC fnh/eI73xfGq+C6AVIna2FJZcoIj7oUODnJZbwIyHBFpXxnMLK90m+MslZcoSOGpM4sEXd v9lKIuFwM8RlQVx8tfmw4Fg5qkmkNoXGoROJOqLghGAyPscZhyN94nrc+gqjzN2io/g3/R hK1mDgmHsZ6B17S2zm3NgdFj2lrPn79eKD85gdkuWtqoJh/MBCeY85IG03mGlA== 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 4TZSNk5RL4zmKh; Wed, 14 Feb 2024 06:05:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E65gcO084586; Wed, 14 Feb 2024 06:05:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E65gf4084582; Wed, 14 Feb 2024 06:05:42 GMT (envelope-from git) Date: Wed, 14 Feb 2024 06:05:42 GMT Message-Id: <202402140605.41E65gf4084582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: bb06104dce0b - releng/14.0 - EVFILT_SIGNAL: do not use target process pointer on detach 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: bb06104dce0b2d471772fefe2ce5b7e651287479 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=bb06104dce0b2d471772fefe2ce5b7e651287479 commit bb06104dce0b2d471772fefe2ce5b7e651287479 Author: Konstantin Belousov AuthorDate: 2023-11-28 12:51:54 +0000 Commit: Gordon Tetlow CommitDate: 2024-02-14 05:37:56 +0000 EVFILT_SIGNAL: do not use target process pointer on detach PR: 275286 Approved by: so Security: FreeBSD-EN-24:03.kqueue (cherry picked from commit ed410b78edc53e17b5a3e93ace2adbeb3a734ae9) (cherry picked from commit 24346a2f777598272caffbd7e4fb6d85cafe64ed) --- sys/kern/kern_sig.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 964ad2398bd9..b7afc8b327ed 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -4291,9 +4291,7 @@ filt_sigattach(struct knote *kn) static void filt_sigdetach(struct knote *kn) { - struct proc *p = kn->kn_ptr.p_proc; - - knlist_remove(p->p_klist, kn, 0); + knlist_remove(kn->kn_knlist, kn, 0); } /* From nobody Wed Feb 14 06:05:47 2024 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 4TZSNq3kdvz5B53b; Wed, 14 Feb 2024 06:05: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 4TZSNq2mYKz4Rtf; Wed, 14 Feb 2024 06:05:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890747; 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=KQFbSc/c0grg3Kdqa9w/JBGM6A2OnPNTQ9CgeCwt0aQ=; b=DjjRYNqo+Os2KSIJLkMP3JOCA1P5dgsNwcjZXrCH446gotHy6UQIReHKUy6n4+rRhqEUpV IW6JdMN4OqA7dITm5Ey8sxAHrTRkvWZqq1NzHW25MGscQ7xXYt+xl1hVEJ3rIsq4CUbkIk NFJm4UoyoTJ7GeOJUlQ4rQeM4LabNVk34zSavKx1gLOsUKQyDbARNmJSSDuwKOrffKsMLp 0ySw9rKTInZ9FZR6L3IJbq7ZBMAzNfvBRZyIonCHS9oofiZzNiUgQumSPfgrA53YRJ9sun f9PuK2HpQ8l1F2ZDJi6nOxYV9ghHgttnPZ5MmYq0b1yXHN8bdNCwMVWvIoeBBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707890747; a=rsa-sha256; cv=none; b=bRG8NfeMlT4rRP+8CWsm72aLRzTUm4329cU40pdVfjCR0BkiwL9nf90SaFzUMlla+NBviZ 5XwBc/sYsnBRO9oTHO335g0igtsIXtZttOztn7naauekPdBANMkY9lst/jP3rPwCLlL2H1 Q7fDpwru2Epbnp1tCsNWLscv8auC/Z7xeysYy9vr4grbykAMfL93uLtbklItp/x4uyTrCL ZryxnL5mssAJOsvY4vCIgc9EhF7Qcibt6qwNaMFqeoUOv1778Q4bpY1R2073KcqCjnDE4v T6EFeCi/uGyBhOr9MsG6MFPvsiyfqSwSzBtbYBcNIU68XIpFPAHztLIgneSIaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890747; 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=KQFbSc/c0grg3Kdqa9w/JBGM6A2OnPNTQ9CgeCwt0aQ=; b=qfs6+EiPxf/fgd92Lj+gvauItsnoF1epJ7eBusEvFmU82PV1M+Fztoc7W01jjlghCITOxq oqbxRhBhjXyR2NiQ4DpI5V5QHiHyRp/sz/yWUT0SO1bc2d4wMd16JjsLMWzZbGV/FhcJo6 k2Dfb9SBIgRgc1mUJPTzWL2uEd89qEOdKqMDdxHoJ7/bMpYWZLeJYlitG5iiKiZ7G7C9cr tq8YpLS3N5fmijYzsBct9BzjeVcduxF6eTAWyjiEEg6ItfDWOlqxS1rrChaliK+uQ+2rvY H4NETn7y++mdXlt2hjKmOFdijfTg3RmQkOhdB0and41QAfLHpY2osFpFfcf+HQ== 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 4TZSNq1rBszn4g; Wed, 14 Feb 2024 06:05:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E65lnq084775; Wed, 14 Feb 2024 06:05:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E65lQL084772; Wed, 14 Feb 2024 06:05:47 GMT (envelope-from git) Date: Wed, 14 Feb 2024 06:05:47 GMT Message-Id: <202402140605.41E65lQL084772@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 9d0e3b306e38 - releng/14.0 - Add UPDATING entries and bump the branch version. 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 9d0e3b306e38adf94dc4f66a3e18b8deaf616917 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=9d0e3b306e38adf94dc4f66a3e18b8deaf616917 commit 9d0e3b306e38adf94dc4f66a3e18b8deaf616917 Author: Gordon Tetlow AuthorDate: 2024-02-14 06:00:27 +0000 Commit: Gordon Tetlow CommitDate: 2024-02-14 06:00:27 +0000 Add UPDATING entries and bump the branch version. Approved by: so --- UPDATING | 20 ++++++++++++++++++++ sys/conf/newvers.sh | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 30a245edf611..4e5a23c56f86 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,26 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20240214: + 14.0-RELEASE-p5 SA-24:01.bhyveload + SA-24:02.tty + EN-24:01.tzdata + EN-24:02.libutil + EN-24:03.kqueue + EN-24:04.ip + + Fix bhyveload host file access [SA-24:01.bhyveload] + + Fix jail information leak [SA-24:02.tty] + + Timezone database information update [EN-24:01.tzdata] + + Fix login class resource limits and CPU mask bypass [EN-24:02.libutil] + + Fix kqueue_close page fault on exit using rfork [EN-24:03.kqueue] + + Fix kernel panic triggered by bind [EN-24:04.ip] + 20231219: 14.0-RELEASE-p4 SA-23:19.openssh diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 4565e444ae39..7ab4dca5f67f 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.0" -BRANCH="RELEASE-p4" +BRANCH="RELEASE-p5" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Wed Feb 14 06:06:01 2024 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 4TZSP61YqKz5B53h; Wed, 14 Feb 2024 06:06:02 +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 4TZSP52rxSz4RZS; Wed, 14 Feb 2024 06:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890761; 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=rLt2Y1FTPVk/G3vwlbChJ+i1lGKNAHpq/K2BNvmgyBw=; b=TIM/20MCIAbeYMxKnKGM37rvJzQmFKLy+v4D4fcbZj6dx/EYIa7l5ism5UyskSeAofGXIW 0r7EXzvxQZqIJyPhGjI7BFleQDuqdyytfa9U7cuh8LZizqM0B9v22zfUcqvNK6PvAww5bk sjQEW5N8U30Ox0G864rqqCcM+0qhqp323vf2VcZmMFB/4dxVH0Eso5iqjguh1FiFd9qbxb 0St5Tf5rxgjWEdcUgFeU0cTj7/E/1gAEiROhzqtQPiXwjbM424Kq+JUwlEkaqe1FhYeFu6 7/zBY9HN5BNwjJLUFdTyw8zNoW/7IO9KXO4j2vfeSAovXNcBN35B1TyrkpLpwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707890761; a=rsa-sha256; cv=none; b=MYPWYzXVoc9V2msQiNL2IgDFUqyrye8Gc9RG9xK54FHe129928p2ZKEgF+k11kYqmmpIda qkWOhkvXMcUoe8Y7gjTOZJkjCQbHF5x/fY5Qv/DYrdEwhL54tCxDpbPGybx0dHTBCvNnjF wAnIuQiSZiDjupJSFibsVGaIQZWfP6qR9TRYUPGD6fryiUl7VRGWD4Z6GP726M+PbSbVKQ Ze7Vi/DuH939P/4wk2J94OweFfbJaJrnXJTtLSj4FT5hzUCvBvclQPvCLgpWVqTtvnTnnK xsiCioi/kTjqP10OQ1RqT6WSoVjZk8g/0GUxUnJjGc7pY+/FnTNn9fJc4MgJnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890761; 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=rLt2Y1FTPVk/G3vwlbChJ+i1lGKNAHpq/K2BNvmgyBw=; b=jSmC9Gv0E5VohmRTOrrZvXwlAybNnHtsKk1zIyUJXY79vGfIrp936yeIXXQiL5UDyMGIse /ybaJsltWAV+MIXSa9UCdbYI9G57/KCw9ZP79SlE5T/73Up3VOOT5JMRkLg3JaWOAgpknG 2f6RzhNqfBBKH4XKpmqmNDPrRjuS0AyLvm8ejDYF65sOGZnFQPSXtWL/qDQlTimxAf0eb2 RxpaPjA6kKtYxwB3hJhmlUesOLjH1nEHizejO+7rJ/n7FwVb7xyyty5afmwGbFTq8F2U3y CmI00GcVAdwsxSNUzbF0AY+JlvyFX00uH4gx6uEvd9VKJNDobjOqRpdUnGCqGg== 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 4TZSP51xkZzmtt; Wed, 14 Feb 2024 06:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E661ui085269; Wed, 14 Feb 2024 06:06:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E661ml085266; Wed, 14 Feb 2024 06:06:01 GMT (envelope-from git) Date: Wed, 14 Feb 2024 06:06:01 GMT Message-Id: <202402140606.41E661ml085266@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 17257e6e9a23 - releng/13.2 - jail: Fix information leak. 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 17257e6e9a233df4b18116b8cec98537f8bb0e20 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=17257e6e9a233df4b18116b8cec98537f8bb0e20 commit 17257e6e9a233df4b18116b8cec98537f8bb0e20 Author: Pawel Jakub Dawidek AuthorDate: 2024-01-17 17:43:55 +0000 Commit: Gordon Tetlow CommitDate: 2024-02-14 05:48:47 +0000 jail: Fix information leak. There is a lack of proper visibility checking in kern.ttys sysctl handler which leads to information leak about processes outside the current jail. This can be demonstrated with pstat -t: when called from within a jail, it will output all terminal devices including process groups and session leader process IDs: jail# pstat -t | grep pts/ | head LINE INQ CAN LIN LOW OUTQ USE LOW COL SESS PGID STATE pts/2 1920 0 0 192 1984 0 199 0 4132 27245 Oi pts/3 1920 0 0 192 1984 0 199 16 24890 33627 Oi pts/5 0 0 0 0 0 0 0 25 17758 0 G pts/16 0 0 0 0 0 0 0 0 52495 0 G pts/15 0 0 0 0 0 0 0 25 53446 0 G pts/17 0 0 0 0 0 0 0 6702 33230 0 G pts/19 0 0 0 0 0 0 0 14 1116 0 G pts/0 0 0 0 0 0 0 0 0 2241 0 G pts/23 0 0 0 0 0 0 0 20 15639 0 G pts/6 0 0 0 0 0 0 0 0 44062 93792 G jail# pstat -t | grep pts/ | wc -l 85 Devfs does the filtering correctly and we get only one entry: jail# ls /dev/pts/ 2 Approved by: mzaborski, secteam MFC after: 1 week Sponsored by: Fudo Security Approved by: so Security: FreeBSD-SA-24:02.tty Security: CVE-2024-25941 (cherry picked from commit f1d0a0cbecf2c688061f35adea85bfb29c9ec893) (cherry picked from commit a376108029a20f4ce51476d98f2483a7008ce7b5) (cherry picked from commit 41ac0b4ce00bae061164384f23356a4df6e0e695) (cherry picked from commit 9bff7ec98354a76c171905ce9530f85685725ee7) --- sys/kern/tty.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 8dfe5e93780f..22c4bb6dffce 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$"); #ifdef COMPAT_43TTY #include #endif /* COMPAT_43TTY */ +#include #include #include #include @@ -1309,9 +1310,11 @@ static int sysctl_kern_ttys(SYSCTL_HANDLER_ARGS) { unsigned long lsize; + struct thread *td = curthread; struct xtty *xtlist, *xt; struct tty *tp; - int error; + struct proc *p; + int cansee, error; sx_slock(&tty_list_sx); lsize = tty_list_count * sizeof(struct xtty); @@ -1324,13 +1327,28 @@ sysctl_kern_ttys(SYSCTL_HANDLER_ARGS) TAILQ_FOREACH(tp, &tty_list, t_list) { tty_lock(tp); - tty_to_xtty(tp, xt); + if (tp->t_session != NULL) { + p = tp->t_session->s_leader; + PROC_LOCK(p); + cansee = (p_cansee(td, p) == 0); + PROC_UNLOCK(p); + } else { + cansee = !jailed(td->td_ucred); + } + if (cansee) { + tty_to_xtty(tp, xt); + xt++; + } tty_unlock(tp); - xt++; } sx_sunlock(&tty_list_sx); - error = SYSCTL_OUT(req, xtlist, lsize); + lsize = (xt - xtlist) * sizeof(struct xtty); + if (lsize > 0) { + error = SYSCTL_OUT(req, xtlist, lsize); + } else { + error = 0; + } free(xtlist, M_TTY); return (error); } From nobody Wed Feb 14 06:05:57 2024 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 4TZSP21QGtz5B53f; Wed, 14 Feb 2024 06:05:58 +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 4TZSP20Sh3z4RTl; Wed, 14 Feb 2024 06:05:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890758; 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=wOk3Xerh9eJr9lSNDo49E3KtdlNxU1DToApYzCoAkLI=; b=PZEzVUT7GPW343ZVIGJdifqUxzsrtQ7M7j8GX3KilzbPyHpUCEKwzoeP5W0pzY5ZfdeF/U mmPmfQfNKC72w8Bbm/G6ubjij7hbVpSv/D0yIOnrfLSY8FNTJBRHxFbbwiir9/Fs/SeNT/ e27Wme6guvaHpdQ/vaIZOWarMFueOEfSiq1ErLIsLN4toGSgo5RTlBGB6c0ZCiPl1YAU+Q aJ29NeHmWlRH4yKz9JSMtgkUUsHqHLFaPVk4EI4QZHCbyKBteDfDI3RzZNL1IIm8I/WlwT FdA+0eTOai0B9j+YLfBmewwimFYIG7E8TBR6PXxa+ZMVvq0j51zFtWC/4r6cqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707890758; a=rsa-sha256; cv=none; b=ZM7Wxh8HJY63qYx7/rdEtZYG+uUXApDhrZEuHYvHLcz2qLxPxqG8VkbvmnguxRv6+mr5El AVvbrGDbGucZ/BdBT1EqWT6ulXclzIUiIBCrcXZDKL+bhLP6bOl51C/AA3BY6moSiXShQ8 WS+prC3FqSmqDV3Dm+T3XkNEcVj6yBoCWrgfYMr5Rw3zzjAleqDLpnOeKxZUG3uYnJKSqH OwJ/qLLXhEP3kTrjLh51nR6MrlTQlY7Ny9UmL3mq/0ahBebOxaLqEp+mMCUmF/18wLX6S9 wMSFXsFmZiQnuGlFRlNqThnZo5cDDF6MFARsCdX9NwiZKaH3a3YLhshBY7u48Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890758; 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=wOk3Xerh9eJr9lSNDo49E3KtdlNxU1DToApYzCoAkLI=; b=DgCF9cKgiNH3QQcysf782cFFVSjsTFJd5AoLaqapreaQbHCvSukE2jjlzFm1krc62e8cLb jpHSKZflKkm7U3ZtFyaHQsGZXt39XaLwqnQ62in8MGEg5vMG0lO+c08ckHj4Pm6cReHzET qtPP758KfskkhfncekUaYcGC8JzFYqUwDitbkbOhxQ+HpPwhKJfLIXMnYmYHl0kY53aejQ BfdEWktD7bqyUoi2YtcHZWQeRdige4eFiUpHgWcdmTx/ryo3fnJKBhmkAoM/71g2UbPO34 FlmOV3fCEaeYP/IleS6bsqQCwUGmV01Vl2X6jw/PMudf5YWqL293vuwCRYRQwQ== 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 4TZSP16dJqzmkp; Wed, 14 Feb 2024 06:05:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E65vCB085113; Wed, 14 Feb 2024 06:05:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E65vox085110; Wed, 14 Feb 2024 06:05:57 GMT (envelope-from git) Date: Wed, 14 Feb 2024 06:05:57 GMT Message-Id: <202402140605.41E65vox085110@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 9deb5ca77beb - releng/13.2 - setusercontext(): Apply personal settings only on matching effective UID 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 9deb5ca77bebd98f6b9d1f5640546dc0a15a8deb Auto-Submitted: auto-generated The branch releng/13.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=9deb5ca77bebd98f6b9d1f5640546dc0a15a8deb commit 9deb5ca77bebd98f6b9d1f5640546dc0a15a8deb Author: Olivier Certner AuthorDate: 2023-05-30 16:35:08 +0000 Commit: Gordon Tetlow CommitDate: 2024-02-14 05:36:19 +0000 setusercontext(): Apply personal settings only on matching effective UID Commit 35305a8dc114 (r211393) added a check on whether 'uid' was equal to getuid() before calling setlogincontext(). Doing so still allows a setuid program to apply resource limits and priorities specified in a user-controlled configuration file ('~/.login_conf') where a non-setuid program could not. Plug the hole by checking instead that the process' effective UID is the target one (which is likely what was meant in the initial commit). PR: 271750 Reviewed by: kib, des Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40351 Approved by: so Security: FreeBSD-EN-24:02.libutil (cherry picked from commit 892654fe9b5a9115815c30a423b8db47185aebbd) Approved by: markj (mentor) (cherry picked from commit 9fcf54d3750e379868e51e4aa7fbf696877ab2ed) --- lib/libutil/login_class.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index 38666bc8e3d3..3a4ef4ed6a55 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -548,7 +548,7 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in /* * Now, we repeat some of the above for the user's private entries */ - if (getuid() == uid && (lc = login_getuserclass(pwd)) != NULL) { + if (geteuid() == uid && (lc = login_getuserclass(pwd)) != NULL) { mymask = setlogincontext(lc, pwd, mymask, flags); login_close(lc); } From nobody Wed Feb 14 06:05:46 2024 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 4TZSNp2ljmz5B4yk; Wed, 14 Feb 2024 06:05:46 +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 4TZSNp1sLyz4Rwv; Wed, 14 Feb 2024 06:05:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890746; 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=iPV66TQNVU7Muzl38XgFpa+hWEJhhkHUT+FkfQgyuOQ=; b=kq1T+ZUBNKVbLmApqRNCC4cBfNemdAdyi71PsZSXSjIZuBV7HQfE2dF5EibXisP96qwMfb 1jVBuv0Ce8dok+Istuh/fUTCY/ZSlDqwQE1qV4FPBptAu7TsVd0lomL/ccZCGyk2MWV7ZV YryyAYYs6WDJHPa1x1faQbJ+ppHHw52zir7l+zPNqBYQaqhx9GulS+gZvQML/HiVmt20fL ihJnpHS/zdbW0AIBEOWyv08QW2tpjwFV+Frl0u5BhbwB7r9bbsLLzKYo3dVSrwYSbjpN5F my2chWFmT3NmgTESE4S2DS2auaHsNhoRZeBYucx3DAs+gJdMRiP+Y98BA+AOGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707890746; a=rsa-sha256; cv=none; b=kjZq2dl0Eyw1MGVdhphWG2u7QX+kaoRb6M5mQmwcJlR+oYbI6yh5faj/ScatFphHnj5nlE +unv0DHGWAaAKlGmrJcS5x7kR+N1aoqW86zNVTJzOpQ68PDUIbxmdSs2xs4AzuT9tm8Lq9 g5fHbBlWVWRqHzo7nDzUhSOwC5H+DNwCfHV/bqUgxRlPuj+FpmWbe0bHb5gtm1xV3XWHI5 LpRdQuuTEBJPcEbdSl9u6sUN+I8FBb6iv9nuzCH7juaqEPBOyS5VZyFAGJlunLPdGHqmow 4Ttfj8u+ZqGhmK/lftxW0XLwJfZ68cGM0Bm0l/6IeNXxLeZf2LvP1HaHcWL2Og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890746; 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=iPV66TQNVU7Muzl38XgFpa+hWEJhhkHUT+FkfQgyuOQ=; b=K+fcbhIXy4eTOh+TCXlTaNNKaeBsWTrc3yfukgZgyK5MIG4TRES7U++xslZBWfRBqujB2T mLYc8T9/oqb4O2fUJzrNleDdtyIxNZGZrymCYEdGX8KxqNtOBJlTrLw6un1YepTVHl0O8D Kl9kbHX4o/nJxSFjPNgcD/e50JWxiHZhm6xUpqvePCAA6kGcYo+Ex8xB9UZD9modKZHqVp NTqsyEBhatsgzP/+m93WEpiBASSwM0Em/TnCbiqUVIbvj5cE7LgJjC5ZeRqDYSsh0K1Bqo GYpEARYi3iWDPMD7XiqtYg11C09JXaJSLbqa9GAprtYcGzFo7MFhqsa+V1YlFQ== 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 4TZSNp0qTpzmtp; Wed, 14 Feb 2024 06:05:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E65kb4084723; Wed, 14 Feb 2024 06:05:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E65kLu084720; Wed, 14 Feb 2024 06:05:46 GMT (envelope-from git) Date: Wed, 14 Feb 2024 06:05:46 GMT Message-Id: <202402140605.41E65kLu084720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 4d354159d150 - releng/14.0 - jail: Fix information leak. 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 4d354159d150789716d529cf5201c6e1e9d28106 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=4d354159d150789716d529cf5201c6e1e9d28106 commit 4d354159d150789716d529cf5201c6e1e9d28106 Author: Pawel Jakub Dawidek AuthorDate: 2024-01-17 17:43:55 +0000 Commit: Gordon Tetlow CommitDate: 2024-02-14 05:53:05 +0000 jail: Fix information leak. There is a lack of proper visibility checking in kern.ttys sysctl handler which leads to information leak about processes outside the current jail. This can be demonstrated with pstat -t: when called from within a jail, it will output all terminal devices including process groups and session leader process IDs: jail# pstat -t | grep pts/ | head LINE INQ CAN LIN LOW OUTQ USE LOW COL SESS PGID STATE pts/2 1920 0 0 192 1984 0 199 0 4132 27245 Oi pts/3 1920 0 0 192 1984 0 199 16 24890 33627 Oi pts/5 0 0 0 0 0 0 0 25 17758 0 G pts/16 0 0 0 0 0 0 0 0 52495 0 G pts/15 0 0 0 0 0 0 0 25 53446 0 G pts/17 0 0 0 0 0 0 0 6702 33230 0 G pts/19 0 0 0 0 0 0 0 14 1116 0 G pts/0 0 0 0 0 0 0 0 0 2241 0 G pts/23 0 0 0 0 0 0 0 20 15639 0 G pts/6 0 0 0 0 0 0 0 0 44062 93792 G jail# pstat -t | grep pts/ | wc -l 85 Devfs does the filtering correctly and we get only one entry: jail# ls /dev/pts/ 2 Approved by: mzaborski, secteam MFC after: 1 week Sponsored by: Fudo Security Approved by: so Security: FreeBSD-SA-24:02.tty Security: CVE-2024-25941 (cherry picked from commit f1d0a0cbecf2c688061f35adea85bfb29c9ec893) (cherry picked from commit a376108029a20f4ce51476d98f2483a7008ce7b5) (cherry picked from commit 41ac0b4ce00bae061164384f23356a4df6e0e695) (cherry picked from commit 215bb03edc541634ec3fd9b01b55d7396b14d9cf) --- sys/kern/tty.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 620233947410..673904570b86 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -44,6 +44,7 @@ #ifdef COMPAT_43TTY #include #endif /* COMPAT_43TTY */ +#include #include #include #include @@ -1307,9 +1308,11 @@ static int sysctl_kern_ttys(SYSCTL_HANDLER_ARGS) { unsigned long lsize; + struct thread *td = curthread; struct xtty *xtlist, *xt; struct tty *tp; - int error; + struct proc *p; + int cansee, error; sx_slock(&tty_list_sx); lsize = tty_list_count * sizeof(struct xtty); @@ -1322,13 +1325,28 @@ sysctl_kern_ttys(SYSCTL_HANDLER_ARGS) TAILQ_FOREACH(tp, &tty_list, t_list) { tty_lock(tp); - tty_to_xtty(tp, xt); + if (tp->t_session != NULL) { + p = tp->t_session->s_leader; + PROC_LOCK(p); + cansee = (p_cansee(td, p) == 0); + PROC_UNLOCK(p); + } else { + cansee = !jailed(td->td_ucred); + } + if (cansee) { + tty_to_xtty(tp, xt); + xt++; + } tty_unlock(tp); - xt++; } sx_sunlock(&tty_list_sx); - error = SYSCTL_OUT(req, xtlist, lsize); + lsize = (xt - xtlist) * sizeof(struct xtty); + if (lsize > 0) { + error = SYSCTL_OUT(req, xtlist, lsize); + } else { + error = 0; + } free(xtlist, M_TTY); return (error); } From nobody Wed Feb 14 06:05:58 2024 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 4TZSP32QWLz5B56P; Wed, 14 Feb 2024 06:05:59 +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 4TZSP31Cc4z4RrC; Wed, 14 Feb 2024 06:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890759; 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=bf95asAncuiwaojBEM/DwGFCVAHbzBHKPsnMeCyDw8o=; b=UpjHMSfE7XmfekIEoqEoe4lwYxeEpW4RBgMTLX34gcbfomrkav1yLaSk/LNx9wHschzurN iS59qcRbp6Y1nVOWStNzGQmMN+QBLDGHG8WmINQte0CQRnSd1bTE9+PLpxS9xZAVkAKagJ atdrAOQZ9/ZP0yKg5P0tFIAMXWXTlH7vW9SCrljDWm2qgwD1/By1mXoBaCYVjZynZLWRjI A9KoRhAn0TYukArDKX02Nku5kZXV50OFrVoyAigwvZAq3VZAaT2XnASztBVI4AtLpMRQrk OlxWXF1abpoMjWb072WgRbUZht7zIDzqHI8/v+UA0D15P8mFxJ8qkAsNTQYzhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707890759; a=rsa-sha256; cv=none; b=ZcQeP22kmcyZUQEU9LV0u3+O8Oui2Afi0IlPTC9QxfLJzb+XLNCzotlwgqY5Rg3gV9Ruer +uSxd2lqVlqVJLW0vf2vRDSVob+KJmGvJ3Nt3KNGlpZMX2FfoYbL1p8WE5X+NEMl9nWbco fh3a/+srDMlKsohH9ZZjXkzd5GY9ZHU+88Sq2TdE1qSAOu77pLhVYQKKwy0fD0fMHZyZSO j9J1+GSF6tjauSDwrtJpv3j8wtYIG4Nr1IDDnLFzlNJTBwXIJ5OJdZ83PwLg/drSBXSmtP f2ul0wPt8ZrbLhd7qeeg9hbMUTW1AWdgY5X6vCAqVaC6huWkvM1B2eYrB6Cvmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890759; 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=bf95asAncuiwaojBEM/DwGFCVAHbzBHKPsnMeCyDw8o=; b=e33v0zrA3bnqrzn97w73ylNsDOEdGSv0WNBPlSxfXmfOnOwX7FMgaxxZn5bPH2ZqtZNbf1 a7GpAOTcoBXP4b/+NV8zJnQSEdx05rkNnsXEoIPSMAHn+QMjlU3xmsVoMB9cESE3Zr5/VG z/hroC8gsqXdgcqMQQiJsqyqgnM3x9wLrgrCz3NQrgygZLcNuieI+4sg48xZZCzNcly8BK JxhUX/BUIbr7uhsOVydrGMaE5MnrqMPMdA4hXNY08oTjUyRWLB6VMdyPWDGB/umHh3yq8G JKl/5IQleGxEqTBxW//q4H7GjaxuVO5Oy45X/1uHvg/KumH9UexUiO9E/HicgQ== 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 4TZSP30Jk3zmtr; Wed, 14 Feb 2024 06:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E65wrc085173; Wed, 14 Feb 2024 06:05:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E65wSH085170; Wed, 14 Feb 2024 06:05:58 GMT (envelope-from git) Date: Wed, 14 Feb 2024 06:05:58 GMT Message-Id: <202402140605.41E65wSH085170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 154dedade465 - releng/13.2 - EVFILT_SIGNAL: do not use target process pointer on detach 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 154dedade4654516dfd3737ae56d5b3e3721029a Auto-Submitted: auto-generated The branch releng/13.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=154dedade4654516dfd3737ae56d5b3e3721029a commit 154dedade4654516dfd3737ae56d5b3e3721029a Author: Konstantin Belousov AuthorDate: 2023-11-28 12:51:54 +0000 Commit: Gordon Tetlow CommitDate: 2024-02-14 05:37:16 +0000 EVFILT_SIGNAL: do not use target process pointer on detach PR: 275286 Approved by: so Security: FreeBSD-EN-24:03.kqueue (cherry picked from commit ed410b78edc53e17b5a3e93ace2adbeb3a734ae9) (cherry picked from commit 55e91944998c128d74b94b9b48a04ef41ff5e9d0) --- sys/kern/kern_sig.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 63d73cf7a909..067e5a0aaa05 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -4209,9 +4209,7 @@ filt_sigattach(struct knote *kn) static void filt_sigdetach(struct knote *kn) { - struct proc *p = kn->kn_ptr.p_proc; - - knlist_remove(p->p_klist, kn, 0); + knlist_remove(kn->kn_knlist, kn, 0); } /* From nobody Wed Feb 14 06:06:00 2024 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 4TZSP42wM4z5B53g; Wed, 14 Feb 2024 06:06:00 +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 4TZSP426lrz4Rx4; Wed, 14 Feb 2024 06:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890760; 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=nA0poWkLUPH8cI2K4uny/Dr0K6L90X9K+wva4CibnFM=; b=TPHLUm4u2RVzo15Ht5aT/X/SZFKc8PbKvnEYeeNdodELl4WUESkH0s6dniQTpMi5zjZf9b Uqa+agPoKv1MP0etrk2XetCa6uB0ZHWKleoEBb+cvXHJOc+8h9pxQLi9Hjw0Ca/dXYBsF+ oQ15lYdd7eQ/3aOfnvf7rDId0F/D3BT9SmUp3aP5vQaHbNEAgdQOPLj5P1pWSkbBH9Dcjo eAkEJAinN7KvvV3XJEqxCp4ihb+JqkeslQa6A9JJpohI4zqiS36Od4+s0Wmf8vhwCrBvkY qzE/172bQ/DQxoJfOqinvrkhbiganBTCN5MRhSDGtt5SzmcR4l7D6KRpFnpISw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707890760; a=rsa-sha256; cv=none; b=eknDiTVSSUJ2bf8e5WmMwCZEZcOjMV6P+ilwj/p+oxB0N7cePD6UjoLsB+N/jK1TI1F3bq HtE3OLnrnW+fvpSSkpzpi+DWi4g5PNfA4niU3+BVoAwytpY2j4JRDR2AJrNoR0eSQ+0auH QlPYd4lBzoRiQrGCR4KrS6gUpLq7k8BiaN4JBEfcI7biNMwTprlzvsR0xvy4olBB48td82 1DwUU7Ogyka9ZkwtW4bnfJl7WqjpCy655aPqVZNllDUTCqnN9k2o0bdiIcb7L189jH0Yk7 M4hak6PAJyPhaSWv1GWS5j4oagirtwvL5415sDEPsfUjDlip1pEse/Z7b44lhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890760; 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=nA0poWkLUPH8cI2K4uny/Dr0K6L90X9K+wva4CibnFM=; b=RITgDOtttZ0ollmvFo2hN30G8y23MuM0xRijOvcH5mc6NzVf33dzHDjkNm5v63mKc4gq/C ZZWXgPu/yGqZf/sT/D6LCejZcERGS23jaysWj5r9U0ktE7RkBatiYp7FHuyQMGUaoEk1xW Qb9NBGI0TDW63LXpiiJjqTNMEvfoefZx9DassyFVQOR3KKS0v/N7GWhvYNw3svgsMf134q gu6yc22haYXyygWUjUkdlkD94vk1nXYByyktTLw5k0dreN2e+rtFO6gEMdL2mTWRDWTAWR eGkwLaMnYmWDnoVypxSrZGJgyw0XnBipcBCNpewFXjwvHUqdOjFcGgUi4xBZPw== 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 4TZSP41Ckyzmts; Wed, 14 Feb 2024 06:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E660qN085230; Wed, 14 Feb 2024 06:06:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E6606U085227; Wed, 14 Feb 2024 06:06:00 GMT (envelope-from git) Date: Wed, 14 Feb 2024 06:06:00 GMT Message-Id: <202402140606.41E6606U085227@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 48598b1670ce - releng/13.2 - bhyveload: use a dirfd to support -h 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 48598b1670ce542419420f969d5a5bd47167eb17 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=48598b1670ce542419420f969d5a5bd47167eb17 commit 48598b1670ce542419420f969d5a5bd47167eb17 Author: Kyle Evans AuthorDate: 2024-01-03 22:17:59 +0000 Commit: Gordon Tetlow CommitDate: 2024-02-14 05:43:15 +0000 bhyveload: use a dirfd to support -h Don't allow lookups from the loader scripts, which in rare cases may be in guest control depending on the setup, to leave the specified host root. Open the root dir and strictly do RESOLVE_BENEATH lookups from there. cb_open() has been restructured a bit to work nicely with this, using fdopendir() in the directory case and just using the fd we already opened in the regular file case. hostbase_open() was split out to provide an obvious place to apply rights(4) if that's something we care to do. Reviewed by: allanjude (earlier version), markj Approved by: so Security: FreeBSD-SA-24:01.bhyveload Security: CVE-2024-25940 (cherry picked from commit 6779d44bd878e3cf4723f7386b11da6508ab5431) (cherry picked from commit 78345dbd7a004e0a6d1b717e7dbc758ae67ca293) --- usr.sbin/bhyveload/bhyveload.c | 85 ++++++++++++++++++++++++++++-------------- 1 file changed, 58 insertions(+), 27 deletions(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 1a24b5f0044a..4f15771b514d 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -67,6 +67,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -93,11 +94,11 @@ __FBSDID("$FreeBSD$"); #define NDISKS 32 -static char *host_base; static struct termios term, oldterm; static int disk_fd[NDISKS]; static int ndisks; static int consin_fd, consout_fd; +static int hostbase_fd = -1; static int need_reinit; @@ -163,42 +164,61 @@ static int cb_open(void *arg, const char *filename, void **hp) { struct cb_file *cf; - char path[PATH_MAX]; + struct stat sb; + int fd, flags; - if (!host_base) + cf = NULL; + fd = -1; + flags = O_RDONLY | O_RESOLVE_BENEATH; + if (hostbase_fd == -1) return (ENOENT); - strlcpy(path, host_base, PATH_MAX); - if (path[strlen(path) - 1] == '/') - path[strlen(path) - 1] = 0; - strlcat(path, filename, PATH_MAX); - cf = malloc(sizeof(struct cb_file)); - if (stat(path, &cf->cf_stat) < 0) { - free(cf); + /* Absolute paths are relative to our hostbase, chop off leading /. */ + if (filename[0] == '/') + filename++; + + /* Lookup of /, use . instead. */ + if (filename[0] == '\0') + filename = "."; + + if (fstatat(hostbase_fd, filename, &sb, AT_RESOLVE_BENEATH) < 0) return (errno); + + if (!S_ISDIR(sb.st_mode) && !S_ISREG(sb.st_mode)) + return (EINVAL); + + if (S_ISDIR(sb.st_mode)) + flags |= O_DIRECTORY; + + /* May be opening the root dir */ + fd = openat(hostbase_fd, filename, flags); + if (fd < 0) + return (errno); + + cf = malloc(sizeof(struct cb_file)); + if (cf == NULL) { + close(fd); + return (ENOMEM); } + cf->cf_stat = sb; cf->cf_size = cf->cf_stat.st_size; + if (S_ISDIR(cf->cf_stat.st_mode)) { cf->cf_isdir = 1; - cf->cf_u.dir = opendir(path); - if (!cf->cf_u.dir) - goto out; - *hp = cf; - return (0); - } - if (S_ISREG(cf->cf_stat.st_mode)) { + cf->cf_u.dir = fdopendir(fd); + if (cf->cf_u.dir == NULL) { + close(fd); + free(cf); + return (ENOMEM); + } + } else { + assert(S_ISREG(cf->cf_stat.st_mode)); cf->cf_isdir = 0; - cf->cf_u.fd = open(path, O_RDONLY); - if (cf->cf_u.fd < 0) - goto out; - *hp = cf; - return (0); + cf->cf_u.fd = fd; } - -out: - free(cf); - return (EINVAL); + *hp = cf; + return (0); } static int @@ -712,6 +732,17 @@ usage(void) exit(1); } +static void +hostbase_open(const char *base) +{ + + if (hostbase_fd != -1) + close(hostbase_fd); + hostbase_fd = open(base, O_DIRECTORY | O_PATH); + if (hostbase_fd == -1) + err(EX_OSERR, "open"); +} + int main(int argc, char** argv) { @@ -746,7 +777,7 @@ main(int argc, char** argv) break; case 'h': - host_base = optarg; + hostbase_open(optarg); break; case 'l': From nobody Wed Feb 14 06:05:44 2024 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 4TZSNn1qWtz5B4wm; Wed, 14 Feb 2024 06:05:45 +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 4TZSNn0kvjz4RX2; Wed, 14 Feb 2024 06:05:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890745; 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=UVdt4fil3sboSgYb7oOMGbDUCHfGNKIc/I0oNXqsIrc=; b=ba/MOFqv1HYtCO60DMSF8BMWVxYMopgqMAElWOigg4vzCvxJxvr8H9sU7obqq0R6pZPula JSd9nAHhGOPSdiatRCT9liG2m9T6TpgYp9VsvE505tomvvirBfK4r+I6UbHMnW8jPiGMI1 UJWPE99q3TUZbrxdS7eu9Y8Ee6KoHSgbMOkLEL2XuAet9+QHyeL3S76HPBnlSu3qr6T97X WWZBcdGjaS9QquVolcTUQnutUDIPhHGVXtcZDDE8mfpolJLbIatRfqqW7NEcSX6cplalUU V1liqwxy3kUb7/feiWnBTWjU24zYnt86kMoWQWnr92oh5xgRex4kAKr+zaEjEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707890745; a=rsa-sha256; cv=none; b=schPViaaVV8AyQ2j+GuNVvXVFXTgQ8gtZXWmCt3HwmNBKdrrxSj5osNtYRmEizdFUJdwsQ 2UDuHR6d8TCTtXRuDYhE2iS11cvkvi1rmSZEgCUBpLVLgtc3xnyRUbGcUm2Njf63qtxiRf UiiA0W3YmpFhCwhqD6fGxbUUm2hsvk8Lg6a2MJuboQCirxclAdG8KgFJkOxBfrK8a8GAAZ J6GvLEoNi2ovBJsr9I3ZbFe3zuI6r28q2GUlY36KpWi1VQ1ZIvkRarJzJ/BmprGm7yQE0e m0U1KQlAUu2Bj8s+nJJ8z3+Fu5DDxyjAjkL0JJPhm5tqvRy/96sLuDaobJGWvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890745; 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=UVdt4fil3sboSgYb7oOMGbDUCHfGNKIc/I0oNXqsIrc=; b=O+9r4EN/DfBR74WwaCLbYGZA1xymRunpE/G5pjCnK+MsW6IpYP84oXePsbaB9GhYo8unoq Yi3+CJHgotnyGJ8BwjYujmMjzwm7o/oB4uS1WM8CiGwnQ0ugbMzfsQeeotmcNwgemPN8r+ bhByLxzK4ZAjw5X8y/maR8wkTHQkjWIhKL1zee1MFwklPFlyYgLTvFDhdD6exrKC0pon63 g5i2AXKELR05IdvzHMdcZzK9dBz/Z9Y2GrmMku5UO9IIN5YnthepP+VoCqAxdFEkwbXusK g1sXZizcFwJWBb6B+HiBIAcikmjn8iG5ahAH2xCEJ+sdJnjSrYxv7iiKDYs/Tg== 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 4TZSNm6yYNzmNW; Wed, 14 Feb 2024 06:05:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E65iEG084683; Wed, 14 Feb 2024 06:05:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E65ivI084681; Wed, 14 Feb 2024 06:05:44 GMT (envelope-from git) Date: Wed, 14 Feb 2024 06:05:44 GMT Message-Id: <202402140605.41E65ivI084681@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: f5bb597829e1 - releng/14.0 - bhyveload: use a dirfd to support -h 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: f5bb597829e13942648c4ab5726f1ff924e33e9f Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=f5bb597829e13942648c4ab5726f1ff924e33e9f commit f5bb597829e13942648c4ab5726f1ff924e33e9f Author: Kyle Evans AuthorDate: 2024-01-03 22:17:59 +0000 Commit: Gordon Tetlow CommitDate: 2024-02-14 05:41:59 +0000 bhyveload: use a dirfd to support -h Don't allow lookups from the loader scripts, which in rare cases may be in guest control depending on the setup, to leave the specified host root. Open the root dir and strictly do RESOLVE_BENEATH lookups from there. cb_open() has been restructured a bit to work nicely with this, using fdopendir() in the directory case and just using the fd we already opened in the regular file case. hostbase_open() was split out to provide an obvious place to apply rights(4) if that's something we care to do. Reviewed by: allanjude (earlier version), markj Approved by: so Security: FreeBSD-SA-24:01.bhyveload Security: CVE-2024-25940 (cherry picked from commit 6779d44bd878e3cf4723f7386b11da6508ab5431) (cherry picked from commit 426b28fdf700bcd8c05b25665da34f806b27b1bb) --- usr.sbin/bhyveload/bhyveload.c | 84 ++++++++++++++++++++++++++++-------------- 1 file changed, 57 insertions(+), 27 deletions(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 6b2633cac288..4c1dbd583e1f 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -88,11 +88,11 @@ #define NDISKS 32 -static char *host_base; static struct termios term, oldterm; static int disk_fd[NDISKS]; static int ndisks; static int consin_fd, consout_fd; +static int hostbase_fd = -1; static int need_reinit; @@ -159,42 +159,61 @@ static int cb_open(void *arg __unused, const char *filename, void **hp) { struct cb_file *cf; - char path[PATH_MAX]; + struct stat sb; + int fd, flags; - if (!host_base) + cf = NULL; + fd = -1; + flags = O_RDONLY | O_RESOLVE_BENEATH; + if (hostbase_fd == -1) return (ENOENT); - strlcpy(path, host_base, PATH_MAX); - if (path[strlen(path) - 1] == '/') - path[strlen(path) - 1] = 0; - strlcat(path, filename, PATH_MAX); - cf = malloc(sizeof(struct cb_file)); - if (stat(path, &cf->cf_stat) < 0) { - free(cf); + /* Absolute paths are relative to our hostbase, chop off leading /. */ + if (filename[0] == '/') + filename++; + + /* Lookup of /, use . instead. */ + if (filename[0] == '\0') + filename = "."; + + if (fstatat(hostbase_fd, filename, &sb, AT_RESOLVE_BENEATH) < 0) return (errno); + + if (!S_ISDIR(sb.st_mode) && !S_ISREG(sb.st_mode)) + return (EINVAL); + + if (S_ISDIR(sb.st_mode)) + flags |= O_DIRECTORY; + + /* May be opening the root dir */ + fd = openat(hostbase_fd, filename, flags); + if (fd < 0) + return (errno); + + cf = malloc(sizeof(struct cb_file)); + if (cf == NULL) { + close(fd); + return (ENOMEM); } + cf->cf_stat = sb; cf->cf_size = cf->cf_stat.st_size; + if (S_ISDIR(cf->cf_stat.st_mode)) { cf->cf_isdir = 1; - cf->cf_u.dir = opendir(path); - if (!cf->cf_u.dir) - goto out; - *hp = cf; - return (0); - } - if (S_ISREG(cf->cf_stat.st_mode)) { + cf->cf_u.dir = fdopendir(fd); + if (cf->cf_u.dir == NULL) { + close(fd); + free(cf); + return (ENOMEM); + } + } else { + assert(S_ISREG(cf->cf_stat.st_mode)); cf->cf_isdir = 0; - cf->cf_u.fd = open(path, O_RDONLY); - if (cf->cf_u.fd < 0) - goto out; - *hp = cf; - return (0); + cf->cf_u.fd = fd; } - -out: - free(cf); - return (EINVAL); + *hp = cf; + return (0); } static int @@ -714,6 +733,17 @@ usage(void) exit(1); } +static void +hostbase_open(const char *base) +{ + + if (hostbase_fd != -1) + close(hostbase_fd); + hostbase_fd = open(base, O_DIRECTORY | O_PATH); + if (hostbase_fd == -1) + err(EX_OSERR, "open"); +} + int main(int argc, char** argv) { @@ -748,7 +778,7 @@ main(int argc, char** argv) break; case 'h': - host_base = optarg; + hostbase_open(optarg); break; case 'l': From nobody Wed Feb 14 06:05:55 2024 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 4TZSNz6pM9z5B4tX; Wed, 14 Feb 2024 06:05:55 +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 4TZSNz5YRdz4RTk; Wed, 14 Feb 2024 06:05:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890755; 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=nB4eyCSUoXRzsIxpnpNfTTmSBAweIT7Ma7QvXCT7cLo=; b=YENmIsuhqa0U8kL7YSSroCWhNq79UEg6pePhNe/HBxvS5Ml4BZxThT4aG89iphHndwHkx0 cpTBIDdmtBK5VqADLhSkcGT2CHQtZv9crONBcGLnVXHZmSx8Ks7fjvf9HeEw4Pu04y5MZl ko5UqgHIJsbbhW97j55gIZO03yWz+UwcuHZr/NcSlkCIC5Xq6rJpTa3wP/q9TlVmHZCSOf H2XUPucL7tA9xt2BNUnDoPwEsTe0kmUvSBnTT1DgC3RLJdr5jXAZ2Qehx65t6DNRYdFM1g ao3vGluBDo5SUT03mdstt6+naI+6MDMlMfrJwL0Txrom3X+ReSxO+zl4xR1ssw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707890755; a=rsa-sha256; cv=none; b=UKvu4DSXCpZh21W9wIqExlFe39VvhDdoGYCNGpGfWzVWirMB//GIiOSJwTVm9Ka0pnVdXw zJ5ycQZ9YR6l8gkd+K7zmtBuIv1ckMabj5TbDO0TEEGX6X6KdU85lCJo44V4uBEUIOT5wP n1bIgC9Rogk/eI7+EYyz6fzlwgrhf2638FP0pyvRjyL9n9EX14ES62tMgtiyUkwATtKR78 QHOlUWcx2eM9ri/T/tM2p4mQ9kxb1g0LnhcaasratyBA74trMo9D4Ir4RV5SdzK2PmKvBt ebQuCaav5XUWcronnFR59TEIoOVhZoH52KyhXyVzjAl0NpOn8E1jB8dvbGfRPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890755; 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=nB4eyCSUoXRzsIxpnpNfTTmSBAweIT7Ma7QvXCT7cLo=; b=O9j6tnCeBQHtC/ou7/ouY/DV6rIHE8/grhSsAesbuQ5KZTYx9tiONVs5XdTsTHHUiq1R32 HGRbdUZRLd3n8ijbRd19ReF0OzWdaROGHdi8DrbtDjZ1KDqOEDpovFjGJtdd49PjPishoK I7pnxasBsC4bqnsgblIoSEt90Kgr/Kk8r4BlIRtKoMMtaOUogDwpehC+0wj5b2/G63MxBj gAxFzRO/svvxfafJ+8lVTL7EmImabk45Wm2rSDyqznFZLqLvRHNMA4pyM4v11MUdWZmtHl KIm3If3Kxe2YJLc6tyP/CozbzS7E1NVptStaePG7Uds5BATsaRGaad1BNqescw== 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 4TZSNz4bqjzmQj; Wed, 14 Feb 2024 06:05:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E65tXU085020; Wed, 14 Feb 2024 06:05:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E65tiQ085017; Wed, 14 Feb 2024 06:05:55 GMT (envelope-from git) Date: Wed, 14 Feb 2024 06:05:55 GMT Message-Id: <202402140605.41E65tiQ085017@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 922f62fc240f - releng/13.2 - contrib/tzdata: import tzdata 2023d 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 922f62fc240f99868c68a618c264972a40994680 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=922f62fc240f99868c68a618c264972a40994680 commit 922f62fc240f99868c68a618c264972a40994680 Author: Philip Paeps AuthorDate: 2023-12-23 01:51:01 +0000 Commit: Gordon Tetlow CommitDate: 2024-02-14 05:34:55 +0000 contrib/tzdata: import tzdata 2023d Changes: https://github.com/eggert/tz/blob/2023d/NEWS Approved by: so Security: FreeBSD-EN-24:01.tzdata (cherry picked from commit eebb9c2caea1584773ae4cec311cee1eea5b1655) (cherry picked from commit 436f43d41cc78aa475015b4618f8787e1ed10000) --- contrib/tzdata/Makefile | 209 ++++++++++++++++++--------- contrib/tzdata/NEWS | 125 ++++++++++++++-- contrib/tzdata/README | 19 +-- contrib/tzdata/africa | 7 - contrib/tzdata/antarctica | 57 +++++++- contrib/tzdata/asia | 6 +- contrib/tzdata/australasia | 8 +- contrib/tzdata/backward | 1 - contrib/tzdata/backzone | 29 ---- contrib/tzdata/checknow.awk | 54 +++++++ contrib/tzdata/checktab.awk | 7 +- contrib/tzdata/europe | 29 +++- contrib/tzdata/leap-seconds.list | 8 +- contrib/tzdata/leapseconds | 8 +- contrib/tzdata/northamerica | 2 +- contrib/tzdata/southamerica | 6 + contrib/tzdata/version | 2 +- contrib/tzdata/zone.tab | 24 ++-- contrib/tzdata/zone1970.tab | 29 ++-- contrib/tzdata/zonenow.tab | 301 +++++++++++++++++++++++++++++++++++++++ 20 files changed, 763 insertions(+), 168 deletions(-) diff --git a/contrib/tzdata/Makefile b/contrib/tzdata/Makefile index 6edc73cc6ffb..4e45f93b915c 100644 --- a/contrib/tzdata/Makefile +++ b/contrib/tzdata/Makefile @@ -1,7 +1,25 @@ # Make and install tzdb code and data. - # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. +# Request POSIX conformance; this must be the first non-comment line. +.POSIX: +# On older platforms you may need to scrounge for a POSIX-conforming 'make'. +# For example, on Solaris 10 (2005), use /usr/sfw/bin/gmake or +# /usr/xpg4/bin/make, not /usr/ccs/bin/make. + +# To affect how this Makefile works, you can run a shell script like this: +# +# #!/bin/sh +# make CC='gcc -std=gnu11' "$@" +# +# This example script is appropriate for a pre-2017 GNU/Linux system +# where a non-default setting is needed to support this package's use of C99. +# +# Alternatively, you can simply edit this Makefile to tailor the following +# macro definitions. + +############################################################################### +# Start of macros that one plausibly might want to tailor. # Package name for the code distribution. PACKAGE= tzcode @@ -191,8 +209,9 @@ UTF8_LOCALE= en_US.utf8 # On some hosts, this should have -lintl unless CFLAGS has -DHAVE_GETTEXT=0. LDLIBS= -# Add the following to the end of the "CFLAGS=" line as needed to override -# defaults specified in the source code. "-DFOO" is equivalent to "-DFOO=1". +# Add the following to an uncommented "CFLAGS=" line as needed +# to override defaults specified in the source code or by the system. +# "-DFOO" is equivalent to "-DFOO=1". # -DDEPRECATE_TWO_DIGIT_YEARS for optional runtime warnings about strftime # formats that generate only the last two digits of year numbers # -DEPOCH_LOCAL if the 'time' function returns local time not UT @@ -234,11 +253,16 @@ LDLIBS= # -DHAVE_UNISTD_H=0 if does not work* # -DHAVE_UTMPX_H=0 if does not work* # -Dlocale_t=XXX if your system uses XXX instead of locale_t -# -DPORT_TO_C89 if tzcode should also run on C89 platforms+ +# -DPORT_TO_C89 if tzcode should also run on mostly-C89 platforms+ +# Typically it is better to use a later standard. For example, +# with GCC 4.9.4 (2016), prefer '-std=gnu11' to '-DPORT_TO_C89'. +# Even with -DPORT_TO_C89, the code needs at least one C99 +# feature (integers at least 64 bits wide) and maybe more. # -DRESERVE_STD_EXT_IDS if your platform reserves standard identifiers # with external linkage, e.g., applications cannot define 'localtime'. # -Dssize_t=long on hosts like MS-Windows that lack ssize_t # -DSUPPORT_C89 if the tzcode library should support C89 callers+ +# However, this might trigger latent bugs in C99-or-later callers. # -DSUPPRESS_TZDIR to not prepend TZDIR to file names; this has # security implications and is not recommended for general use # -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires; @@ -270,11 +294,15 @@ LDLIBS= # -DZIC_MAX_ABBR_LEN_WO_WARN=3 # (or some other number) to set the maximum time zone abbreviation length # that zic will accept without a warning (the default is 6) +# -g to generate symbolic debugging info +# -Idir to include from directory 'dir' +# -O0 to disable optimization; other -O options to enable more optimization +# -Uname to remove any definition of the macro 'name' # $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking # # * Options marked "*" can be omitted if your compiler is C23 compatible. # * Options marked "+" are obsolescent and are planned to be removed -# once the code assumes C99 or later. +# once the code assumes C99 or later, say in the year 2029. # # Select instrumentation via "make GCC_INSTRUMENT='whatever'". GCC_INSTRUMENT = \ @@ -353,9 +381,11 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # functions to be added to the time conversion library. # "offtime" is like "gmtime" except that it accepts a second (long) argument # that gives an offset to add to the time_t when converting it. -# "timelocal" is equivalent to "mktime". +# I.e., "offtime" is like calling "localtime_rz" with a fixed-offset zone. +# "timelocal" is nearly equivalent to "mktime". # "timeoff" is like "timegm" except that it accepts a second (long) argument # that gives an offset to use when converting to a time_t. +# I.e., "timeoff" is like calling "mktime_z" with a fixed-offset zone. # "posix2time" and "time2posix" are described in an included manual page. # X3J11's work does not describe any of these functions. # These functions may well disappear in future releases of the time @@ -378,7 +408,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # # NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put # out by the National Institute of Standards and Technology -# which claims to test C and Posix conformance. If you want to pass PCTS, add +# which claims to test C and POSIX conformance. If you want to pass PCTS, add # -DPCTS # to the end of the "CFLAGS=" line. # @@ -388,13 +418,21 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # 53 as a week number (rather than 52 or 53) for January days before # January's first Monday when a "%V" format is used and January 1 # falls on a Friday, Saturday, or Sunday. +# +# POSIX says CFLAGS defaults to "-O 1". +# Uncomment the following line and edit its contents as needed. -CFLAGS= +#CFLAGS= -O 1 -# Linker flags. Default to $(LFLAGS) for backwards compatibility -# to release 2012h and earlier. -LDFLAGS= $(LFLAGS) +# The name of a POSIX-like library archiver, its flags, C compiler, +# linker flags, and 'make' utility. Ordinarily the defaults suffice. +# The commented-out values are the defaults specified by POSIX 202x/D3. +#AR = ar +#ARFLAGS = -rv +#CC = c17 +#LDFLAGS = +#MAKE = make # For leap seconds, this Makefile uses LEAPSECONDS='-L leapseconds' in # submake command lines. The default is no leap seconds. @@ -418,18 +456,18 @@ ZFLAGS= ZIC_INSTALL= $(ZIC) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS) -# The name of a Posix-compliant 'awk' on your system. +# The name of a POSIX-compliant 'awk' on your system. # mawk 1.3.3 and Solaris 10 /usr/bin/awk do not work. # Also, it is better (though not essential) if 'awk' supports UTF-8, # and unfortunately mawk and busybox awk do not support UTF-8. # Try AWK=gawk or AWK=nawk if your awk has the abovementioned problems. AWK= awk -# The full path name of a Posix-compliant shell, preferably one that supports +# The full path name of a POSIX-compliant shell, preferably one that supports # the Korn shell's 'select' statement as an extension. # These days, Bash is the most popular. # It should be OK to set this to /bin/sh, on platforms where /bin/sh -# lacks 'select' or doesn't completely conform to Posix, but /bin/bash +# lacks 'select' or doesn't completely conform to POSIX, but /bin/bash # is typically nicer if it works. KSHELL= /bin/bash @@ -503,17 +541,16 @@ GZIPFLAGS= -9n DIFF_TZS= diff -u$$(! diff -u -F'^TZ=' - - <>/dev/null >&0 2>&1 \ || echo ' -F^TZ=') -############################################################################### - -#MAKE= make +# ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib. +RANLIB= : -cc= cc -CC= $(cc) -DTZDIR='"$(TZDIR)"' +# POSIX prohibits defining or using SHELL. However, csh users on systems +# that use the user shell for Makefile commands may need to define SHELL. +#SHELL= /bin/sh -AR= ar +# End of macros that one plausibly might want to tailor. +############################################################################### -# ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib. -RANLIB= : TZCOBJS= zic.o TZDOBJS= zdump.o localtime.o asctime.o strftime.o @@ -543,7 +580,7 @@ YDATA= $(PRIMARY_YDATA) etcetera NDATA= factory TDATA_TO_CHECK= $(YDATA) $(NDATA) backward TDATA= $(YDATA) $(NDATA) $(BACKWARD) -ZONETABLES= zone1970.tab zone.tab +ZONETABLES= zone.tab zone1970.tab zonenow.tab TABDATA= iso3166.tab $(TZDATA_TEXT) $(ZONETABLES) LEAP_DEPS= leapseconds.awk leap-seconds.list TZDATA_ZI_DEPS= ziguard.awk zishrink.awk version $(TDATA) \ @@ -551,7 +588,7 @@ TZDATA_ZI_DEPS= ziguard.awk zishrink.awk version $(TDATA) \ DSTDATA_ZI_DEPS= ziguard.awk $(TDATA) $(PACKRATDATA) $(PACKRATLIST) DATA= $(TDATA_TO_CHECK) backzone iso3166.tab leap-seconds.list \ leapseconds $(ZONETABLES) -AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk \ +AWK_SCRIPTS= checklinks.awk checknow.awk checktab.awk leapseconds.awk \ ziguard.awk zishrink.awk MISC= $(AWK_SCRIPTS) TZS_YEAR= 2050 @@ -572,7 +609,7 @@ VERSION_DEPS= \ calendars CONTRIBUTING LICENSE Makefile NEWS README SECURITY \ africa antarctica asctime.c asia australasia \ backward backzone \ - checklinks.awk checktab.awk \ + checklinks.awk checknow.awk checktab.awk \ date.1 date.c difftime.c \ etcetera europe factory iso3166.tab \ leap-seconds.list leapseconds.awk localtime.c \ @@ -582,12 +619,7 @@ VERSION_DEPS= \ tzfile.5 tzfile.h tzselect.8 tzselect.ksh \ workman.sh zdump.8 zdump.c zic.8 zic.c \ ziguard.awk zishrink.awk \ - zone.tab zone1970.tab - -# And for the benefit of csh users on systems that assume the user -# shell should be used to handle commands in Makefiles. . . - -SHELL= /bin/sh + zone.tab zone1970.tab zonenow.tab all: tzselect zic zdump libtz.a $(TABDATA) \ vanguard.zi main.zi rearguard.zi @@ -657,6 +689,16 @@ tzdata.zi: $(DATAFORM).zi version zishrink.awk $(DATAFORM).zi >$@.out mv $@.out $@ +tzdir.h: + printf '%s\n' >$@.out \ + '#ifndef TZDEFAULT' \ + '# define TZDEFAULT "$(TZDEFAULT)" /* default zone */' \ + '#endif' \ + '#ifndef TZDIR' \ + '# define TZDIR "$(TZDIR)" /* TZif directory */' \ + '#endif' + mv $@.out $@ + version.h: version VERSION=`cat version` && printf '%s\n' \ 'static char const PKGVERSION[]="($(PACKAGE)) ";' \ @@ -763,7 +805,7 @@ force_tzs: $(TZS_NEW) libtz.a: $(LIBOBJS) rm -f $@ - $(AR) -rc $@ $(LIBOBJS) + $(AR) $(ARFLAGS) $@ $(LIBOBJS) $(RANLIB) $@ date: $(DATEOBJS) @@ -771,26 +813,32 @@ date: $(DATEOBJS) tzselect: tzselect.ksh version VERSION=`cat version` && sed \ - -e 's|#!/bin/bash|#!$(KSHELL)|g' \ - -e 's|AWK=[^}]*|AWK='\''$(AWK)'\''|g' \ - -e 's|\(PKGVERSION\)=.*|\1='\''($(PACKAGE)) '\''|' \ - -e 's|\(REPORT_BUGS_TO\)=.*|\1=$(BUGEMAIL)|' \ - -e 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \ - -e 's|\(TZVERSION\)=.*|\1='"$$VERSION"'|' \ - <$@.ksh >$@.out + -e "s'#!/bin/bash'#!"'$(KSHELL)'\' \ + -e s\''\(AWK\)=[^}]*'\''\1=\'\''$(AWK)\'\'\' \ + -e s\''\(PKGVERSION\)=.*'\''\1=\'\''($(PACKAGE)) \'\'\' \ + -e s\''\(REPORT_BUGS_TO\)=.*'\''\1=\'\''$(BUGEMAIL)\'\'\' \ + -e s\''\(TZDIR\)=[^}]*'\''\1=\'\''$(TZDIR)\'\'\' \ + -e s\''\(TZVERSION\)=.*'\''\1=\'"'$$VERSION\\''" \ + <$@.ksh >$@.out chmod +x $@.out mv $@.out $@ check: check_back check_mild check_mild: check_character_set check_white_space check_links \ - check_name_lengths check_slashed_abbrs check_sorted \ + check_name_lengths check_now \ + check_slashed_abbrs check_sorted \ check_tables check_web check_ziguard check_zishrink check_tzs +# True if UTF8_LOCALE does not work; +# otherwise, false but with LC_ALL set to $(UTF8_LOCALE). +UTF8_LOCALE_MISSING = \ + { test ! '$(UTF8_LOCALE)' \ + || ! printf 'A\304\200B\n' \ + | LC_ALL='$(UTF8_LOCALE)' grep -q '^A.B$$' >/dev/null 2>&1 \ + || { LC_ALL='$(UTF8_LOCALE)'; export LC_ALL; false; }; } + check_character_set: $(ENCHILADA) - test ! '$(UTF8_LOCALE)' || \ - ! printf 'A\304\200B\n' | \ - LC_ALL='$(UTF8_LOCALE)' grep -q '^A.B$$' >/dev/null 2>&1 || { \ - LC_ALL='$(UTF8_LOCALE)' && export LC_ALL && \ + $(UTF8_LOCALE_MISSING) || { \ sharp='#' && \ ! grep -Env $(SAFE_LINE) $(MANS) date.1 $(MANTXTS) \ $(MISC) $(SOURCES) $(WEB_PAGES) \ @@ -805,12 +853,12 @@ check_character_set: $(ENCHILADA) touch $@ check_white_space: $(ENCHILADA) + $(UTF8_LOCALE_MISSING) || { \ patfmt=' \t|[\f\r\v]' && pat=`printf "$$patfmt\\n"` && \ - ! grep -En "$$pat" \ - $$(ls $(ENCHILADA) | grep -Fvx leap-seconds.list) - ! grep -n '[$s]$$' \ - $$(ls $(ENCHILADA) | grep -Fvx leap-seconds.list) - touch $@ + ! grep -En "$$pat|[$s]\$$" \ + $$(ls $(ENCHILADA) | grep -Fvx leap-seconds.list); \ + } + touch $@ PRECEDES_FILE_NAME = ^(Zone|Link[$s]+[^$s]+)[$s]+ FILE_NAME_COMPONENT_TOO_LONG = $(PRECEDES_FILE_NAME)[^$s]*[^/$s]{15} @@ -851,7 +899,29 @@ check_links: checklinks.awk tzdata.zi -f checklinks.awk tzdata.zi touch $@ -check_tables: checktab.awk $(YDATA) backward $(ZONETABLES) +# Check timestamps from now through 28 years from now, to make sure +# that zonenow.tab contains all sequences of planned timestamps, +# without any duplicate sequences. In theory this might require +# 2800 years but that would take a long time to check. +CHECK_NOW_TIMESTAMP = `./date +%s` +CHECK_NOW_FUTURE_YEARS = 28 +CHECK_NOW_FUTURE_SECS = $(CHECK_NOW_FUTURE_YEARS) '*' 366 '*' 24 '*' 60 '*' 60 +check_now: checknow.awk date tzdata.zi zdump zic zone1970.tab zonenow.tab + rm -fr $@.dir + mkdir $@.dir + ./zic -d $@.dir tzdata.zi + now=$(CHECK_NOW_TIMESTAMP) && \ + future=`expr $(CHECK_NOW_FUTURE_SECS) + $$now` && \ + ./zdump -i -t $$now,$$future \ + $$(find $$PWD/$@.dir/????*/ -type f) \ + >$@.dir/zdump.tab + $(AWK) \ + -v zdump_table=$@.dir/zdump.tab \ + -f checknow.awk zonenow.tab + rm -fr $@.dir + touch $@ + +check_tables: checktab.awk $(YDATA) backward zone.tab zone1970.tab for tab in $(ZONETABLES); do \ test "$$tab" = zone.tab && links='$(BACKWARD)' || links=''; \ $(AWK) -f checktab.awk -v zone_table=$$tab $(YDATA) $$links \ @@ -911,10 +981,10 @@ check_zishrink_posix check_zishrink_right: \ touch $@ clean_misc: - rm -fr check_*.dir + rm -fr check_*.dir typecheck_*.dir rm -f *.o *.out $(TIME_T_ALTERNATIVES) \ check_* core typecheck_* \ - date tzselect version.h zdump zic libtz.a + date tzdir.h tzselect version.h zdump zic libtz.a clean: clean_misc rm -fr *.dir tzdb-*/ rm -f *.zi $(TZS_NEW) @@ -952,12 +1022,18 @@ $(MANTXTS): workman.sh # plus N if GNU ls and touch are available. SET_TIMESTAMP_N = sh -c '\ n=$$0 dest=$$1; shift; \ - touch -cmr `ls -t "$$@" | sed 1q` "$$dest" && \ + <"$$dest" && \ if test $$n != 0 && \ - lsout=`ls -n --time-style="+%s" "$$dest" 2>/dev/null`; then \ + lsout=`ls -nt --time-style="+%s" "$$@" 2>/dev/null`; then \ set x $$lsout && \ - touch -cmd @`expr $$7 + $$n` "$$dest"; \ - else :; fi' + timestamp=`expr $$7 + $$n` && \ + echo "+ touch -md @$$timestamp $$dest" && \ + touch -md @$$timestamp "$$dest"; \ + else \ + newest=`ls -t "$$@" | sed 1q` && \ + echo "+ touch -mr $$newest $$dest" && \ + touch -mr "$$newest" "$$dest"; \ + fi' # If DEST depends on A B C ... in this Makefile, callers should use # $(SET_TIMESTAMP_DEP) DEST A B C ..., for the benefit of any # downstream 'make' that considers equal timestamps to be out of date. @@ -982,8 +1058,12 @@ set-timestamps.out: $(EIGHT_YARDS) rm -f test.out && \ for file in $$files; do \ if git diff --quiet $$file; then \ - time=`git log -1 --format='tformat:%ct' $$file` && \ - touch -cmd @$$time $$file; \ + time=`TZ=UTC0 git log -1 \ + --format='tformat:%cd' \ + --date='format:%Y-%m-%dT%H:%M:%SZ' \ + $$file` && \ + echo "+ touch -md $$time $$file" && \ + touch -md $$time $$file; \ else \ echo >&2 "$$file: warning: does not match repository"; \ fi || exit; \ @@ -1008,7 +1088,8 @@ check_public: $(VERSION_DEPS) rm -fr public.dir mkdir public.dir ln $(VERSION_DEPS) public.dir - cd public.dir && $(MAKE) CFLAGS='$(GCC_DEBUG_FLAGS)' ALL + cd public.dir \ + && $(MAKE) CFLAGS='$(GCC_DEBUG_FLAGS)' TZDIR='$(TZDIR)' ALL for i in $(TDATA_TO_CHECK) public.dir/tzdata.zi \ public.dir/vanguard.zi public.dir/main.zi \ public.dir/rearguard.zi; \ @@ -1139,7 +1220,7 @@ tzdata$(VERSION)-rearguard.tar.gz: rearguard.zi set-timestamps.out sed '1s/$$/-rearguard/' $@.dir/version : The dummy pacificnew pacifies TZUpdater 2.3.1 and earlier. $(CREATE_EMPTY) $@.dir/pacificnew - touch -cmr version $@.dir/version + touch -mr version $@.dir/version LC_ALL=C && export LC_ALL && \ (cd $@.dir && \ tar $(TARFLAGS) -cf - \ @@ -1163,7 +1244,7 @@ tzdata$(VERSION)-tailored.tar.gz: set-timestamps.out `test $(DATAFORM) = vanguard || echo pacificnew` (grep '^#' tzdata.zi && echo && cat $(DATAFORM).zi) \ >$@.dir/etcetera - touch -cmr tzdata.zi $@.dir/etcetera + touch -mr tzdata.zi $@.dir/etcetera sed -n \ -e '/^# *version *\(.*\)/h' \ -e '/^# *ddeps */H' \ @@ -1174,7 +1255,7 @@ tzdata$(VERSION)-tailored.tar.gz: set-timestamps.out -e 's/ /-/g' \ -e 'p' \ $@.dir/version - touch -cmr version $@.dir/version + touch -mr version $@.dir/version links= && \ for file in $(TZDATA_DIST); do \ test -f $@.dir/$$file || links="$$links $$file"; \ @@ -1226,10 +1307,10 @@ zonenames: tzdata.zi asctime.o: private.h tzfile.h date.o: private.h difftime.o: private.h -localtime.o: private.h tzfile.h +localtime.o: private.h tzfile.h tzdir.h strftime.o: private.h tzfile.h zdump.o: version.h -zic.o: private.h tzfile.h version.h +zic.o: private.h tzfile.h tzdir.h version.h .PHONY: ALL INSTALL all .PHONY: check check_mild check_time_t_alternatives diff --git a/contrib/tzdata/NEWS b/contrib/tzdata/NEWS index b54538aa4a82..031ba6a8a250 100644 --- a/contrib/tzdata/NEWS +++ b/contrib/tzdata/NEWS @@ -1,5 +1,109 @@ News for the tz database +Release 2023d - 2023-12-21 20:02:24 -0800 + + Briefly: + Ittoqqortoormiit, Greenland changes time zones on 2024-03-31. + Vostok, Antarctica changed time zones on 2023-12-18. + Casey, Antarctica changed time zones five times since 2020. + Code and data fixes for Palestine timestamps starting in 2072. + A new data file zonenow.tab for timestamps starting now. + + Changes to future timestamps + + Ittoqqortoormiit, Greenland (America/Scoresbysund) joins most of + the rest of Greenland's timekeeping practice on 2024-03-31, by + changing its time zone from -01/+00 to -02/-01 at the same moment + as the spring-forward transition. Its clocks will therefore not + spring forward as previously scheduled. The time zone change + reverts to its common practice before 1981. + + Fix predictions for DST transitions in Palestine in 2072-2075, + correcting a typo introduced in 2023a. + + Changes to past and future timestamps + + Vostok, Antarctica changed to +05 on 2023-12-18. It had been at + +07 (not +06) for years. (Thanks to Zakhary V. Akulov.) + + Change data for Casey, Antarctica to agree with timeanddate.com, + by adding five time zone changes since 2020. Casey is now at +08 + instead of +11. + + Changes to past tm_isdst flags + + Much of Greenland, represented by America/Nuuk, changed its + standard time from -03 to -02 on 2023-03-25, not on 2023-10-28. + This does not affect UTC offsets, only the tm_isdst flag. + (Thanks to Thomas M. Steenholdt.) + + New data file + + A new data file zonenow.tab helps configure applications that use + timestamps dated from now on. This simplifies configuration, + since users choose from a smaller Zone set. The file's format is + experimental and subject to change. + + Changes to code + + localtime.c no longer mishandles TZif files that contain a single + transition into a DST regime. Previously, it incorrectly assumed + DST was in effect before the transition too. (Thanks to Alois + Treindl for debugging help.) + + localtime.c's timeoff no longer collides with OpenBSD 7.4. + + The C code now uses _Generic only if __STDC_VERSION__ says the + compiler is C11 or later. + + tzselect now optionally reads zonenow.tab, to simplify when + configuring only for timestamps dated from now on. + + tzselect no longer creates temporary files. + + tzselect no longer mishandles the following: + + Spaces and most other special characters in BUGEMAIL, PACKAGE, + TZDIR, and VERSION. + + TZ strings when using mawk 1.4.3, which mishandles regular + expressions of the form /X{2,}/. + + ISO 6709 coordinates when using an awk that lacks the GNU + extension of newlines in -v option-arguments. + + Non UTF-8 locales when using an iconv command that lacks the GNU + //TRANSLIT extension. + + zic no longer mishandles data for Palestine after the year 2075. + Previously, it incorrectly omitted post-2075 transitions that are + predicted for just before and just after Ramadan. (Thanks to Ken + Murchison for debugging help.) + + zic now works again on Linux 2.6.16 and 2.6.17 (2006). + (Problem reported by Rune Torgersen.) + + Changes to build procedure + + The Makefile is now more compatible with POSIX: + * It no longer defines AR, CC, CFLAGS, LDFLAGS, and SHELL. + * It no longer uses its own 'cc' in place of CC. + * It now uses ARFLAGS, with default specified by POSIX. + * It does not use LFLAGS incompatibly with POSIX. + * It uses the special .POSIX target. + * It quotes special characters more carefully. + * It no longer mishandles builds in an ISO 8859 locale. + Due to the CC changes, TZDIR is now #defined in a file tzfile.h + built by 'make', not in a $(CC) -D option. Also, TZDEFAULT is + now treated like TZDIR as they have similar roles. + + Changes to commentary + + Limitations and hazards of the optional support for obsolescent + C89 platforms are documented better, along with a tentative + schedule for removing this support. + + Release 2023c - 2023-03-28 12:42:14 -0700 Changes to past and future timestamps @@ -76,11 +180,14 @@ Release 2023a - 2023-03-22 12:39:33 -0700 platform dependent and abbreviations were silently truncated to 16 bytes even when the limit was greater than 16. - The code by default is now designed for C99 or later. To build in - a C89 environment, compile with -DPORT_TO_C89. To support C89 - callers of the tzcode library, compile with -DSUPPORT_C89. The - two new macros are transitional aids planned to be removed in a - future version, when C99 or later will be required. + The code by default is now designed for C99 or later. To build on + a mostly-C89 platform, compile with -DPORT_TO_C89; this should + work on C89 platforms that also support C99 'long long' and + perhaps a few other extensions to C89. To support C89 callers of + tzcode's library, compile with -DSUPPORT_C89; however, this could + trigger latent bugs in C99-or-later callers. The two new macros + are transitional aids planned to be removed in a future version + (say, in 2029), when C99 or later will be required. The code now builds again on pre-C99 platforms, if you compile with -DPORT_TO_C89. This fixes a bug introduced in 2022f. @@ -723,6 +830,8 @@ Release 2021b - 2021-09-24 16:23:00 -0700 them, set the EXPIRES_LINE Makefile variable. If a TZif file uses this new feature it is marked with a new TZif version number 4, a format intended to be documented in a successor to RFC 8536. + The old-format "#expires" comments are now treated solely as + comments and have no effect on the TZif files. zic -L LEAPFILE -r @LO no longer generates an invalid TZif file that omits leap second information for the range LO..B when LO @@ -4302,7 +4411,7 @@ Release 2012j - 2012-11-12 18:34:49 -0800 now uses tz@iana.org rather than the old elsie address. zic -v now complains about abbreviations that are less than 3 - or more than 6 characters, as per Posix. Formerly, it checked + or more than 6 characters, as per POSIX. Formerly, it checked for abbreviations that were more than 3. 'make public' no longer puts its temporary directory under /tmp, @@ -4467,8 +4576,8 @@ Release data2011m - 2011-10-24 21:42:16 +0700 In particular, the typos in comments in the data (2011-11-17 should have been 2011-10-17 as Alan Barrett noted, and spelling of Tiraspol that Tim Parenti noted) have been fixed, and the change for Ukraine has been - made in all 4 Ukrainian zones, rather than just Kiev (again, thanks to - Tim Parenti, and also Denys Gavrysh) + made in all 4 Ukrainian zones, rather than just Europe/Kiev + (again, thanks to Tim Parenti, and also Denys Gavrysh). In addition, I added Europe/Tiraspol to zone.tab. diff --git a/contrib/tzdata/README b/contrib/tzdata/README index 145aacd495b7..edabd2e0690f 100644 --- a/contrib/tzdata/README +++ b/contrib/tzdata/README @@ -11,14 +11,17 @@ changes made by political bodies to time zone boundaries, UTC offsets, and daylight-saving rules. See or the -file tz-link.html for how to acquire the code and data. Once acquired, -read the comments in the file 'Makefile' and make any changes needed -to make things right for your system, especially if you are using some -platform other than GNU/Linux. Then run the following commands, -substituting your desired installation directory for "$HOME/tzdir": - - make TOPDIR=$HOME/tzdir install - $HOME/tzdir/usr/bin/zdump -v America/Los_Angeles +file tz-link.html for how to acquire the code and data. + +Once acquired, read the leading comments in the file "Makefile" +and make any changes needed to make things right for your system, +especially when using a platform other than current GNU/Linux. + +Then run the following commands, substituting your desired +installation directory for "$HOME/tzdir": + + make TOPDIR="$HOME/tzdir" install + "$HOME/tzdir/usr/bin/zdump" -v America/Los_Angeles See the file tz-how-to.html for examples of how to read the data files. diff --git a/contrib/tzdata/africa b/contrib/tzdata/africa index 6cf4e39c8c45..6fae18c0979f 100644 --- a/contrib/tzdata/africa +++ b/contrib/tzdata/africa @@ -285,13 +285,6 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - # reproduced by other (more accessible) sites[, e.g.,]... # http://elgornal.net/news/news.aspx?id=4699258 -# From Paul Eggert (2014-06-04): -# Sarah El Deeb and Lee Keath of AP report that the Egyptian government says -# the change is because of blackouts in Cairo, even though Ahram Online (cited -# above) says DST had no affect on electricity consumption. There is -# no information about when DST will end this fall. See: -# http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833 - # From Steffen Thorsen (2015-04-08): # Egypt will start DST on midnight after Thursday, April 30, 2015. # This is based on a law (no 35) from May 15, 2014 saying it starts the last diff --git a/contrib/tzdata/antarctica b/contrib/tzdata/antarctica index fc603e9996de..763c27253c99 100644 --- a/contrib/tzdata/antarctica +++ b/contrib/tzdata/antarctica @@ -80,6 +80,11 @@ # - 2018 Oct 7 4:00 - 2019 Mar 17 3:00 - 2019 Oct 4 3:00 - 2020 Mar 8 3:00 # and now - 2020 Oct 4 0:01 +# From Paul Eggert (2023-12-20): +# Transitions from 2021 on are taken from: +# https://www.timeanddate.com/time/zone/antarctica/casey +# retrieved at various dates. + # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone Antarctica/Casey 0 - -00 1969 8:00 - +08 2009 Oct 18 2:00 @@ -93,7 +98,12 @@ Zone Antarctica/Casey 0 - -00 1969 8:00 - +08 2019 Oct 4 3:00 11:00 - +11 2020 Mar 8 3:00 8:00 - +08 2020 Oct 4 0:01 - 11:00 - +11 + 11:00 - +11 2021 Mar 14 0:00 + 8:00 - +08 2021 Oct 3 0:01 + 11:00 - +11 2022 Mar 13 0:00 + 8:00 - +08 2022 Oct 2 0:01 + 11:00 - +11 2023 Mar 9 3:00 + 8:00 - +08 Zone Antarctica/Davis 0 - -00 1957 Jan 13 7:00 - +07 1964 Nov 0 - -00 1969 Feb @@ -240,7 +250,50 @@ Zone Antarctica/Troll 0 - -00 2005 Feb 12 # year-round from 1960/61 to 1992 # Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11 -# See Asia/Urumqi. +# From Craig Mundell (1994-12-15): +# http://quest.arc.nasa.gov/antarctica/QA/computers/Directions,Time,ZIP +# Vostok, which is one of the Russian stations, is set on the same +# time as Moscow, Russia. +# +# From Lee Hotz (2001-03-08): +# I queried the folks at Columbia who spent the summer at Vostok and this is +# what they had to say about time there: +# "in the US Camp (East Camp) we have been on New Zealand (McMurdo) +# time, which is 12 hours ahead of GMT. The Russian Station Vostok was +# 6 hours behind that (although only 2 miles away, i.e. 6 hours ahead +# of GMT). This is a time zone I think two hours east of Moscow. The +# natural time zone is in between the two: 8 hours ahead of GMT." +# +# From Paul Eggert (2001-05-04): +# This seems to be hopelessly confusing, so I asked Lee Hotz about it +# in person. He said that some Antarctic locations set their local +# time so that noon is the warmest part of the day, and that this +# changes during the year and does not necessarily correspond to mean +# solar noon. So the Vostok time might have been whatever the clocks +# happened to be during their visit. So we still don't really know what time +# it is at Vostok. +# +# From Zakhary V. Akulov (2023-12-17 22:00:48 +0700): +# ... from December, 18, 2023 00:00 by my decision the local time of +# the Antarctic research base Vostok will correspond to UTC+5. +# (2023-12-19): We constantly interact with Progress base, with company who +# builds new wintering station, with sledge convoys, with aviation - they all +# use UTC+5. Besides, difference between Moscow time is just 2 hours now, not 4. +# (2023-12-19, in response to the question "Has local time at Vostok +# been UTC+6 ever since 1957, or has it changed before?"): No. At least +# since my antarctic career start, 10 years ago, Vostok base has UTC+7. +# (In response to a 2023-12-18 question "from 02:00 to 00:00 today"): This. +# +# From Paul Eggert (2023-12-18): +# For lack of better info, guess Vostok was at +07 from founding through today, +# except when closed. + +# Zone NAME STDOFF RULES FORMAT [UNTIL] +Zone Antarctica/Vostok 0 - -00 1957 Dec 16 + 7:00 - +07 1994 Feb + 0 - -00 1994 Nov + 7:00 - +07 2023 Dec 18 2:00 + 5:00 - +05 # S Africa - year-round bases # Marion Island, -4653+03752 diff --git a/contrib/tzdata/asia b/contrib/tzdata/asia index a29a4dc0c4de..04526c196931 100644 --- a/contrib/tzdata/asia +++ b/contrib/tzdata/asia @@ -655,7 +655,6 @@ Zone Asia/Shanghai 8:05:43 - LMT 1901 8:00 PRC C%sT # Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi # / Wulumuqi. (Please use Asia/Shanghai if you prefer Beijing time.) -# Vostok base in Antarctica matches this since 1970. Zone Asia/Urumqi 5:50:20 - LMT 1928 6:00 - +06 @@ -3427,6 +3426,9 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # From Heba Hamad (2023-03-22): # ... summer time will begin in Palestine from Saturday 04-29-2023, # 02:00 AM by 60 minutes forward. +# From Heba Hemad (2023-10-09): +# ... winter time will begin in Palestine from Saturday 10-28-2023, +# 02:00 AM by 60 minutes back. # # From Paul Eggert (2023-03-22): # For now, guess that spring and fall transitions will normally @@ -3548,13 +3550,13 @@ Rule Palestine 2070 only - Oct 4 2:00 0 - Rule Palestine 2071 only - Sep 19 2:00 0 - Rule Palestine 2072 only - Sep 10 2:00 0 - Rule Palestine 2072 only - Oct 15 2:00 1:00 S +Rule Palestine 2072 max - Oct Sat<=30 2:00 0 - Rule Palestine 2073 only - Sep 2 2:00 0 - Rule Palestine 2073 only - Oct 7 2:00 1:00 S Rule Palestine 2074 only - Aug 18 2:00 0 - Rule Palestine 2074 only - Sep 29 2:00 1:00 S Rule Palestine 2075 only - Aug 10 2:00 0 - Rule Palestine 2075 only - Sep 14 2:00 1:00 S -Rule Palestine 2075 max - Oct Sat<=30 2:00 0 - Rule Palestine 2076 only - Jul 25 2:00 0 - Rule Palestine 2076 only - Sep 5 2:00 1:00 S Rule Palestine 2077 only - Jul 17 2:00 0 - diff --git a/contrib/tzdata/australasia b/contrib/tzdata/australasia index 0633a30efd8b..dc98c1e2de17 100644 --- a/contrib/tzdata/australasia +++ b/contrib/tzdata/australasia @@ -391,8 +391,14 @@ Zone Antarctica/Macquarie 0 - -00 1899 Nov # Please note that there will not be any daylight savings time change # in Fiji for 2022-2023.... # https://www.facebook.com/FijianGovernment/posts/pfbid0mmWVTYmTibn66ybpFda75pDcf34SSpoSaskJW5gXwaKo5Sgc7273Q4fXWc6kQV6Hl + +# From Almaz Mingaleev (2023-10-06): +# Cabinet approved the suspension of Daylight Saving and appropriate +# legislative changes will be considered including the repeal of the +# Daylight Saving Act 1998 +# https://www.fiji.gov.fj/Media-Centre/Speeches/English/CABINET-DECISIONS-3-OCTOBER-2023 # -# From Paul Eggert (2022-10-27): +# From Paul Eggert (2023-10-06): # For now, assume DST is suspended indefinitely. # Rule NAME FROM TO - IN ON AT SAVE LETTER/S diff --git a/contrib/tzdata/backward b/contrib/tzdata/backward index 421f2ec6b9f8..65c711b37bf4 100644 --- a/contrib/tzdata/backward +++ b/contrib/tzdata/backward @@ -205,7 +205,6 @@ Link America/Puerto_Rico America/Tortola Link Pacific/Port_Moresby Antarctica/DumontDUrville Link Pacific/Auckland Antarctica/McMurdo Link Asia/Riyadh Antarctica/Syowa -Link Asia/Urumqi Antarctica/Vostok Link Europe/Berlin Arctic/Longyearbyen Link Asia/Riyadh Asia/Aden Link Asia/Qatar Asia/Bahrain diff --git a/contrib/tzdata/backzone b/contrib/tzdata/backzone index 44d81c29e5ae..f45250340493 100644 --- a/contrib/tzdata/backzone +++ b/contrib/tzdata/backzone @@ -963,35 +963,6 @@ Link Antarctica/McMurdo Antarctica/South_Pole Zone Antarctica/Syowa 0 - -00 1957 Jan 29 3:00 - +03 -# Vostok, Antarctica -# -# Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11 -# From Craig Mundell (1994-12-15): -# http://quest.arc.nasa.gov/antarctica/QA/computers/Directions,Time,ZIP -# Vostok, which is one of the Russian stations, is set on the same -# time as Moscow, Russia. -# -# From Lee Hotz (2001-03-08): -# I queried the folks at Columbia who spent the summer at Vostok and this is -# what they had to say about time there: -# "in the US Camp (East Camp) we have been on New Zealand (McMurdo) -# time, which is 12 hours ahead of GMT. The Russian Station Vostok was -# 6 hours behind that (although only 2 miles away, i.e. 6 hours ahead -# of GMT). This is a time zone I think two hours east of Moscow. The -# natural time zone is in between the two: 8 hours ahead of GMT." -# -# From Paul Eggert (2001-05-04): -# This seems to be hopelessly confusing, so I asked Lee Hotz about it -# in person. He said that some Antarctic locations set their local -# time so that noon is the warmest part of the day, and that this -# changes during the year and does not necessarily correspond to mean -# solar noon. So the Vostok time might have been whatever the clocks -# happened to be during their visit. So we still don't really know what time -# it is at Vostok. But we'll guess +06. -# -Zone Antarctica/Vostok 0 - -00 1957 Dec 16 - 6:00 - +06 - # Yemen # Milne says 2:59:54 was the meridian of the saluting battery at Aden, # and that Yemen was at 1:55:56, the meridian of the Hagia Sophia. diff --git a/contrib/tzdata/checknow.awk b/contrib/tzdata/checknow.awk new file mode 100644 index 000000000000..d722c03fd689 --- /dev/null +++ b/contrib/tzdata/checknow.awk @@ -0,0 +1,54 @@ +# Check zonenow.tab for consistency with primary data. + +# Contributed by Paul Eggert. This file is in the public domain. + +function record_zone(zone, data) { + if (zone) { + zone_data[zone] = data + zones[data] = zones[data] " " zone + } +} + +BEGIN { + while (getline >"/dev/stderr" status = 1 @@ -110,7 +110,7 @@ BEGIN { used_max_cc = cc } } - if (used_max <= 1 && comments) { + if (used_max <= 1 && comments && zone_table != "zonenow.tab") { printf "%s:%d: unnecessary comment '%s'\n", \ zone_table, i, comments \ >>"/dev/stderr" @@ -149,7 +149,8 @@ $1 ~ /^#/ { next } if ($3 ~ /%/) rulePercentUsed[$2] = 1 } if (tz && tz ~ /\// && tz !~ /^Etc\//) { - if (!tztab[tz] && FILENAME != "backward") { + if (!tztab[tz] && FILENAME != "backward" \ + && zone_table != "zonenow.tab") { printf "%s: no data for '%s'\n", zone_table, tz \ >>"/dev/stderr" status = 1 diff --git a/contrib/tzdata/europe b/contrib/tzdata/europe index 3907c055140a..27f821e77600 100644 --- a/contrib/tzdata/europe +++ b/contrib/tzdata/europe @@ -1123,6 +1123,23 @@ Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Tórshavn # 2. The shift *from* DST in 2023 happens as normal, but coincides with the # shift to UTC-02 normaltime (people will not change their clocks here). # 3. After this, DST is still observed, but as -02/-01 instead of -03/-02. +# +# From Múte Bourup Egede via Jógvan Svabo Samuelsen (2023-03-15): +# Greenland will not switch to Daylight Saving Time this year, 2023, +# because the standard time for Greenland will change from UTC -3 to UTC -2. +# However, Greenland will change to Daylight Saving Time again in 2024 +# and onwards. + +# From a contributor who wishes to remain anonymous for now (2023-10-29): *** 616 LINES SKIPPED *** From nobody Wed Feb 14 06:05:56 2024 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 4TZSP104kkz5B4r6; Wed, 14 Feb 2024 06:05:57 +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 4TZSP06XcSz4RX9; Wed, 14 Feb 2024 06:05:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890756; 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=dv/9rcz4HvdJGVe9zYc9nIuvoT1D4U/n9UR2yxEmpoY=; b=SYLaP2mE/nuq7cF2UpCArLyG7OoPaehgdfAYHqwiQLyGolgRouVrgZW2Sjr3BWKhr+ttiw HlC0G9Uce5WhWq7/AgNrDXTMgBV8QfCVJfalS7ORhKBpVnZT5gZdSwn9qmN+3WkSujuDvr y/FH8gqXly1L2XF9pgF9kN4OkQ9JhgGvbBhspKurCGXMY4TgR6Yvn4QsGYgmS8SSmrEx3S TbLAp7LmXo4npDf97gfoSujwe3ucvAiHKy/SGmc1UnGIgcuf5ftWUB5pxJtSAl6NIWKwgG Orc2eUlaKcGM93z4iTxV/5/sxZm5YVnJWCcc4mv1JRCjrVj1yNELkeM5cfreXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707890756; a=rsa-sha256; cv=none; b=qlon7UdV9FZSAdUMagf943KkWgAnZnEn02h31M6ch8YWvibsn66aZy/uGj0beNcj+A9xL6 t0qnyu8vLR4JFrWoCZZlpWjK/wuedLtciSM8yO7uKAGFYlK4OvUYXtnQvPQWfWv7NEVozr FkgK/DuL332WI7WAlepGfxWha/suV0SXyJNM5VG0u98IWbUlOdVEjUXr2i5DO9jUl47Mmn 8ExjL9+ci2NWBDVq62g2Moep3Brhu8Qm0xBcdNeUufDvVZGkYfqUJOKqHqrm8nSqe7AQFY 4SsXIXnfZEJkRaxsu/0+sYxSC6+S203BKr3zm8oJjISCXskXPkP9krSMXAoOvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890756; 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=dv/9rcz4HvdJGVe9zYc9nIuvoT1D4U/n9UR2yxEmpoY=; b=bAuFmPT6G7YjyCKkmGEmFoVfU5731ZG32g2bpkmEm3j24G0HEZ/Rz1QZLBmzItrEm7pyy6 CsG1mReONmZhi06eBmY5Ifixo3COxHvyLSAX3p4ICi4leaDUybNfamJ/4lfo+H8lIbDo1d yFxaIRHaAQy51IR5OSHo9CJi5ilgmnPmq0D4FMebkhtFsAIxSEJ8zeD2UUl/5vmLdO+8ae PmMcJ4h8UJr6yxjq6gIKCINVcIYsFCcqPrLzgfWEl8gDLExcJ3LPu+TYjq4oci+D8BIbdg 32Cdkc1Qoxo2Q1qIddGQkCZY+kbin7J6k8ZNzlO3FoTKMH5JoMQfcKCWaDDwvQ== 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 4TZSP05b56zmkn; Wed, 14 Feb 2024 06:05:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E65uNK085059; Wed, 14 Feb 2024 06:05:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E65uZj085056; Wed, 14 Feb 2024 06:05:56 GMT (envelope-from git) Date: Wed, 14 Feb 2024 06:05:56 GMT Message-Id: <202402140605.41E65uZj085056@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 3982cad2a7d3 - releng/13.2 - contrib/tzdata: import tzdata 2024a 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 3982cad2a7d3984e03a8c0c9533e571176dcd082 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=3982cad2a7d3984e03a8c0c9533e571176dcd082 commit 3982cad2a7d3984e03a8c0c9533e571176dcd082 Author: Philip Paeps AuthorDate: 2024-02-02 02:01:39 +0000 Commit: Gordon Tetlow CommitDate: 2024-02-14 05:35:17 +0000 contrib/tzdata: import tzdata 2024a Changes: https://github.com/eggert/tz/blob/2024a/NEWS Approved by: so Security: FreeBSD-EN-24:01.tzdata (cherry picked from commit 2723c7ffb7f729a1d3f7c59e7db48b0edf3d30a6) (cherry picked from commit f4256acec1c980b7d08e9e526be6d2a7c4751f0b) --- contrib/tzdata/Makefile | 53 ++++-- contrib/tzdata/NEWS | 68 +++++++ contrib/tzdata/africa | 8 +- contrib/tzdata/asia | 174 +++++++++++------- contrib/tzdata/australasia | 14 +- contrib/tzdata/checknow.awk | 2 +- contrib/tzdata/etcetera | 2 +- contrib/tzdata/europe | 29 ++- contrib/tzdata/leap-seconds.list | 373 +++++++++++++-------------------------- contrib/tzdata/leapseconds | 19 +- contrib/tzdata/leapseconds.awk | 11 +- contrib/tzdata/northamerica | 29 +-- contrib/tzdata/southamerica | 5 +- contrib/tzdata/theory.html | 37 ++-- contrib/tzdata/version | 2 +- contrib/tzdata/zishrink.awk | 98 ++++++---- contrib/tzdata/zonenow.tab | 4 +- 17 files changed, 507 insertions(+), 421 deletions(-) diff --git a/contrib/tzdata/Makefile b/contrib/tzdata/Makefile index 4e45f93b915c..d48354c72df4 100644 --- a/contrib/tzdata/Makefile +++ b/contrib/tzdata/Makefile @@ -53,7 +53,7 @@ DATAFORM= main LOCALTIME= Factory -# The POSIXRULES macro controls interpretation of POSIX-like TZ +# The POSIXRULES macro controls interpretation of POSIX-2017.1-like TZ # settings like TZ='EET-2EEST' that lack DST transition rules. # If POSIXRULES is '-', no template is installed; this is the default. # Any other value for POSIXRULES is obsolete and should not be relied on, as: @@ -274,7 +274,7 @@ LDLIBS= # -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; # the default is system-supplied, typically "/usr/lib/locale" # -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified -# DST transitions for POSIX-style TZ strings lacking them, +# DST transitions for POSIX.1-2017-style TZ strings lacking them, # in the usual case where POSIXRULES is '-'. If not specified, # TZDEFRULESTRING defaults to US rules for future DST transitions. # This mishandles some past timestamps, as US DST rules have changed. @@ -340,9 +340,10 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # guess TM_GMTOFF from other macros; define NO_TM_GMTOFF to suppress this. # Similarly, if your system has a "zone abbreviation" field, define # -DTM_ZONE=tm_zone -# and define NO_TM_ZONE to suppress any guessing. Although these two fields -# not required by POSIX, a future version of POSIX is planned to require them -# and they are widely available on GNU/Linux and BSD systems. +# and define NO_TM_ZONE to suppress any guessing. +# Although these two fields are not required by POSIX.1-2017, +# POSIX 202x/D4 requires them and they are widely available +# on GNU/Linux and BSD systems. # # The next batch of options control support for external variables # exported by tzcode. In practice these variables are less useful @@ -352,7 +353,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # # -DHAVE_TZNAME=0 # do not support "tzname" # # -DHAVE_TZNAME=1 # support "tzname", which is defined by system library # # -DHAVE_TZNAME=2 # support and define "tzname" -# # to the "CFLAGS=" line. "tzname" is required by POSIX 1988 and later. +# # to the "CFLAGS=" line. "tzname" is required by POSIX.1-1988 and later. # # If not defined, the code attempts to guess HAVE_TZNAME from other macros. # # Warning: unless time_tz is also defined, HAVE_TZNAME=1 can cause # # crashes when combined with some platforms' standard libraries, @@ -362,8 +363,8 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # # -DUSG_COMPAT=0 # do not support # # -DUSG_COMPAT=1 # support, and variables are defined by system library # # -DUSG_COMPAT=2 # support and define variables -# # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by -# # Unix Systems Group code and are required by POSIX 2008 (with XSI) and later. +# # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by Unix +# # Systems Group code and are required by POSIX.1-2008 and later (with XSI). # # If not defined, the code attempts to guess USG_COMPAT from other macros. # # # # To support the external variable "altzone", add @@ -427,7 +428,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # The name of a POSIX-like library archiver, its flags, C compiler, # linker flags, and 'make' utility. Ordinarily the defaults suffice. -# The commented-out values are the defaults specified by POSIX 202x/D3. +# The commented-out values are the defaults specified by POSIX.1-202x/D4. #AR = ar #ARFLAGS = -rv #CC = c17 @@ -439,6 +440,12 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ LEAPSECONDS= +# Where to fetch leap-seconds.list from. +leaplist_URI = \ + https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list +# The file is generated by the IERS Earth Orientation Centre, in Paris. +leaplist_TZ = Europe/Paris + # The zic command and its arguments. zic= ./zic @@ -471,7 +478,8 @@ AWK= awk # is typically nicer if it works. KSHELL= /bin/bash -# Name of curl , used for HTML validation. +# Name of curl , used for HTML validation +# and to fetch leap-seconds.list from upstream. CURL= curl # Name of GNU Privacy Guard , used to sign distributions. @@ -718,6 +726,28 @@ leapseconds: $(LEAP_DEPS) -f leapseconds.awk leap-seconds.list >$@.out mv $@.out $@ +# Awk script to extract a Git-style author from leap-seconds.list comments. +EXTRACT_AUTHOR = \ + author_line { sub(/^.[[:space:]]*/, ""); \ + sub(/:[[:space:]]*/, " <"); \ + printf "%s>\n", $$0; \ + success = 1; \ + exit \ + } \ + /Questions or comments to:/ { author_line = 1 } \ + END { exit !success } + +# Fetch leap-seconds.list from upstream. +fetch-leap-seconds.list: + $(CURL) -OR $(leaplist_URI) + +# Fetch leap-seconds.list from upstream and commit it to the local repository. +commit-leap-seconds.list: fetch-leap-seconds.list + author=$$($(AWK) '$(EXTRACT_AUTHOR)' leap-seconds.list) && \ + date=$$(TZ=$(leaplist_TZ) stat -c%y leap-seconds.list) && \ + git commit --author="$$author" --date="$$date" -m'make $@' \ + leap-seconds.list + # Arguments to pass to submakes of install_data. # They can be overridden by later submake arguments. INSTALLARGS = \ @@ -1315,7 +1345,8 @@ zic.o: private.h tzfile.h tzdir.h version.h .PHONY: ALL INSTALL all .PHONY: check check_mild check_time_t_alternatives .PHONY: check_web check_zishrink -.PHONY: clean clean_misc dummy.zd force_tzs +.PHONY: clean clean_misc commit-leap-seconds.list dummy.zd +.PHONY: fetch-leap-seconds.list force_tzs .PHONY: install install_data maintainer-clean names .PHONY: posix_only posix_right public .PHONY: rearguard_signatures rearguard_signatures_version diff --git a/contrib/tzdata/NEWS b/contrib/tzdata/NEWS index 031ba6a8a250..d407342a50e6 100644 --- a/contrib/tzdata/NEWS +++ b/contrib/tzdata/NEWS @@ -1,5 +1,73 @@ News for the tz database +Release 2024a - 2024-02-01 09:28:56 -0800 + + Briefly: + Kazakhstan unifies on UTC+5 beginning 2024-03-01. + Palestine springs forward a week later after Ramadan. + zic no longer pretends to support indefinite-past DST. + localtime no longer mishandles Ciudad Juárez in 2422. + + Changes to future timestamps + + Kazakhstan unifies on UTC+5. This affects Asia/Almaty and + Asia/Qostanay which together represent the eastern portion of the + country that will transition from UTC+6 on 2024-03-01 at 00:00 to + join the western portion. (Thanks to Zhanbolat Raimbekov.) + + Palestine springs forward a week later than previously predicted + in 2024 and 2025. (Thanks to Heba Hamad.) Change spring-forward + predictions to the second Saturday after Ramadan, not the first; + this also affects other predictions starting in 2039. + + Changes to past timestamps + + Asia/Ho_Chi_Minh's 1955-07-01 transition occurred at 01:00 + not 00:00. (Thanks to Đoàn Trần Công Danh.) + + From 1947 through 1949, Toronto's transitions occurred at 02:00 + not 00:00. (Thanks to Chris Walton.) + + In 1911 Miquelon adopted standard time on June 15, not May 15. + + Changes to code + + The FROM and TO columns of Rule lines can no longer be "minimum" + or an abbreviation of "minimum", because TZif files do not support + DST rules that extend into the indefinite past - although these + rules were supported when TZif files had only 32-bit data, this + stopped working when 64-bit TZif files were introduced in 1995. + This should not be a problem for realistic data, since DST was + first used in the 20th century. As a transition aid, FROM columns + like "minimum" are now diagnosed and then treated as if they were + the year 1900; this should suffice for TZif files on old systems + with only 32-bit time_t, and it is more compatible with bugs in + 2023c-and-earlier localtime.c. (Problem reported by Yoshito + Umaoka.) + + localtime and related functions no longer mishandle some + timestamps that occur about 400 years after a switch to a time + zone with a DST schedule. In 2023d data this problem was visible + for some timestamps in November 2422, November 2822, etc. in + America/Ciudad_Juarez. (Problem reported by Gilmore Davidson.) + + strftime %s now uses tm_gmtoff if available. (Problem and draft + patch reported by Dag-Erling Smørgrav.) + + Changes to build procedure + + The leap-seconds.list file is now copied from the IERS instead of + from its downstream counterpart at NIST, as the IERS version is + now in the public domain too and tends to be more up-to-date. + (Thanks to Martin Burnicki for liaisoning with the IERS.) + + Changes to documentation + + The strftime man page documents which struct tm members affect + which conversion specs, and that tzset is called. (Problems + reported by Robert Elz and Steve Summit.) + + Release 2023d - 2023-12-21 20:02:24 -0800 Briefly: diff --git a/contrib/tzdata/africa b/contrib/tzdata/africa index 6fae18c0979f..92d823a0515c 100644 --- a/contrib/tzdata/africa +++ b/contrib/tzdata/africa @@ -30,6 +30,10 @@ # Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94. # https://www.jstor.org/stable/1774359 # +# For the 1911/1912 establishment of standard time in French possessions, see: +# Société Française de Physique, Recueil de constantes physiques (1913), +# page 752, 18b. +# # European-style abbreviations are commonly used along the Mediterranean. # For sub-Saharan Africa abbreviations were less standardized. # Previous editions of this database used WAT, CAT, SAT, and EAT @@ -113,7 +117,7 @@ Zone Atlantic/Cape_Verde -1:34:04 - LMT 1912 Jan 01 2:00u # Praia # Chad # Zone NAME STDOFF RULES FORMAT [UNTIL] -Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena +Zone Africa/Ndjamena 1:00:12 - LMT 1912 Jan 1 # N'Djamena 1:00 - WAT 1979 Oct 14 1:00 1:00 WAST 1980 Mar 8 1:00 - WAT @@ -139,7 +143,7 @@ Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena # Inaccessible, Nightingale: uninhabited # Zone NAME STDOFF RULES FORMAT [UNTIL] -Zone Africa/Abidjan -0:16:08 - LMT 1912 +Zone Africa/Abidjan -0:16:08 - LMT 1912 Jan 1 0:00 - GMT ############################################################################### diff --git a/contrib/tzdata/asia b/contrib/tzdata/asia index 04526c196931..05683b9ebaa3 100644 --- a/contrib/tzdata/asia +++ b/contrib/tzdata/asia @@ -2457,18 +2457,33 @@ Zone Asia/Amman 2:23:44 - LMT 1931 # effective December 21st, 2018.... # http://adilet.zan.kz/rus/docs/P1800000817 (russian language). +# From Zhanbolat Raimbekov (2024-01-19): +# Kazakhstan (all parts) switching to UTC+5 on March 1, 2024 +# https://www.gov.kz/memleket/entities/mti/press/news/details/688998?lang=ru +# [in Russian] +# (2024-01-20): https://primeminister.kz/ru/decisions/19012024-20 +# +# From Alexander Krivenyshev (2024-01-19): +# According to a different news and the official web site for the Ministry of +# Trade and Integration of the Republic of Kazakhstan: +# https://en.inform.kz/news/kazakhstan-to-switch-to-single-hour-zone-mar-1-54ad0b/ + # Zone NAME STDOFF RULES FORMAT [UNTIL] # # Almaty (formerly Alma-Ata), representing most locations in Kazakhstan -# This includes KZ-AKM, KZ-ALA, KZ-ALM, KZ-AST, KZ-BAY, KZ-VOS, KZ-ZHA, -# KZ-KAR, KZ-SEV, KZ-PAV, and KZ-YUZ. +# This includes Abai/Abay (ISO 3166-2 code KZ-10), Aqmola/Akmola (KZ-11), +# Almaty (KZ-19), Almaty city (KZ-75), Astana city (KZ-71), +# East Kazkhstan (KZ-63), Jambyl/Zhambyl (KZ-31), Jetisu/Zhetysu (KZ-33), +# Karaganda (KZ-35), North Kazakhstan (KZ-59), Pavlodar (KZ-55), +# Shyumkent city (KZ-79), Turkistan (KZ-61), and Ulytau (KZ-62). Zone Asia/Almaty 5:07:48 - LMT 1924 May 2 # or Alma-Ata 5:00 - +05 1930 Jun 21 6:00 RussiaAsia +06/+07 1991 Mar 31 2:00s 5:00 RussiaAsia +05/+06 1992 Jan 19 2:00s 6:00 RussiaAsia +06/+07 2004 Oct 31 2:00s - 6:00 - +06 -# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-KZY) + 6:00 - +06 2024 Mar 1 0:00 + 5:00 - +05 +# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-43) Zone Asia/Qyzylorda 4:21:52 - LMT 1924 May 2 4:00 - +04 1930 Jun 21 5:00 - +05 1981 Apr 1 @@ -2481,8 +2496,7 @@ Zone Asia/Qyzylorda 4:21:52 - LMT 1924 May 2 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s 6:00 - +06 2018 Dec 21 0:00 5:00 - +05 -# -# Qostanay (aka Kostanay, Kustanay) (KZ-KUS) +# Qostanay (aka Kostanay, Kustanay) (KZ-39) # The 1991/2 rules are unclear partly because of the 1997 Turgai # reorganization. Zone Asia/Qostanay 4:14:28 - LMT 1924 May 2 @@ -2493,9 +2507,9 @@ Zone Asia/Qostanay 4:14:28 - LMT 1924 May 2 5:00 RussiaAsia +05/+06 1991 Mar 31 2:00s 4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s - 6:00 - +06 - -# Aqtöbe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT) + 6:00 - +06 2024 Mar 1 0:00 + 5:00 - +05 +# Aqtöbe (aka Aktobe, formerly Aktyubinsk) (KZ-15) Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2 4:00 - +04 1930 Jun 21 5:00 - +05 1981 Apr 1 @@ -2505,7 +2519,7 @@ Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2 4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s 5:00 - +05 -# Mangghystaū (KZ-MAN) +# Mangghystaū (KZ-47) # Aqtau was not founded until 1963, but it represents an inhabited region, # so include timestamps before 1963. Zone Asia/Aqtau 3:21:04 - LMT 1924 May 2 @@ -2517,7 +2531,7 @@ Zone Asia/Aqtau 3:21:04 - LMT 1924 May 2 5:00 RussiaAsia +05/+06 1994 Sep 25 2:00s 4:00 RussiaAsia +04/+05 2004 Oct 31 2:00s 5:00 - +05 -# Atyraū (KZ-ATY) is like Mangghystaū except it switched from +# Atyraū (KZ-23) is like Mangghystaū except it switched from # +04/+05 to +05/+06 in spring 1999, not fall 1994. Zone Asia/Atyrau 3:27:44 - LMT 1924 May 2 3:00 - +03 1930 Jun 21 @@ -2528,7 +2542,7 @@ Zone Asia/Atyrau 3:27:44 - LMT 1924 May 2 5:00 RussiaAsia +05/+06 1999 Mar 28 2:00s 4:00 RussiaAsia +04/+05 2004 Oct 31 2:00s 5:00 - +05 -# West Kazakhstan (KZ-ZAP) +# West Kazakhstan (KZ-27) # From Paul Eggert (2016-03-18): # The 1989 transition is from USSR act No. 227 (1989-03-14). Zone Asia/Oral 3:25:24 - LMT 1924 May 2 # or Ural'sk @@ -3430,19 +3444,26 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # ... winter time will begin in Palestine from Saturday 10-28-2023, # 02:00 AM by 60 minutes back. # -# From Paul Eggert (2023-03-22): +# From Heba Hamad (2024-01-25): +# the summer time for the years 2024,2025 will begin in Palestine +# from Saturday at 02:00 AM by 60 minutes forward as shown below: +# year date +# 2024 2024-04-20 +# 2025 2025-04-12 +# +# From Paul Eggert (2024-01-25): # For now, guess that spring and fall transitions will normally # continue to use 2022's rules, that during DST Palestine will switch # to standard time at 02:00 the last Saturday before Ramadan and back -# to DST at 02:00 the first Saturday after Ramadan, and that +# to DST at 02:00 the second Saturday after Ramadan, and that # if the normal spring-forward or fall-back transition occurs during # Ramadan the former is delayed and the latter advanced. # To implement this, I predicted Ramadan-oriented transition dates for -# 2023 through 2086 by running the following program under GNU Emacs 28.2, +# 2026 through 2086 by running the following program under GNU Emacs 29.2, # with the results integrated by hand into the table below. # Predictions after 2086 are approximated without Ramadan. # -# (let ((islamic-year 1444)) +# (let ((islamic-year 1447)) # (require 'cal-islam) # (while (< islamic-year 1510) # (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) @@ -3451,6 +3472,7 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # (while (/= saturday (mod (setq a (1- a)) 7))) # (while (/= saturday (mod b 7)) # (setq b (1+ b))) +# (setq b (+ 7 b)) # (setq a (calendar-gregorian-from-absolute a)) # (setq b (calendar-gregorian-from-absolute b)) # (insert @@ -3501,84 +3523,84 @@ Rule Palestine 2021 only - Oct 29 1:00 0 - Rule Palestine 2022 only - Mar 27 0:00 1:00 S Rule Palestine 2022 2035 - Oct Sat<=30 2:00 0 - Rule Palestine 2023 only - Apr 29 2:00 1:00 S -Rule Palestine 2024 only - Apr 13 2:00 1:00 S -Rule Palestine 2025 only - Apr 5 2:00 1:00 S +Rule Palestine 2024 only - Apr 20 2:00 1:00 S +Rule Palestine 2025 only - Apr 12 2:00 1:00 S Rule Palestine 2026 2054 - Mar Sat<=30 2:00 1:00 S Rule Palestine 2036 only - Oct 18 2:00 0 - Rule Palestine 2037 only - Oct 10 2:00 0 - Rule Palestine 2038 only - Sep 25 2:00 0 - Rule Palestine 2039 only - Sep 17 2:00 0 - -Rule Palestine 2039 only - Oct 22 2:00 1:00 S -Rule Palestine 2039 2067 - Oct Sat<=30 2:00 0 - Rule Palestine 2040 only - Sep 1 2:00 0 - -Rule Palestine 2040 only - Oct 13 2:00 1:00 S +Rule Palestine 2040 only - Oct 20 2:00 1:00 S +Rule Palestine 2040 2067 - Oct Sat<=30 2:00 0 - Rule Palestine 2041 only - Aug 24 2:00 0 - -Rule Palestine 2041 only - Sep 28 2:00 1:00 S +Rule Palestine 2041 only - Oct 5 2:00 1:00 S Rule Palestine 2042 only - Aug 16 2:00 0 - -Rule Palestine 2042 only - Sep 20 2:00 1:00 S +Rule Palestine 2042 only - Sep 27 2:00 1:00 S Rule Palestine 2043 only - Aug 1 2:00 0 - -Rule Palestine 2043 only - Sep 12 2:00 1:00 S +Rule Palestine 2043 only - Sep 19 2:00 1:00 S Rule Palestine 2044 only - Jul 23 2:00 0 - -Rule Palestine 2044 only - Aug 27 2:00 1:00 S +Rule Palestine 2044 only - Sep 3 2:00 1:00 S Rule Palestine 2045 only - Jul 15 2:00 0 - -Rule Palestine 2045 only - Aug 19 2:00 1:00 S +Rule Palestine 2045 only - Aug 26 2:00 1:00 S Rule Palestine 2046 only - Jun 30 2:00 0 - -Rule Palestine 2046 only - Aug 11 2:00 1:00 S +Rule Palestine 2046 only - Aug 18 2:00 1:00 S Rule Palestine 2047 only - Jun 22 2:00 0 - -Rule Palestine 2047 only - Jul 27 2:00 1:00 S +Rule Palestine 2047 only - Aug 3 2:00 1:00 S Rule Palestine 2048 only - Jun 6 2:00 0 - -Rule Palestine 2048 only - Jul 18 2:00 1:00 S +Rule Palestine 2048 only - Jul 25 2:00 1:00 S Rule Palestine 2049 only - May 29 2:00 0 - -Rule Palestine 2049 only - Jul 3 2:00 1:00 S +Rule Palestine 2049 only - Jul 10 2:00 1:00 S Rule Palestine 2050 only - May 21 2:00 0 - -Rule Palestine 2050 only - Jun 25 2:00 1:00 S +Rule Palestine 2050 only - Jul 2 2:00 1:00 S Rule Palestine 2051 only - May 6 2:00 0 - -Rule Palestine 2051 only - Jun 17 2:00 1:00 S +Rule Palestine 2051 only - Jun 24 2:00 1:00 S Rule Palestine 2052 only - Apr 27 2:00 0 - -Rule Palestine 2052 only - Jun 1 2:00 1:00 S +Rule Palestine 2052 only - Jun 8 2:00 1:00 S Rule Palestine 2053 only - Apr 12 2:00 0 - -Rule Palestine 2053 only - May 24 2:00 1:00 S +Rule Palestine 2053 only - May 31 2:00 1:00 S Rule Palestine 2054 only - Apr 4 2:00 0 - -Rule Palestine 2054 only - May 16 2:00 1:00 S -Rule Palestine 2055 only - May 1 2:00 1:00 S -Rule Palestine 2056 only - Apr 22 2:00 1:00 S -Rule Palestine 2057 only - Apr 7 2:00 1:00 S -Rule Palestine 2058 max - Mar Sat<=30 2:00 1:00 S +Rule Palestine 2054 only - May 23 2:00 1:00 S +Rule Palestine 2055 only - May 8 2:00 1:00 S +Rule Palestine 2056 only - Apr 29 2:00 1:00 S +Rule Palestine 2057 only - Apr 14 2:00 1:00 S +Rule Palestine 2058 only - Apr 6 2:00 1:00 S +Rule Palestine 2059 max - Mar Sat<=30 2:00 1:00 S Rule Palestine 2068 only - Oct 20 2:00 0 - Rule Palestine 2069 only - Oct 12 2:00 0 - Rule Palestine 2070 only - Oct 4 2:00 0 - Rule Palestine 2071 only - Sep 19 2:00 0 - Rule Palestine 2072 only - Sep 10 2:00 0 - -Rule Palestine 2072 only - Oct 15 2:00 1:00 S +Rule Palestine 2072 only - Oct 22 2:00 1:00 S Rule Palestine 2072 max - Oct Sat<=30 2:00 0 - Rule Palestine 2073 only - Sep 2 2:00 0 - -Rule Palestine 2073 only - Oct 7 2:00 1:00 S +Rule Palestine 2073 only - Oct 14 2:00 1:00 S Rule Palestine 2074 only - Aug 18 2:00 0 - -Rule Palestine 2074 only - Sep 29 2:00 1:00 S +Rule Palestine 2074 only - Oct 6 2:00 1:00 S Rule Palestine 2075 only - Aug 10 2:00 0 - -Rule Palestine 2075 only - Sep 14 2:00 1:00 S +Rule Palestine 2075 only - Sep 21 2:00 1:00 S Rule Palestine 2076 only - Jul 25 2:00 0 - -Rule Palestine 2076 only - Sep 5 2:00 1:00 S +Rule Palestine 2076 only - Sep 12 2:00 1:00 S Rule Palestine 2077 only - Jul 17 2:00 0 - -Rule Palestine 2077 only - Aug 28 2:00 1:00 S +Rule Palestine 2077 only - Sep 4 2:00 1:00 S Rule Palestine 2078 only - Jul 9 2:00 0 - -Rule Palestine 2078 only - Aug 13 2:00 1:00 S +Rule Palestine 2078 only - Aug 20 2:00 1:00 S Rule Palestine 2079 only - Jun 24 2:00 0 - -Rule Palestine 2079 only - Aug 5 2:00 1:00 S +Rule Palestine 2079 only - Aug 12 2:00 1:00 S Rule Palestine 2080 only - Jun 15 2:00 0 - -Rule Palestine 2080 only - Jul 20 2:00 1:00 S +Rule Palestine 2080 only - Jul 27 2:00 1:00 S Rule Palestine 2081 only - Jun 7 2:00 0 - -Rule Palestine 2081 only - Jul 12 2:00 1:00 S +Rule Palestine 2081 only - Jul 19 2:00 1:00 S Rule Palestine 2082 only - May 23 2:00 0 - -Rule Palestine 2082 only - Jul 4 2:00 1:00 S +Rule Palestine 2082 only - Jul 11 2:00 1:00 S Rule Palestine 2083 only - May 15 2:00 0 - -Rule Palestine 2083 only - Jun 19 2:00 1:00 S +Rule Palestine 2083 only - Jun 26 2:00 1:00 S Rule Palestine 2084 only - Apr 29 2:00 0 - -Rule Palestine 2084 only - Jun 10 2:00 1:00 S +Rule Palestine 2084 only - Jun 17 2:00 1:00 S Rule Palestine 2085 only - Apr 21 2:00 0 - -Rule Palestine 2085 only - Jun 2 2:00 1:00 S +Rule Palestine 2085 only - Jun 9 2:00 1:00 S Rule Palestine 2086 only - Apr 13 2:00 0 - -Rule Palestine 2086 only - May 18 2:00 1:00 S +Rule Palestine 2086 only - May 25 2:00 1:00 S # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -3606,7 +3628,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct # Philippines -# From Paul Eggert (2018-11-18): +# From Paul Eggert (2024-01-21): # The Spanish initially used American (west-of-Greenwich) time. # It is unknown what time Manila kept when the British occupied it from # 1762-10-06 through 1764-04; for now assume it kept American time. @@ -3614,7 +3636,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct # Philippines, issued a proclamation announcing that 1844-12-30 was to # be immediately followed by 1845-01-01; see R.H. van Gent's # History of the International Date Line -# https://www.staff.science.uu.nl/~gent0113/idl/idl_philippines.htm +# https://webspace.science.uu.nl/~gent0113/idl/idl_philippines.htm # The rest of the data entries are from Shanks & Pottenger. # From Jesper Nørgaard Welen (2006-04-26): @@ -4041,7 +4063,8 @@ Zone Asia/Tashkent 4:37:11 - LMT 1924 May 2 # The English-language name of Vietnam's most populous city is "Ho Chi Minh # City"; use Ho_Chi_Minh below to avoid a name of more than 14 characters. -# From Paul Eggert (2022-07-27) after a 2014 heads-up from Trần Ngọc Quân: +# From Paul Eggert (2024-01-14) after a 2014 heads-up from Trần Ngọc Quân +# and a 2024-01-14 heads-up from Đoàn Trần Công Danh: # Trần Tiến Bình's authoritative book "Lịch Việt Nam: thế kỷ XX-XXI (1901-2100)" # (Nhà xuất bản Văn Hoá - Thông Tin, Hanoi, 2005), pp 49-50, # is quoted verbatim in: @@ -4071,14 +4094,35 @@ Zone Asia/Tashkent 4:37:11 - LMT 1924 May 2 # # Trần cites the following sources; it's unclear which supplied the info above. # -# Hoàng Xuân Hãn: "Lịch và lịch Việt Nam". Tập san Khoa học Xã hội, -# No. 9, Paris, February 1982. +# Hoàng Xuân Hãn: "Lịch và lịch Việt Nam". Tập san Khoa học Xã hội, +# No. 9, Paris, February 1982. +# +# Lê Thành Lân: "Lịch và niên biểu lịch sử hai mươi thế kỷ (0001-2010)", +# NXB Thống kê, Hanoi, 2000. # -# Lê Thành Lân: "Lịch và niên biểu lịch sử hai mươi thế kỷ (0001-2010)", -# NXB Thống kê, Hanoi, 2000. +# Lê Thành Lân: "Lịch hai thế kỷ (1802-2010) và các lịch vĩnh cửu", +# NXB Thuận Hoá, Huế, 1995. # -# Lê Thành Lân: "Lịch hai thế kỷ (1802-2010) và các lịch vĩnh cửu", -# NXB Thuận Hoá, Huế, 1995. +# Here is the decision for the September 1945 transition: +# Võ Nguyên Giáp, Việt Nam Dân Quốc Công Báo, No. 1 (1945-09-29), page 13 +# http://baochi.nlv.gov.vn/baochi/cgi-bin/baochi?a=d&d=JwvzO19450929.2.5&dliv=none +# It says that on 1945-09-01 at 24:00, Vietnam moved back two hours, to +07. +# It also mentions a 1945-03-29 decree (by a Japanese Goveror-General) +# to set the time zone to +09, but does not say whether that decree +# merely legalized an earlier change to +09. +# +# July 1955 transition: +# Ngô Đình Diệm, Công Báo Việt Nam, No. 92 (1955-07-02), page 1780-1781 +# Ordinance (Dụ) No. 46 (1955-06-25) +# http://ddsnext.crl.edu/titles/32341#?c=0&m=29&s=0&cv=4&r=0&xywh=-89%2C342%2C1724%2C1216 +# It says that on 1955-07-01 at 01:00, South Vietnam moved back 1 hour (to +07). +# +# December 1959 transition: +# Ngô Đình Diệm, Công Báo Việt Nam Cộng Hòa, 1960 part 1 (1960-01-02), page 62 +# Decree (Sắc lệnh) No. 362-TTP (1959-12-30) +# http://ddsnext.crl.edu/titles/32341#?c=0&m=138&s=0&cv=793&r=0&xywh=-54%2C1504%2C1705%2C1202 +# It says that on 1959-12-31 at 23:00, South Vietnam moved forward 1 hour (to +08). + # Zone NAME STDOFF RULES FORMAT [UNTIL] #STDOFF 7:06:30.13 @@ -4086,9 +4130,9 @@ Zone Asia/Ho_Chi_Minh 7:06:30 - LMT 1906 Jul 1 7:06:30 - PLMT 1911 May 1 # Phù Liễn MT 7:00 - +07 1942 Dec 31 23:00 8:00 - +08 1945 Mar 14 23:00 - 9:00 - +09 1945 Sep 2 + 9:00 - +09 1945 Sep 1 24:00 7:00 - +07 1947 Apr 1 - 8:00 - +08 1955 Jul 1 + 8:00 - +08 1955 Jul 1 01:00 7:00 - +07 1959 Dec 31 23:00 8:00 - +08 1975 Jun 13 7:00 - +07 diff --git a/contrib/tzdata/australasia b/contrib/tzdata/australasia index dc98c1e2de17..0e9c2592e4be 100644 --- a/contrib/tzdata/australasia +++ b/contrib/tzdata/australasia @@ -420,11 +420,11 @@ Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva # French Polynesia # Zone NAME STDOFF RULES FORMAT [UNTIL] -Zone Pacific/Gambier -8:59:48 - LMT 1912 Oct # Rikitea +Zone Pacific/Gambier -8:59:48 - LMT 1912 Oct 1 # Rikitea -9:00 - -09 -Zone Pacific/Marquesas -9:18:00 - LMT 1912 Oct +Zone Pacific/Marquesas -9:18:00 - LMT 1912 Oct 1 -9:30 - -0930 -Zone Pacific/Tahiti -9:58:16 - LMT 1912 Oct # Papeete +Zone Pacific/Tahiti -9:58:16 - LMT 1912 Oct 1 # Papeete -10:00 - -10 # Clipperton (near North America) is administered from French Polynesia; # it is uninhabited. @@ -802,7 +802,7 @@ Zone Pacific/Apia 12:33:04 - LMT 1892 Jul 5 # Solomon Is # excludes Bougainville, for which see Papua New Guinea # Zone NAME STDOFF RULES FORMAT [UNTIL] -Zone Pacific/Guadalcanal 10:39:48 - LMT 1912 Oct # Honiara +Zone Pacific/Guadalcanal 10:39:48 - LMT 1912 Oct 1 # Honiara 11:00 - +11 # Tokelau @@ -963,6 +963,10 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila # Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94. # https://www.jstor.org/stable/1774359 # +# For the 1911/1912 establishment of standard time in French possessions, see: +# Société Française de Physique, Recueil de constantes physiques (1913), +# page 752, 18b. +# # A reliable and entertaining source about time zones is # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). # @@ -2039,7 +2043,7 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila # ordaining - by a masterpiece of diplomatic flattery - that # the Fourth of July should be celebrated twice in that year." # This happened in 1892, according to the Evening News (Sydney) of 1892-07-20. -# https://www.staff.science.uu.nl/~gent0113/idl/idl.htm +# https://webspace.science.uu.nl/~gent0113/idl/idl_alaska_samoa.htm # Although Shanks & Pottenger says they both switched to UT -11:30 # in 1911, and to -11 in 1950. many earlier sources give -11 diff --git a/contrib/tzdata/checknow.awk b/contrib/tzdata/checknow.awk index d722c03fd689..57ff3c02e789 100644 --- a/contrib/tzdata/checknow.awk +++ b/contrib/tzdata/checknow.awk @@ -45,7 +45,7 @@ END { for (zone in zone_data) { data = zone_data[zone] if (!zonenow[data]) { - printf "checknow.tab should have one of:%s\n", zones[data] + printf "zonenow.tab should have one of:%s\n", zones[data] zonenow[data] = zone # This suppresses duplicate diagnostics. status = 1 } diff --git a/contrib/tzdata/etcetera b/contrib/tzdata/etcetera index 865a220c1f4b..29fbed9b9290 100644 --- a/contrib/tzdata/etcetera +++ b/contrib/tzdata/etcetera @@ -5,7 +5,7 @@ # These entries are for uses not otherwise covered by the tz database. # Their main practical use is for platforms like Android that lack -# support for POSIX-style TZ strings. On such platforms these entries +# support for POSIX.1-2017-style TZ strings. On such platforms these entries # can be useful if the timezone database is wrong or if a ship or # aircraft at sea is not in a timezone. diff --git a/contrib/tzdata/europe b/contrib/tzdata/europe index 27f821e77600..c6b5270316b9 100644 --- a/contrib/tzdata/europe +++ b/contrib/tzdata/europe @@ -990,9 +990,34 @@ Zone Europe/Sofia 1:33:16 - LMT 1880 # Czech Republic (Czechia) # Slovakia # -# From Paul Eggert (2018-04-15): -# The source for Czech data is: Kdy začíná a končí letní čas. 2018-04-15. +# From Ivan Benovic (2024-01-30): +# https://www.slov-lex.sk/pravne-predpisy/SK/ZZ/1946/54/ +# (This is an official link to the Czechoslovak Summer Time Act of +# March 8, 1946 that authorizes the Czechoslovak government to set the +# exact dates of change to summer time and back to Central European Time. +# The act also implicitly confirms Central European Time as the +# official time zone of Czechoslovakia and currently remains in force +# in both the Czech Republic and Slovakia.) +# https://www.psp.cz/eknih/1945pns/tisky/t0216_00.htm +# (This is a link to the original legislative proposal dating back to +# February 22, 1946. The accompanying memorandum to the proposal says +# that an advisory committee on European railroad transportation that +# met in Brussels in October 1945 decided that the change of time +# should be carried out in all participating countries in a strictly +# coordinated manner....) +# +# From Paul Eggert (2024-01-30): +# The source for Czech data is: Kdy začíná a končí letní čas. # https://kalendar.beda.cz/kdy-zacina-a-konci-letni-cas +# Its main text disagrees with its quoted sources only in 1918, +# where the main text says spring and autumn transitions +# occurred at 02:00 and 03:00 respectively (as usual), +# whereas the 1918 source "Oznámení o zavedení letního času v roce 1918" +# says transitions were at 01:00 and 02:00 respectively. +# As the 1918 source appears to be a humorous piece, and it is +# unlikely that Prague would have disagreed with its neighbors by an hour, +# go with the main text for now. +# # We know of no English-language name for historical Czech winter time; # abbreviate it as "GMT", as it happened to be GMT. # diff --git a/contrib/tzdata/leap-seconds.list b/contrib/tzdata/leap-seconds.list index 3fe9a1210e3c..e52effc257b2 100644 --- a/contrib/tzdata/leap-seconds.list +++ b/contrib/tzdata/leap-seconds.list @@ -1,255 +1,120 @@ +# ATOMIC TIME. +# The Coordinated Universal Time (UTC) is the reference time scale derived +# from The "Temps Atomique International" (TAI) calculated by the Bureau +# International des Poids et Mesures (BIPM) using a worldwide network of atomic +# clocks. UTC differs from TAI by an integer number of seconds; it is the basis +# of all activities in the world. # -# In the following text, the symbol '#' introduces -# a comment, which continues from that symbol until -# the end of the line. A plain comment line has a -# whitespace character following the comment indicator. -# There are also special comment lines defined below. -# A special comment will always have a non-whitespace -# character in column 2. -# -# A blank line should be ignored. -# -# The following table shows the corrections that must -# be applied to compute International Atomic Time (TAI) -# from the Coordinated Universal Time (UTC) values that -# are transmitted by almost all time services. -# -# The first column shows an epoch as a number of seconds -# since 1 January 1900, 00:00:00 (1900.0 is also used to -# indicate the same epoch.) Both of these time stamp formats -# ignore the complexities of the time scales that were -# used before the current definition of UTC at the start -# of 1972. (See note 3 below.) -# The second column shows the number of seconds that -# must be added to UTC to compute TAI for any timestamp -# at or after that epoch. The value on each line is -# valid from the indicated initial instant until the -# epoch given on the next one or indefinitely into the -# future if there is no next line. -# (The comment on each line shows the representation of -# the corresponding initial epoch in the usual -# day-month-year format. The epoch always begins at -# 00:00:00 UTC on the indicated day. See Note 5 below.) -# -# Important notes: -# -# 1. Coordinated Universal Time (UTC) is often referred to -# as Greenwich Mean Time (GMT). The GMT time scale is no -# longer used, and the use of GMT to designate UTC is -# discouraged. -# -# 2. The UTC time scale is realized by many national -# laboratories and timing centers. Each laboratory -# identifies its realization with its name: Thus -# UTC(NIST), UTC(USNO), etc. The differences among -# these different realizations are typically on the -# order of a few nanoseconds (i.e., 0.000 000 00x s) -# and can be ignored for many purposes. These differences -# are tabulated in Circular T, which is published monthly -# by the International Bureau of Weights and Measures -# (BIPM). See www.bipm.org for more information. -# -# 3. The current definition of the relationship between UTC -# and TAI dates from 1 January 1972. A number of different -# time scales were in use before that epoch, and it can be -# quite difficult to compute precise timestamps and time -# intervals in those "prehistoric" days. For more information, -# consult: -# -# The Explanatory Supplement to the Astronomical -# Ephemeris. -# or -# Terry Quinn, "The BIPM and the Accurate Measurement -# of Time," Proc. of the IEEE, Vol. 79, pp. 894-905, -# July, 1991. -# reprinted in: -# Christine Hackman and Donald B Sullivan (eds.) -# Time and Frequency Measurement -# American Association of Physics Teachers (1996) -# , pp. 75-86 -# -# 4. The decision to insert a leap second into UTC is currently -# the responsibility of the International Earth Rotation and -# Reference Systems Service. (The name was changed from the -# International Earth Rotation Service, but the acronym IERS -# is still used.) -# -# Leap seconds are announced by the IERS in its Bulletin C. -# -# See www.iers.org for more details. -# -# Every national laboratory and timing center uses the -# data from the BIPM and the IERS to construct UTC(lab), -# their local realization of UTC. -# -# Although the definition also includes the possibility -# of dropping seconds ("negative" leap seconds), this has -# never been done and is unlikely to be necessary in the -# foreseeable future. -# -# 5. If your system keeps time as the number of seconds since -# some epoch (e.g., NTP timestamps), then the algorithm for -# assigning a UTC time stamp to an event that happens during a positive -# leap second is not well defined. The official name of that leap -# second is 23:59:60, but there is no way of representing that time -# in these systems. -# Many systems of this type effectively stop the system clock for -# one second during the leap second and use a time that is equivalent -# to 23:59:59 UTC twice. For these systems, the corresponding TAI -# timestamp would be obtained by advancing to the next entry in the -# following table when the time equivalent to 23:59:59 UTC -# is used for the second time. Thus the leap second which -# occurred on 30 June 1972 at 23:59:59 UTC would have TAI -# timestamps computed as follows: -# -# ... -# 30 June 1972 23:59:59 (2287785599, first time): TAI= UTC + 10 seconds -# 30 June 1972 23:59:60 (2287785599,second time): TAI= UTC + 11 seconds -# 1 July 1972 00:00:00 (2287785600) TAI= UTC + 11 seconds -# ... -# -# If your system realizes the leap second by repeating 00:00:00 UTC twice -# (this is possible but not usual), then the advance to the next entry -# in the table must occur the second time that a time equivalent to -# 00:00:00 UTC is used. Thus, using the same example as above: -# -# ... -# 30 June 1972 23:59:59 (2287785599): TAI= UTC + 10 seconds -# 30 June 1972 23:59:60 (2287785600, first time): TAI= UTC + 10 seconds -# 1 July 1972 00:00:00 (2287785600,second time): TAI= UTC + 11 seconds -# ... -# -# in both cases the use of timestamps based on TAI produces a smooth -# time scale with no discontinuity in the time interval. However, -# although the long-term behavior of the time scale is correct in both -# methods, the second method is technically not correct because it adds -# the extra second to the wrong day. -# -# This complexity would not be needed for negative leap seconds (if they -# are ever used). The UTC time would skip 23:59:59 and advance from -# 23:59:58 to 00:00:00 in that case. The TAI offset would decrease by -# 1 second at the same instant. This is a much easier situation to deal -# with, since the difficulty of unambiguously representing the epoch -# during the leap second does not arise. -# -# Some systems implement leap seconds by amortizing the leap second -# over the last few minutes of the day. The frequency of the local -# clock is decreased (or increased) to realize the positive (or -# negative) leap second. This method removes the time step described -# above. Although the long-term behavior of the time scale is correct -# in this case, this method introduces an error during the adjustment -# period both in time and in frequency with respect to the official -# definition of UTC. -# -# Questions or comments to: -# Judah Levine -# Time and Frequency Division -# NIST -# Boulder, Colorado -# Judah.Levine@nist.gov -# -# Last Update of leap second values: 8 July 2016 -# -# The following line shows this last update date in NTP timestamp -# format. This is the date on which the most recent change to -# the leap second data was added to the file. This line can -# be identified by the unique pair of characters in the first two -# columns as shown below. -# -#$ 3676924800 -# -# The NTP timestamps are in units of seconds since the NTP epoch, -# which is 1 January 1900, 00:00:00. The Modified Julian Day number -# corresponding to the NTP time stamp, X, can be computed as -# -# X/86400 + 15020 -# -# where the first term converts seconds to days and the second -# term adds the MJD corresponding to the time origin defined above. -# The integer portion of the result is the integer MJD for that -# day, and any remainder is the time of day, expressed as the -# fraction of the day since 0 hours UTC. The conversion from day -# fraction to seconds or to hours, minutes, and seconds may involve -# rounding or truncation, depending on the method used in the -# computation. -# -# The data in this file will be updated periodically as new leap -# seconds are announced. In addition to being entered on the line -# above, the update time (in NTP format) will be added to the basic -# file name leap-seconds to form the name leap-seconds.. -# In addition, the generic name leap-seconds.list will always point to -# the most recent version of the file. -# -# This update procedure will be performed only when a new leap second -# is announced. -# -# The following entry specifies the expiration date of the data -# in this file in units of seconds since the origin at the instant -# 1 January 1900, 00:00:00. This expiration date will be changed -# at least twice per year whether or not a new leap second is -# announced. These semi-annual changes will be made no later -# than 1 June and 1 December of each year to indicate what -# action (if any) is to be taken on 30 June and 31 December, -# respectively. (These are the customary effective dates for new -# leap seconds.) This expiration date will be identified by a -# unique pair of characters in columns 1 and 2 as shown below. -# In the unlikely event that a leap second is announced with an -# effective date other than 30 June or 31 December, then this -# file will be edited to include that leap second as soon as it is -# announced or at least one month before the effective date -# (whichever is later). -# If an announcement by the IERS specifies that no leap second is -# scheduled, then only the expiration date of the file will -# be advanced to show that the information in the file is still -# current -- the update time stamp, the data and the name of the file -# will not change. -# -# Updated through IERS Bulletin C66 -# File expires on: 28 June 2024 -# -#@ 3928521600 -# -2272060800 10 # 1 Jan 1972 -2287785600 11 # 1 Jul 1972 -2303683200 12 # 1 Jan 1973 -2335219200 13 # 1 Jan 1974 -2366755200 14 # 1 Jan 1975 -2398291200 15 # 1 Jan 1976 -2429913600 16 # 1 Jan 1977 -2461449600 17 # 1 Jan 1978 -2492985600 18 # 1 Jan 1979 -2524521600 19 # 1 Jan 1980 -2571782400 20 # 1 Jul 1981 -2603318400 21 # 1 Jul 1982 -2634854400 22 # 1 Jul 1983 -2698012800 23 # 1 Jul 1985 -2776982400 24 # 1 Jan 1988 -2840140800 25 # 1 Jan 1990 -2871676800 26 # 1 Jan 1991 -2918937600 27 # 1 Jul 1992 -2950473600 28 # 1 Jul 1993 -2982009600 29 # 1 Jul 1994 -3029443200 30 # 1 Jan 1996 -3076704000 31 # 1 Jul 1997 -3124137600 32 # 1 Jan 1999 -3345062400 33 # 1 Jan 2006 -3439756800 34 # 1 Jan 2009 -3550089600 35 # 1 Jul 2012 -3644697600 36 # 1 Jul 2015 -3692217600 37 # 1 Jan 2017 -# -# the following special comment contains the -# hash value of the data in this file computed -# use the secure hash algorithm as specified -# by FIPS 180-1. See the files in ~/pub/sha for -# the details of how this hash value is -# computed. Note that the hash computation -# ignores comments and whitespace characters -# in data lines. It includes the NTP values *** 599 LINES SKIPPED *** From nobody Wed Feb 14 06:06:02 2024 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 4TZSP70W31z5B56Q; Wed, 14 Feb 2024 06:06: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 4TZSP65Ksmz4Rnx; Wed, 14 Feb 2024 06:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890762; 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=zzc64vWj6ScZDNEMu8TYjGuX+gor7n5wL3+o3j/pctA=; b=kjjAP1I0WOa+PEnsWfuNDBVTEsSGbzfsmYhg4UFLPbmIu+te+huh++yQOuuGx85QrNJpu4 B4nYtBYtN6stByRnsxBCz1+RwwlpEYXUnBvf+e+GgUCc+7oRpVbqFlwOAgy7JNvnySaANL L9gtcyh1078l2hCyx6t+jGdMki0Gt9idxOLD5BuMiGyl7w97vN02sBj683gEixcrsBcstI iuo0nfb4mUjObrw4ssxmY+7TpBi9VVmleZRi6SeygZNQYje4E0zFFxoR//G7rpryTa7oEl bFvKmHLqBd5rF0+RfaabdcCPRxelOXATGqR6U1JXGv2ai2ch6d860uPMhl/boA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707890762; a=rsa-sha256; cv=none; b=XnF0pNArzKFpKbpNqTw+lHTbQVvwihR4FrbUpH7N8sNdTCRaq7cmmH2GoT1tC3lbpuPwCY zrEbY0n9j8/Ek/TpLe4pTHkVnBJlc6sJ3KYP5EaJh9kETJ/N233R0MMdJx+tYN/GkuVgLD qgcd9wUA6alWpiH1mRlkv7H1wIKgtzwI0TdF2nSJ5WExfWbaNPKJT2QW6spC23IiJnmYju dxuPkSnnvyKb+EwrtMNzK9DG7Gv/tdAxHdotv7wR7kyODeTYUeVU6wAV4e/61OTghlfuVk OUl9dU+hnSSuEgVq1uFZDjlsztQAKIJPRBsC+2HrvwqbdNj91Vr+s34zhfnYpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707890762; 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=zzc64vWj6ScZDNEMu8TYjGuX+gor7n5wL3+o3j/pctA=; b=NzlL7tRSRe4AHKcSHe6R8ekmiJtAU1fuWMHyEVj1FOEij7M8evAFm17jFPLNqwMjZ+C/o5 oOmiSYYuRi8PXd4MyxFyFm9OZopTTxQ69eAa71Z7BuVWhy03mF9V+K7JwRxEMyGiWsNo0T /L5nve6miFhVO5Vmuy41IJxvudTt7bFRnNyvINhXODaRv0DmT9RstUwSqMIFcqk/RMUdhG xVB8JVSiswjcNVaYfv+H1uEHYhhGoLiAj9DHL1+B3fVGo3jx5L4IQv5yvjZkAMzMI7K2Tl bVaAlO+zym4pOqYgZkfy1jADrZsqV6fy1tD4nfWy1Va7VWckcS4x2rt9Xv3Keg== 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 4TZSP62zSmzmSk; Wed, 14 Feb 2024 06:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E662ip085320; Wed, 14 Feb 2024 06:06:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E662Ac085317; Wed, 14 Feb 2024 06:06:02 GMT (envelope-from git) Date: Wed, 14 Feb 2024 06:06:02 GMT Message-Id: <202402140606.41E662Ac085317@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 326f58eade21 - releng/13.2 - Add UPDATING entries and bump the branch version. 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 326f58eade217010f78f1f70ff76e0565bfae2b8 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=326f58eade217010f78f1f70ff76e0565bfae2b8 commit 326f58eade217010f78f1f70ff76e0565bfae2b8 Author: Gordon Tetlow AuthorDate: 2024-02-14 06:03:19 +0000 Commit: Gordon Tetlow CommitDate: 2024-02-14 06:03:19 +0000 Add UPDATING entries and bump the branch version. Approved by: so --- UPDATING | 17 +++++++++++++++++ sys/conf/newvers.sh | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 142afbf8e4fa..89a4b7482faa 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,23 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20240214: + 13.2-RELEASE-p10 SA-24:01.bhyveload + SA-24:02.tty + EN-24:01.tzdata + EN-24:02.libutil + EN-24:03.kqueue + + Fix bhyveload host file access [SA-24:01.bhyveload] + + Fix jail information leak [SA-24:02.tty] + + Timezone database information update [EN-24:01.tzdata] + + Fix login class resource limits and CPU mask bypass [EN-24:02.libutil] + + Fix kqueue_close page fault on exit using rfork [EN-24:03.kqueue] + 20231212: 13.2-RELEASE-p9 SA-23:19.openssh diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 35e325add855..e8701ba542fe 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -54,7 +54,7 @@ TYPE="FreeBSD" REVISION="13.2" -BRANCH="RELEASE-p9" +BRANCH="RELEASE-p10" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Wed Feb 14 06:21:07 2024 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 4TZSkX32klz5B69r; Wed, 14 Feb 2024 06:21: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 4TZSkX1j3Xz4XtJ; Wed, 14 Feb 2024 06:21:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707891668; 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=GITrM2ZWbU2JBt/YC3PWUOjMUROV6VxbeMe/A0D9jCs=; b=kXLVTcQU5IT7O5gUvHFjeibaRp7Ljx7qYGZ4RrqisjVNMv/tAJXbGHEdLlVb42+/0l/iu5 oHXDsi0nSrPP+pWBE0Y+oZtpeF5SPZA1yby8CrAEkYsn5PU/nb49X8wq4sy8SMH86WlK2i 8bhYA/1Q/L8rbY5L8+KhGeNyfjQ+ao0oQOyPXY0GD7xwyBP3M5Wh7/N0ERMoKkxxGYkY6y yOvqORrFjY8qDsaX3o6edyfGAPOJr3+0JRNXEM0pK7JE8a0Hlj9Fnk9NQ/Zwlt+LwD9Ymo lpDLwLAvicmpOK1hnwPjnM9qOc62Vhd6X8BHRigGGrp60AErqET6AviMoUqGPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707891668; a=rsa-sha256; cv=none; b=Snou7toH1h8rDiVxsLNUOw5AGKdoXaW1CrtuS+VJbbj8NooiCFgtoPrW1f31gx5ERITzJ9 hNu+WTdTsqNZSe3d6orvZIJqZUFMcSQ8jTVwx+9+2HeCpExkattdeNlYtyhTcBy3XkjRP1 aCR/tOMdKH3F3LbG1vBmARMqSBuHf1u/fl0HcR83RHpiriS0t+ypoNWqrB1nHEERONSHIV MT011RQtihNa3ZOXB0feN9lMURrHpjdVTit10ND7q37nlJZveD7LbJYatN1OGfSEgO1Kwf u003Xgbnv2PrlPmvCxCllNcAIcvUquhoDkIVYoRGgUeA5u/U0xss4DfHSsJijg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707891668; 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=GITrM2ZWbU2JBt/YC3PWUOjMUROV6VxbeMe/A0D9jCs=; b=cOecIQwJ/fTlCIJbXTsb5OJcFCITLgs0odd8p+F92CpqLTJ+IzOfAX20yXbrtpdY2Tdykf 9v3pZYgiZfHylLvwO2cUTJabC2HoSG2VQXlizJiq+hxlifcRRjmWT0jZOhqfCQA1H3+I9/ FV0GYC3XH7t+bWOxeXokzc0VexjJCFpNRfbx2vL57kSB72FNRzx8/XcgS2qWoZ9fGUOiIJ oQP50zAG4UWikJ5xGxlhbVi6sEFs+t8bnY9+/ZGv/EsByNitVXRpgadql9+Kz0UZ7qVH27 rYLHNXSveq9MHrGG44efgXOMYjJzhnw++zZ0WMmCvnpJpt97M307vIBTD4Sl+A== 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 4TZSkX0YLYznDq; Wed, 14 Feb 2024 06:21:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E6L7TM013522; Wed, 14 Feb 2024 06:21:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E6L7M0013519; Wed, 14 Feb 2024 06:21:07 GMT (envelope-from git) Date: Wed, 14 Feb 2024 06:21:07 GMT Message-Id: <202402140621.41E6L7M0013519@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Philip Paeps Subject: git: adfda3c395fa - releng/14.0 - rc.conf: correct $ntp_leapfile_sources 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: philip X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: adfda3c395faf108d76ef7772db3804bee5b228f Auto-Submitted: auto-generated The branch releng/14.0 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=adfda3c395faf108d76ef7772db3804bee5b228f commit adfda3c395faf108d76ef7772db3804bee5b228f Author: Philip Paeps AuthorDate: 2023-12-07 05:48:13 +0000 Commit: Philip Paeps CommitDate: 2024-02-14 06:19:31 +0000 rc.conf: correct $ntp_leapfile_sources IETF is no longer serving leap-seconds.list. Update to the canonical place. This fixes "service ntpd fetch". IERS is the source of truth for leap seconds. Their leapsecond file is updated most quickly and is always right (unlike the IANA one which often lags). IERS operates this public service for the express purpose of random people downloading it. Their terms of service are compatible with open source (we could include this in our release). Rather than fighting with questions around this because the IANA one changed locations or the auto update script broken, just use this. This is in preference to the NIST ftp copy. NIST is in the process of retiring their FTP services. Sponsored by: Netflix Reviewed by: philip, delphij, cy Differential Revision: https://reviews.freebsd.org/D43752 (cherry picked from commit b1c95af45488bef649e9a84890e2414ff80b3a00) (cherry picked from commit 163c4342381530cfc5dc78a457cb1f9e355d687a) (cherry picked from commit 11da791920ba285f0832f09cb504ac81e35ff8d1) (cherry picked from commit ded562d4af9c1a7c6ea48271cbf07a81d7e031c4) Security: FreeBSD-EN-24:01.tzdata Approved by: so (gordon) --- libexec/rc/rc.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index f5d0605c8436..f31efb4e2052 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -421,8 +421,8 @@ ntpd_flags="" # Additional flags to ntpd ntp_src_leapfile="/etc/ntp/leap-seconds" # Initial source for ntpd leapfile ntp_db_leapfile="/var/db/ntpd.leap-seconds.list" - # Working copy (updated weekly) leapfile -ntp_leapfile_sources="https://www.ietf.org/timezones/data/leap-seconds.list" + # Canonical place to get the leap seconds from +ntp_leapfile_sources="https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list" # Source from which to fetch leapfile ntp_leapfile_fetch_opts="-mq" # Options to use for ntp leapfile fetch, # e.g. --no-verify-peer From nobody Wed Feb 14 06:27:47 2024 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 4TZStC4FYbz5B6pg; Wed, 14 Feb 2024 06:27: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 4TZStC2lcsz4Ytn; Wed, 14 Feb 2024 06:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707892067; 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=N+Ibxf7zhG+FPxAKfNyyGWWvVMIDV9Gdqv/mYAmUrkI=; b=JBw/ZJFOg/NPXxlnoYAhHTJ3aZbEru32eX1snBM1rMTLW8xBXqEkrIhxl3HaAV8US7x9w9 OMJArlsqBLB1pfe9VFTFDsBszp6xfsJqK6VyhZifk5sp8r3J+awstZwaWcBjuBneEh1ky+ n7lifZkWzeA707hIMw5m+a/gNxULWJKvS4ve3lYxN52L1++pmAX3oBI+rIvk72bAHGhOQI abLDqzkp1fXkugZfP90H1xybBbfX+C49nKIcsd1aV7QpLQbCsAf4Sf8xipQ6q3zfq6uU2+ W/u056H5Z4fbEt1RsacnYMfuQmtchXyYFje7RzDyq4Yrz9HFiYWiQfPby7uzVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707892067; a=rsa-sha256; cv=none; b=oaziopdVR9Lm6qkpH7l6nKiymOufQnVaytB5l8pBzdL17NNxfZwfbz/cT9jONZAZnS4aY7 bdd13tQcO3zrD81moysCepeD/fvZRCcu8xLkuyjziucb7sEWlBcz14vt7dlIP9mxXqRiHe ta8PAZbizgfmw6lLANwGCkwfCIMmezw2rXGUfK+Agl4Tya/VycEQfLuWqn+ZPimFucSsmM z9B0CKA8YTPFd7InsLyu4n6xV+So9JPyuKHJJUnJXwUV8KpMmESl77mdYWBJBtUavrAXds zcCdk0K1c+bi2205buKgThH8uLB44RXjJkhUbgizmmdkgrF/IMPqdL9tEwgFnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707892067; 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=N+Ibxf7zhG+FPxAKfNyyGWWvVMIDV9Gdqv/mYAmUrkI=; b=Lv5CF8b576nrv1mBNUEXWQARl436vRKa00PeeqGweLoW6uEZqrH9y9mQhiiHPtKrkJqg6s e6+eLPTS0S5PRaGMieHQRBAarsbtpDmar9QmakfaJl1WIhxyJHIPTdi4vw4xnwVvxiKC9x HllVGHmDtTaK+6hbkU4RV4h8hia49AH7JgGD93vIskfqHXDHpKviZ2qp8gFmaaUzgWUxH0 nwjlM4TNGGeXa0WC4mg1MDAOuri29YqgnxkjFrGWOiro0Q9MAOZN0EHdx6e2LFK7AoH1ko 5SLrDqkp2aADM5d7KOSdIQKxIRbfMRICdU8KBbIJmQeq5tkc+xLNTGvbMT1ulQ== 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 4TZStC1s86zncR; Wed, 14 Feb 2024 06:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E6Rlrn019084; Wed, 14 Feb 2024 06:27:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E6Rl0f019081; Wed, 14 Feb 2024 06:27:47 GMT (envelope-from git) Date: Wed, 14 Feb 2024 06:27:47 GMT Message-Id: <202402140627.41E6Rl0f019081@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Philip Paeps Subject: git: 66bb668fe5f2 - releng/13.2 - periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd is enabled. 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: philip X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 66bb668fe5f2561844f5b79251ea42e1bfce9aee Auto-Submitted: auto-generated The branch releng/13.2 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=66bb668fe5f2561844f5b79251ea42e1bfce9aee commit 66bb668fe5f2561844f5b79251ea42e1bfce9aee Author: Xin LI AuthorDate: 2023-12-03 07:00:32 +0000 Commit: Philip Paeps CommitDate: 2024-02-14 06:25:34 +0000 periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd is enabled. The leap-seconds.list is used exclusively by ntpd, therefore, do not bother to perform the fetch when ntpd is not enabled. PR: conf/275419 Reviewed by: cy, michaelo, imp Differential Revision: https://reviews.freebsd.org/D42875 (cherry picked from commit 3b3195f6767b39eb33b3523134ef988931c9c86d) (cherry picked from commit 3ef596c6e80562710da09c16558d7351749ea143) Security: FreeBSD-EN-24:01.tzdata Approved by: so (gordon) --- usr.sbin/periodic/etc/daily/480.leapfile-ntpd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd index a693986e0dd1..f4a1edb8d5a2 100755 --- a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd +++ b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd @@ -13,9 +13,9 @@ fi case "$daily_ntpd_leapfile_enable" in [Yy][Ee][Ss]) - if service ntpd oneneedfetch; then + if service ntpd enabled && service ntpd needfetch; then anticongestion - service ntpd onefetch + service ntpd fetch fi ;; esac From nobody Wed Feb 14 06:27:48 2024 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 4TZStD5nnFz5B7KY; Wed, 14 Feb 2024 06:27:48 +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 4TZStD3plWz4YmV; Wed, 14 Feb 2024 06:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707892068; 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=EOqVECkzY1bBlScMo0RRpST6cHADgvGe/c4CdyUPYms=; b=V/HtY24Un7pmWgxUYF43o2FpbGlHr8aDCeja5x5JoQ6GAr6ptAw+p0BUg0NeqoWOUfF9vE c576umOUndHMCgmhOregvGUYVS0YBEECqR1JUmwPeWy9u+1xUKLESxIEYJR2na6wYt7Cc3 n0iSIjVHSpzHI2JUyNRVCNSBSrtpaFg4yG52dkBJY7ksRByeTofdwrwvhrA7dqjZdgCjD6 q5Ysd1jMnm34beT+aWFTUwTlltrTdYUyIlAN/m67mV0J8Flv3dP9aTzoUb3/h/DqtXRygg weh9LCpzTBV2fErhar+szePt/o5g/ss3kEph4AemTPewtBBQ8S+eaEmKpJt9Dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707892068; a=rsa-sha256; cv=none; b=GgPQEEgVYIWrn0uXhOFJeYQhqCVKTQmQTCrNEGbCZ86Oh7vjz4LcEEqZ8Ld4ZMWTttRcC5 f9q3H1biI/dEZvztXo3gMJ6N3XRgIHbxl6x82sGe1q9gnwklpAlWL/3l6P3xJGPDL2yiAk Wkvkx3w/PVVnqcaJYHEmKf8ZKCcJ+pz8O6zxRKRhkUdvDU0r6Ht/LSzfBpj9fd84+3UZO/ nDrVTevEHrkcwTlUX4Y+dMMDoK3p/kvrwqXcxrt5sLaCBOS+SaqWXLxyUhBnZDqR+O1Bbd 4VEAYIs617SRJwxXPmXmRhblVP6SJ1nYkF/iu/fL6HuD9FsDPqczMzP5lQxu1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707892068; 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=EOqVECkzY1bBlScMo0RRpST6cHADgvGe/c4CdyUPYms=; b=AU692EQ/JMdutVwa11IvlhwCgA5ZJtE9rAn2H9AtiuAGmfUvR5VLyn4YfE5C28Ib7q08sk AwpZ2FY0AGpPiIYr/+saa8R54cbYFMAEsNgDGYqMtGPmiFMGvp1fcnFOsrtn41m2DWXBgk 8p69Go/Ct0F3GZXBzVMRvG0kwSwXR3z7I+UHgpBdkwi4dLXXX1/3m4aj0YNPxA2lrUT4zR JHly9gosw3u0nvv+qzDoA/hX4OqiovPw2FNxF/+7X9HVf/UVAbitplZeisLb4khRw8sRpe 3DitpbTH1Jh3fcBWBl4AIgJIKM3j5DuL/Az8B/FVF/aa1oxOCT3Ys4kd6GrFQA== 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 4TZStD2gGZznC7; Wed, 14 Feb 2024 06:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E6Rmht019121; Wed, 14 Feb 2024 06:27:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E6RmuV019118; Wed, 14 Feb 2024 06:27:48 GMT (envelope-from git) Date: Wed, 14 Feb 2024 06:27:48 GMT Message-Id: <202402140627.41E6RmuV019118@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Philip Paeps Subject: git: a839681443b6 - releng/13.2 - rc.conf: correct $ntp_leapfile_sources 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: philip X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: a839681443b6662571d6b90732baae364c97e9d9 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=a839681443b6662571d6b90732baae364c97e9d9 commit a839681443b6662571d6b90732baae364c97e9d9 Author: Philip Paeps AuthorDate: 2023-12-07 05:48:13 +0000 Commit: Philip Paeps CommitDate: 2024-02-14 06:25:56 +0000 rc.conf: correct $ntp_leapfile_sources IETF is no longer serving leap-seconds.list. Update to the canonical place. This fixes "service ntpd fetch". IERS is the source of truth for leap seconds. Their leapsecond file is updated most quickly and is always right (unlike the IANA one which often lags). IERS operates this public service for the express purpose of random people downloading it. Their terms of service are compatible with open source (we could include this in our release). Rather than fighting with questions around this because the IANA one changed locations or the auto update script broken, just use this. This is in preference to the NIST ftp copy. NIST is in the process of retiring their FTP services. Sponsored by: Netflix Reviewed by: philip, delphij, cy Differential Revision: https://reviews.freebsd.org/D43752 (cherry picked from commit b1c95af45488bef649e9a84890e2414ff80b3a00) (cherry picked from commit 74a8c6da4f28e691c169aa502713a5aaebc00584) (cherry picked from commit 11da791920ba285f0832f09cb504ac81e35ff8d1) (cherry picked from commit 0eea8292ae8c8e9119520ce54aa82cae491d83b9) Security: FreeBSD-EN-24:01.tzdata Approved by: so (gordon) --- libexec/rc/rc.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index af7b6ff6302e..5e1f097d8b23 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -419,8 +419,8 @@ ntpd_flags="" # Additional flags to ntpd ntp_src_leapfile="/etc/ntp/leap-seconds" # Initial source for ntpd leapfile ntp_db_leapfile="/var/db/ntpd.leap-seconds.list" - # Working copy (updated weekly) leapfile -ntp_leapfile_sources="https://www.ietf.org/timezones/data/leap-seconds.list" + # Canonical place to get the leap seconds from +ntp_leapfile_sources="https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list" # Source from which to fetch leapfile ntp_leapfile_fetch_opts="-mq" # Options to use for ntp leapfile fetch, # e.g. --no-verify-peer From nobody Wed Feb 14 17:16:07 2024 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 4TZlGH73Ygz5139K; Wed, 14 Feb 2024 17:16:07 +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 4TZlGH6Rp5z4Gr3; Wed, 14 Feb 2024 17:16:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707930967; 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=ejj5sWTiWRJVfylwAoMGXBW/8/8eYy0L9B8OosSSc84=; b=SADRoSVxkYN7ReyzFQEh2O5D1o292oq7YXJ5hx5iRWNZTSk9xpClSmoin695V/MDMt4ukA HFwlrgle+rBYMfHhAL0WA7gJq91If7zBfOlurhMClhHY6F+q6K6WuDaFQzY88Fb2l3PpJw kLekTrVGQ6EGI6S1amgZqTbKRnxk1IjioUnYzxnOigyPbmMEdDKnhh3gBHbxd3Qicmfi7m dvv7yINFDTiVDUyvmPEAFf4bgmtFE3tyr0cuD9eInlSjNoQAw2Ip1tRdAWkdqVoyMG631s RYMWwnaMH0JXT9boXXckATvyrzgSXUVAgTYuJ3cU45zHJzoG+oQq2QjKh5X0wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707930967; a=rsa-sha256; cv=none; b=RFOm8N7R1uxQr9aFPybNs0vQG4nZ7Wmql00vudlP5qSDta2zo1XNAZJZgawt4ylgdi8K4q FWmVh0qlfvuttAey346SFQn+AkKDu8nFr/J7D6KoeuuUJVyQ1KZDXg4g1CuviZMr9MRFD/ c/2sdBNFZa+VhzUOnxOLir96ZSgeqtdUq+9oLtXXjrRPtmMKBBaJDllhFGJ2vSPuA86baE hzuq+lHiBA5NwnZ5MYW9emJMwxsZDXSucCbDkyN4UZKIBVnWnc+bc5n+fadVtk1il2EmBb sSuVdH6YHYBQJul3PhnGWa2GmHMaezM47h88Djd3Gqeut+OTO5Mg4610SF9fpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707930967; 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=ejj5sWTiWRJVfylwAoMGXBW/8/8eYy0L9B8OosSSc84=; b=EBY8r3uWmeD/e1V4scY9GmctJnumonJMIk5SWIIJarWGcLR6MK2YIA0rWh4ATNcZ/s8n8x Q3a+jrSSx2mENkyXTPgRk89OGiIPtqfNa72ZLEYxu7KnYxN7RcNgCjhtctoTPfrQjO/5qi oCSvf9XTujDM+2iDSB5VHS3iKez85oXlWnVX+6NtTQmXYRIQuI3JQmwPkZ5r4JvHJvEzpX YaXS5xuULjrK+Zz6GPdYm8Ej4Dvn3RWOhC3YMUwpXWCIQQRHkT1ri/CgG2hvqdLqiYNVdf roDGwRmhj8YNbL5qXPHTHuLO5onjvlxy0AQkLisM9TfpxgPcF0LlgZ/gdlApeQ== 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 4TZlGH5Vh6z16K7; Wed, 14 Feb 2024 17:16:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41EHG7fg016149; Wed, 14 Feb 2024 17:16:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EHG7i3016146; Wed, 14 Feb 2024 17:16:07 GMT (envelope-from git) Date: Wed, 14 Feb 2024 17:16:07 GMT Message-Id: <202402141716.41EHG7i3016146@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 090674a3dbf8 - stable/14 - csu: add crtbrand.o dependency on sys/param.h 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 090674a3dbf88956f097a3f7e8d9ca1b33aee4ad Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=090674a3dbf88956f097a3f7e8d9ca1b33aee4ad commit 090674a3dbf88956f097a3f7e8d9ca1b33aee4ad Author: Ed Maste AuthorDate: 2024-01-12 15:01:49 +0000 Commit: Ed Maste CommitDate: 2024-02-14 17:15:14 +0000 csu: add crtbrand.o dependency on sys/param.h __FreeBSD_version is recorded in *crt1.o and crti.o via crtbrand.o. Add an explicit dependency to pick up __FreeBSD_version bumps. Additional changes are required to fully plumb *crt1.o dependencies through the build. Reported by: bapt Reviewed by: bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43417 (cherry picked from commit ed3563b0ac31d854bf907d4d847ac0195ec9637b) --- lib/csu/Makefile.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc index 55aaf589f48f..1509a1ece2c3 100644 --- a/lib/csu/Makefile.inc +++ b/lib/csu/Makefile.inc @@ -55,6 +55,9 @@ Scrt1_c.o: ${CRT1SRC} Scrt1.o: Scrt1_c.o ${CRT1OBJS} ${CRT1OBJ} ${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o} +# __FreeBSD_version is recorded in crt1.o et al via crtbrand. +crtbrand.o: ${SRCTOP}/sys/sys/param.h + crtbegin.o: crtbegin.c crtbeginS.o: crtbegin.c crtbeginT.o: crtbegin.c From nobody Wed Feb 14 17:17:32 2024 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 4TZlHx052lz513n8; Wed, 14 Feb 2024 17:17:33 +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 4TZlHw6mFgz4H4N; Wed, 14 Feb 2024 17:17:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707931052; 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=OdFHm9qUMSh0MA3xzuY4qiKDp/YqwO2GYUObg/+v9ec=; b=eiTPHxYvOANx4pQsIMbihRFnO6bal5Eum8YjM+6EoYpEgzBhpifMDwLf0XUCLAlLvsh/7G APvwJds6Sc3JjmFL2evwW0NRpRcuS5fUFom2UPk6p+zwhEE+y+IuVBLshBhFVYEOoLkCA7 QKB2V6ODi2OKBfyZ9UfKdsv02McPM7uajJwqYdLQazBzstnEsIBo6fo10E8VCSs/mJCkwP XrPMYpXqmrhCjl3jCT4ZareMRDGGDVXtXGgPX/pqme5iApAZSd+nv/5SqbpWHcD4NxD5Id lDkvLKMC5zy2iSciTiQlitnzs7PveGKt5HKIy4WjzQpyb2CksaYrmOwYj1JuAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707931052; a=rsa-sha256; cv=none; b=DjBdE/drwNaL8w719N+OGd90yfPrPl7hnwA7wzGGTsvCzmiB643A4kjaJkXGllgDqHnkcn gT2aRbXYmpYbbNOpXbLlu6IJCc6f793V1oDf5Am6sQwYF4XDFzgGTK28GBCarkl51Q1AOP srtgubcmOeKq2fGu984qqMlwY81DpWsg1aXSJCDGsZE4kuiB7i5tAeN0iFx8XfXqZiq2DB 7ULSNZfyubiybei1d07jiqsZtbNDALUc4/lIRK8X1QJQ82r0mZ3BXhiwWcbkmm5zH9S8l2 TVtSOTxmhQzi3yTUk6gs8hex30YUutgZR2ylvF25eJB0yOhHz4hsgtSItjzGtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707931052; 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=OdFHm9qUMSh0MA3xzuY4qiKDp/YqwO2GYUObg/+v9ec=; b=VLiP8e6+U/LoF65PoY9s77IxWn45vuOZejiMpsik1SuMMljRuxEp49rtG8jR24Z4LaXhQK vZPkOYY/gE4UqHTyuubHC1c+x1udsy7mHOWvLsDyoqzZV/3MEFYj3Hh7/oM31haoiozGE6 /ajWedCdJ+U6UCEIRM9gIdif+tydnGy6yW4BlvElo92sAc4Gm9P7KtcwcbCmzL21R7g3pT brXcBS7QBzF6v74Se18kko60mGVBepQhOTXBahDT5X7ANBY8Z4HqrkiNhvFeZlBW6KOfCv Pf2x01PPaHLqOZYUJ6WjZc/iqGpLyi0sRAmbGZGqUO6Li/A8YbcezjVNUqrXRg== 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 4TZlHw5q4Pz16SC; Wed, 14 Feb 2024 17:17:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41EHHWPo016447; Wed, 14 Feb 2024 17:17:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EHHW0K016444; Wed, 14 Feb 2024 17:17:32 GMT (envelope-from git) Date: Wed, 14 Feb 2024 17:17:32 GMT Message-Id: <202402141717.41EHHW0K016444@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 6fc69ba38cfc - stable/13 - csu: add crtbrand.o dependency on sys/param.h 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6fc69ba38cfc9f8fbcd5096a8911e80608bf9c4f Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6fc69ba38cfc9f8fbcd5096a8911e80608bf9c4f commit 6fc69ba38cfc9f8fbcd5096a8911e80608bf9c4f Author: Ed Maste AuthorDate: 2024-01-12 15:01:49 +0000 Commit: Ed Maste CommitDate: 2024-02-14 17:16:35 +0000 csu: add crtbrand.o dependency on sys/param.h __FreeBSD_version is recorded in *crt1.o and crti.o via crtbrand.o. Add an explicit dependency to pick up __FreeBSD_version bumps. Additional changes are required to fully plumb *crt1.o dependencies through the build. Reported by: bapt Reviewed by: bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43417 (cherry picked from commit ed3563b0ac31d854bf907d4d847ac0195ec9637b) (cherry picked from commit 090674a3dbf88956f097a3f7e8d9ca1b33aee4ad) --- lib/csu/Makefile.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc index 83926a211eea..906c15c9b4bc 100644 --- a/lib/csu/Makefile.inc +++ b/lib/csu/Makefile.inc @@ -55,6 +55,9 @@ Scrt1.o: Scrt1_c.o ${CRT1OBJS} ${OBJCOPY} --localize-symbol _start1 ${.TARGET} .endif +# __FreeBSD_version is recorded in crt1.o et al via crtbrand. +crtbrand.o: ${SRCTOP}/sys/sys/param.h + crtbegin.o: crtbegin.c crtbeginS.o: crtbegin.c crtbeginT.o: crtbegin.c From nobody Wed Feb 14 18:18:13 2024 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 4TZmdx5XVjz51hff; Wed, 14 Feb 2024 18:18:13 +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 4TZmdx50xGz4Tdg; Wed, 14 Feb 2024 18:18:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707934693; 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=c+2bohVWB2XqcLkx3yEt4P91lDjuwu2P2dtA9vPUnqY=; b=ayZP7qZYrYU+6l38LOVCmZ3pUaBQ/XZ4dFQJxHmUtfbNoaBzKTAW8XKDp2EdRQ2weDE9iL zXBTxd8cWAM6UcQgn8iay3zLCnY+W1v/+GF17Hs7pVZIM/YQyDqVVypT/RJBC3i4H+eEoe 0pD1bTIfgc7rwtcBmQRF/wLEtQsQzB1pYKrtMGsvAYQOmjY9N5niQygZEWcXI1KC4IrduR NJZ0ke5YKr7AcZTjlz1m3dDHHZR1HsmyCrzIPkOYxBlxEDwRT0+oWoxDt1HYcyaIVHvPIs cPPSkQW5VKVgf2p4OahtvJVoPw1yAQeGs4hk0VTIS9tHFMQzjJLIiFL66S0zcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707934693; a=rsa-sha256; cv=none; b=EIsbkl73UaxlBwnkmSqN3+ZdYcjBcfW778nOB4B6qgJAg4Nz6S76yGNSi1dKaP4kjt/IUi 40DSIXQdwSk58DEtLRu3yoQheQLAuHeZ0WjZaE834cLm5VwKxgVPzUugVLccJmuUl9yTPK ZMXhzpOsz2OBpKlzKzCJpUzv3/0rN3vHIyPuX77/l/eLz39X6js9mopXv6KO82WDjkbCPb xvWFAyTwbjVu0OI5XKlmJqn6l817smHz+1Ia6Kuwqy5jiENNxiZ0IaaIZenGGPIAdBexlG rAFRTto/LJiPHDnLmr8nxUvB3oFD+6sTnX2kg65rI4H8j0Zq4w0IWU/5j31IgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707934693; 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=c+2bohVWB2XqcLkx3yEt4P91lDjuwu2P2dtA9vPUnqY=; b=kREs4hNqMrWW7EzoxcF5tGZ/vqs975iomDfI9lgezKV540WeoCsGInq3BcBUVRNp/Vc56s vaPx9Tewn5Q6jN6LGqHWTAqRCW3oolfZeKwfDA/StgWHnoAX6RIyZEmA5AjAlm+FMdGmUy K65Xb9h4m8RqKryw0ffJ2STgQBmLf1vXr3Xj6e08uVDDruGzg50dTqcQyVr7nyFTCar2+3 wxbJfKm2qkKx2iveIu+MMDdH8pMlEHtTLZkLzrR44ZFgNJR9KNlCLBK432dQhz6TFyhfdM 75swU3tyhrHxnH54nZOHn2Ehk/dYJnSLZAJ/6qTweQ+DtwQSVJr4UDO8WOojxA== 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 4TZmdx40wjz17WY; Wed, 14 Feb 2024 18:18:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41EIIDKi018234; Wed, 14 Feb 2024 18:18:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EIID92018231; Wed, 14 Feb 2024 18:18:13 GMT (envelope-from git) Date: Wed, 14 Feb 2024 18:18:13 GMT Message-Id: <202402141818.41EIID92018231@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 8ff01d01f2e8 - stable/13 - sched_setscheduler(2): Change realtime privilege check 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8ff01d01f2e8894bbac9f179f1ab0e83a8160384 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=8ff01d01f2e8894bbac9f179f1ab0e83a8160384 commit 8ff01d01f2e8894bbac9f179f1ab0e83a8160384 Author: Florian Walpen AuthorDate: 2024-02-14 13:50:44 +0000 Commit: Olivier Certner CommitDate: 2024-02-14 18:17:14 +0000 sched_setscheduler(2): Change realtime privilege check Check for privilege PRIV_SCHED_SETPOLICY instead of PRIV_SCHED_SET, to at least make it coherent with what is done at thread creation when a realtime policy is requested, and have users authorized by mac_priority(4) pass it. This change is good enough in practice since it only allows 'root' (as before) and mac_priority(4)'s authorized users in (the point of this change), without other side effects. More changes in this area, to generally ensure that all privilege checks are consistent, are going to come as olce's priority revamp project lands. (olce: Expanded the explanations.) PR: 276962 Reported by: jbeich Reviewed by: olce Approved by: emaste (mentor) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D43835 (cherry picked from commit 2198221bd9df0ceb69945120bc477309a5729241) Approved by: emaste (mentor) Approved by: re (cperciva) --- sys/kern/p1003_1b.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/p1003_1b.c b/sys/kern/p1003_1b.c index 21c9e3a27039..6259f7092487 100644 --- a/sys/kern/p1003_1b.c +++ b/sys/kern/p1003_1b.c @@ -233,8 +233,8 @@ kern_sched_setscheduler(struct thread *td, struct thread *targettd, targetp = targettd->td_proc; PROC_LOCK_ASSERT(targetp, MA_OWNED); - /* Don't allow non root user to set a scheduler policy. */ - error = priv_check(td, PRIV_SCHED_SET); + /* Only privileged users are allowed to set a scheduler policy. */ + error = priv_check(td, PRIV_SCHED_SETPOLICY); if (error) return (error); From nobody Wed Feb 14 18:21:06 2024 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 4TZmjG5y83z51jTk; Wed, 14 Feb 2024 18:21:06 +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 4TZmjG5Sl3z4VKR; Wed, 14 Feb 2024 18:21:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707934866; 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=kjGkPImr0uUAmy5CBlB7cx9EuLX0V+fSezfs2FOtzv8=; b=UkmxZAWrhtObqTrXb+oRI/1Eep+Kq5jpBVmwL+MSYai649zMKVcNiYTOv1rNzt4D70aORe E1Zs9zC93DglMFULKrim3sCTT+AUPRwy60J00jKbqE1eSrfs3tZh4BzTBLOr9DEcB3Res5 hrL8iZu8ZN8gJjVx2ddaBGtFQ8r6YzXCzHNeWIfo91XMynRsMLzGv5O1bkue6OqW/CceHv MWEMdAb6cio1e3n6Oq2Rh5hRmL2PeZMpLS6WWM7286j1Xs9k2V0KpvCCaxDddUUcnMd3tT t4rD/z7ZZD2g4/pHlCLS8zt5puwZc67tlKVecJeXG6lBVtCwZHRn1Dxf1rRgVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707934866; a=rsa-sha256; cv=none; b=KMC/+XtGJmimeZF8frqTTXIlLaV5XdaduNMb3QkDOt+OnQ7b7e4cuuiyWuA1YM+uPgaR+O Bk3eVxtULopk6bP0m/iFVQuA2c1ZwpYm7AA0Nhb39EkWdnPQLvGs3hgJIKOzIqsvKeqEkX IvJ0RX5xpqr36WVJp8QmqiBSrwXaNY8vGBAJaNkXXwGfNOqoT1Z7JpdgCHCuisRRXFqb5e yBCg64YR/PVhD0/Ab/4f2U6ueGsoONNGLYb3s00LfUB3N2LvZwADyys9qgw3cIo7qBWPUY z1ZbWFzliuT7CvnwRXnsGXzqGzGmGW/t6y8+vy9QuB2IRSJCrZTJVpfd91POAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707934866; 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=kjGkPImr0uUAmy5CBlB7cx9EuLX0V+fSezfs2FOtzv8=; b=pxnYauhKZnT38jubE0XY9udpOVcn8mHt3bIusOuYmsyUaxadZ2XxbEb4eiHbHH+CM3d05t 3MA0LprJPRc8rrc50Uk6bwJA5S1L7wxzjGT5pdDQv0YWDPRFW4KekxvK+VbMfVWSmOV2Iw k2n6iOeWlVtOKmDu22o8q9lagebE104TtmL9o7DfU5NuT2gIT0ZiAgC8opYVncCSx+cBMJ cUE8HsO7hnPWJpu6QbO+PHr+1tZ1TsgOgCEduYwqtdSvmlKEiCki944R/+qfUBa+kL5TS9 7qTqhH0nvMLNZUP3lODJ4R/Z9dES4DtvXsHETkQczlRRKYfU1Cw0iAMeDgLz8w== 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 4TZmjG4WWQz17mm; Wed, 14 Feb 2024 18:21:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41EIL6WM032667; Wed, 14 Feb 2024 18:21:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EIL6fR032664; Wed, 14 Feb 2024 18:21:06 GMT (envelope-from git) Date: Wed, 14 Feb 2024 18:21:06 GMT Message-Id: <202402141821.41EIL6fR032664@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 1ee910875cd0 - releng/13.3 - sched_setscheduler(2): Change realtime privilege check 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.3 X-Git-Reftype: branch X-Git-Commit: 1ee910875cd00c6f86f3f64dbc1686ec6d52ab11 Auto-Submitted: auto-generated The branch releng/13.3 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=1ee910875cd00c6f86f3f64dbc1686ec6d52ab11 commit 1ee910875cd00c6f86f3f64dbc1686ec6d52ab11 Author: Florian Walpen AuthorDate: 2024-02-14 13:50:44 +0000 Commit: Olivier Certner CommitDate: 2024-02-14 18:19:04 +0000 sched_setscheduler(2): Change realtime privilege check Check for privilege PRIV_SCHED_SETPOLICY instead of PRIV_SCHED_SET, to at least make it coherent with what is done at thread creation when a realtime policy is requested, and have users authorized by mac_priority(4) pass it. This change is good enough in practice since it only allows 'root' (as before) and mac_priority(4)'s authorized users in (the point of this change), without other side effects. More changes in this area, to generally ensure that all privilege checks are consistent, are going to come as olce's priority revamp project lands. (olce: Expanded the explanations.) PR: 276962 Reported by: jbeich Reviewed by: olce Approved by: emaste (mentor) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D43835 (cherry picked from commit 2198221bd9df0ceb69945120bc477309a5729241) (cherry picked from commit 8ff01d01f2e8894bbac9f179f1ab0e83a8160384) Approved by: emaste (mentor) Approved by: re (cperciva) --- sys/kern/p1003_1b.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/p1003_1b.c b/sys/kern/p1003_1b.c index 21c9e3a27039..6259f7092487 100644 --- a/sys/kern/p1003_1b.c +++ b/sys/kern/p1003_1b.c @@ -233,8 +233,8 @@ kern_sched_setscheduler(struct thread *td, struct thread *targettd, targetp = targettd->td_proc; PROC_LOCK_ASSERT(targetp, MA_OWNED); - /* Don't allow non root user to set a scheduler policy. */ - error = priv_check(td, PRIV_SCHED_SET); + /* Only privileged users are allowed to set a scheduler policy. */ + error = priv_check(td, PRIV_SCHED_SETPOLICY); if (error) return (error); From nobody Wed Feb 14 19:43:07 2024 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 4TZpWw02HBz52ghJ; Wed, 14 Feb 2024 19:43: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 4TZpWv4hmCz4jL0; Wed, 14 Feb 2024 19:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707939787; 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=NPrPkp39JjW0aMleEGK3Ajk+3pjE3RDcUy+yarT9Zb0=; b=E2AO5uLQQ2OOF3cM9SL+X4mmuQik20mZ0Mqvtt6MNRZCaUgKbouaQAVlaH2Fk9l4cy7sgn 5PQmYMBasuD6EcVRam9+iu77xEJmzgUwlXxY/K74DJ9tNV27QinddPIpf+MAtF9+o0vtH9 4SkyqL18xSaOgQJGi4mZYujwfxMbtGi82T7O/kzi6isWabTgKp+NpJe6V9QD/VaYvK8sj7 BsxBRXsGoPTf99qbwe+Pv7a1JdbGZ5w7S/WH+Hfm3zo3z+pquXEfy+DkNBLh885Xfy1R+7 XEk+w+kZRBNN3zj5pgHnmlLwTqEj9S3I72FVnoklb7BhisyAc1O3V7obRJb0Lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707939787; a=rsa-sha256; cv=none; b=kZIH4Fja/RENBTlc0G1lDGkdemlhB50UfhMeG/HCdvb010/6zBn+qpDLlI5uCwDZ3dMcU3 MXQoC6fQ8Espyft/jA8ANaLgAQNHCFh7gofgBeSgANjV6u1lC/Nfo6Q1+mhYskuF+/1+qJ K+cX9u42zR4soNKEU2YUfC1JLo4refsWo8ngjWM7lVZBe0gmuxU9yD9df/+yocggb4/hal oecjeACFffl5IWK8/33u5ubtqHuifzJHhk00KDfH7Y541LpypYXYEFaUjKBpVmR7jkNFYe uUqF7mAP5XtyCkKqIYUrdFUsZ3N1ZCbZ2II6ayTPEYTlBKrGVG42HFmk+nZBUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707939787; 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=NPrPkp39JjW0aMleEGK3Ajk+3pjE3RDcUy+yarT9Zb0=; b=A0BmnOq2Qjy2avtffZbChEyPDmH2gYpFjsDcfYd6vXlAIJqzmbuHRTMz69ISUoE8FOR8JQ wKIH2UEYeLJYktro2TrGm+cAzPgGCKEJBUn2ahg+KnsF1Jr5RK9afcbiPnRWT/9eOUlrQY mYu1gUCZC4C8y2fFuIprAERq0l2cFnQn54SxGfw2cuovIoozBSPxhSKk8Uf28eO84OjxG9 O9jp+4QdcmEaBISoDmzWlJAccGmPevfX1vqSuZ8OPTpnQKZ13ykYMaq4rUYsLcHcE1yIg1 U8WSg4ssYGOHROMN1/vrJT+YqQ3qWBGrbuKoSj19uTLIqxisQ44d2X598Vsbqw== 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 4TZpWv3n8mz19t0; Wed, 14 Feb 2024 19:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41EJh7Dw067406; Wed, 14 Feb 2024 19:43:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EJh7aV067403; Wed, 14 Feb 2024 19:43:07 GMT (envelope-from git) Date: Wed, 14 Feb 2024 19:43:07 GMT Message-Id: <202402141943.41EJh7aV067403@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 42ceb92e6a54 - stable/13 - lld: work around elftoolchain bug which causes bloated RISCV binaries 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 42ceb92e6a544fa0956eb660b3c16e38189acf20 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=42ceb92e6a544fa0956eb660b3c16e38189acf20 commit 42ceb92e6a544fa0956eb660b3c16e38189acf20 Author: Dimitry Andric AuthorDate: 2024-02-14 19:41:09 +0000 Commit: Dimitry Andric CommitDate: 2024-02-14 19:42:21 +0000 lld: work around elftoolchain bug which causes bloated RISCV binaries The elftoolchain strip(1) command appears to have trouble with the new .riscv.attributes sections being added by lld 17 to RISCV binaries. This causes huge 'holes' in the files, making them larger than necessary. Since nothing in the base system uses the new section yet, patch lld to leave it out for now. Direct commit to stable/13, since this intended to go into the 13.3 release, while the elftoolchain bug is being investigated. Reported by: karels Submitted by: jrtc27 Approved by: re (cperciva) --- contrib/llvm-project/lld/ELF/Writer.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/llvm-project/lld/ELF/Writer.cpp b/contrib/llvm-project/lld/ELF/Writer.cpp index 368c9aabceae..850a6bb49721 100644 --- a/contrib/llvm-project/lld/ELF/Writer.cpp +++ b/contrib/llvm-project/lld/ELF/Writer.cpp @@ -2044,9 +2044,13 @@ template void Writer::finalizeSections() { addPhdrForSection(part, SHT_MIPS_OPTIONS, PT_MIPS_OPTIONS, PF_R); addPhdrForSection(part, SHT_MIPS_ABIFLAGS, PT_MIPS_ABIFLAGS, PF_R); } +#if 0 + // XXX: This stops elftoolchain strip adjusting .riscv.attributes, + // leaving large holes in binaries. if (config->emachine == EM_RISCV) addPhdrForSection(part, SHT_RISCV_ATTRIBUTES, PT_RISCV_ATTRIBUTES, PF_R); +#endif } Out::programHeaders->size = sizeof(Elf_Phdr) * mainPart->phdrs.size(); From nobody Wed Feb 14 21:11:04 2024 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 4TZrTN6LpBz53Pll; Wed, 14 Feb 2024 21:11:04 +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 4TZrTN5sp5z4vsc; Wed, 14 Feb 2024 21:11:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707945064; 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=7EeVJFFxDX02Y88wEF09/CxojYgAt4G5JhvLKD9oWho=; b=X8FQ7atkl08q/1GPmrIJiqbpbW3fdUiTRLZ7oKB0ekSyMkv0bTsvksNe9y5l7xUVITUbb/ 3zxobNOEmQ8+uJ1wUUeeodDG0ku0ZnWlSwkcIrskd+lVHHkmgpRebaAzVfbOEaxjkFfRCw 6aDG5dGz5G7hEuGmdaILuKtRVOfeTm2uavaYgjW634vhGKKqXP/SawF8n3SYqud1UpmFak t0M7130p4Wa5PQuLBnNMpKy5pqD76/HFgbt6yg8ICIzkX3mOF6IGwxvdmwNY0K01Xx/9Kr RCr8QCBpk2WkC2whF9hdrCanJZVhqduUd8+WVWL7nprACqcKMHHsrVN/cx99IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707945064; a=rsa-sha256; cv=none; b=d+ySWVWnCbyAu70x4vE24Aw50xADV4bZqabvfarEEnEMeP6Xmpxew+TyKntvDzTI0QrUSg FX5uMfAzptFop1VKhHiF5lyN7zUxOBXV4h2GVkxKQvrp7nROKhzNvxhnej3U0sRKl61h+G RFSybFhFmJMPwsTEEQ8XeilgZLVSH4mrquxzym6x8jjDFuaEviR6ulUOc9lt2G6sV7zMhM +ctQqqMePKlJ/r0emG8ivepBXSBBehdA0Aqa1wqT4EhQlbH9kW7TV699KARRlKqoemzap4 JrR0zQBJfWUW+ECZwzdZApomxprAeCexAyrl68J+HFH2OvlPMkFsmD9cgxxh3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707945064; 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=7EeVJFFxDX02Y88wEF09/CxojYgAt4G5JhvLKD9oWho=; b=tkXhI2sJQuFmjBXJXaHtbnZs/bdk8SVtJPcryJjYntjI4HYsN4/cxcIVLHlY0aMUAeLTNL 9Vj4sZpe2fKv1ZQBvdXhjJXc86f085fWuwXn7vVKEP73JUcqv599Acf8pSxJqF/irWTBCr cSy2od5ibtKvRdE0rkmKhtOMRS9s/+jFA/FgJDIGBw6moRGAGE33sKPFFqYWyCa5BNdvWE 4KH/1a1GG97jNjJFxzQLQtMGUBI08O2rJ8kNMJluT77Ps3ctkCfHrnd1sdl65qQGqNZ18e gt/Rwm9XDZ3WJp7w3E/HFICjuC7Ool+bVbBqEvGbHYR5q7YvB6JyOEL6dXkpmA== 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 4TZrTN4wvGzDdt; Wed, 14 Feb 2024 21:11:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41ELB4Jv019379; Wed, 14 Feb 2024 21:11:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41ELB4Kw019376; Wed, 14 Feb 2024 21:11:04 GMT (envelope-from git) Date: Wed, 14 Feb 2024 21:11:04 GMT Message-Id: <202402142111.41ELB4Kw019376@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: d19b59cfe594 - releng/13.3 - leapseconds: Update to the canonical place. 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.3 X-Git-Reftype: branch X-Git-Commit: d19b59cfe594a878d3f073d6c31ded672c6591a4 Auto-Submitted: auto-generated The branch releng/13.3 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d19b59cfe594a878d3f073d6c31ded672c6591a4 commit d19b59cfe594a878d3f073d6c31ded672c6591a4 Author: Warner Losh AuthorDate: 2024-02-06 23:11:38 +0000 Commit: Colin Percival CommitDate: 2024-02-14 21:10:34 +0000 leapseconds: Update to the canonical place. IERS is the source of truth for leap seconds. Their leapsecond file is updated most quickly and is always right (unlike the IANA one which often lags). IERS operates this public service for the express purpose of random people downloading it. Their terms of service are compatible with open source (we could include this in our release). Rather than fighting with questions around this because the IANA one changed locations or the auto update script broken, just use this. This is in preference to the NIST ftp copy. NIST is in the process of retiring their FTP services. Sponsored by: Netflix Reviewed by: philip, delphij, cy Approved by: re (cperciva) Differential Revision: https://reviews.freebsd.org/D43752 (cherry picked from commit 11da791920ba285f0832f09cb504ac81e35ff8d1) (cherry picked from commit 0eea8292ae8c8e9119520ce54aa82cae491d83b9) --- libexec/rc/rc.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index 165f0a3ab562..824751078833 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -418,8 +418,8 @@ ntpd_flags="" # Additional flags to ntpd ntp_src_leapfile="/etc/ntp/leap-seconds" # Initial source for ntpd leapfile ntp_db_leapfile="/var/db/ntpd.leap-seconds.list" - # Working copy (updated weekly) leapfile -ntp_leapfile_sources="https://data.iana.org/time-zones/tzdb/leap-seconds.list" + # Canonical place to get the leap seconds from +ntp_leapfile_sources="https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list" # Source from which to fetch leapfile ntp_leapfile_fetch_opts="-mq" # Options to use for ntp leapfile fetch, # e.g. --no-verify-peer From nobody Thu Feb 15 14:23:41 2024 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 4TbHNt05Ntz541Z8; Thu, 15 Feb 2024 14:23:42 +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 4TbHNs67S5z4DH5; Thu, 15 Feb 2024 14:23:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708007021; 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=DKE40jHPk4lyUIv05Mi9XyczVp31GYRlul11r3+WMuM=; b=PWxIdkdW9gfP7fqcdEyC8gQxItdep8R+VUJKsMW+girCp8tofYu4ebwVPDjV5mIitUA1cZ RHOyDm+JSs+8heoqxNyv7+dQft6811n4ssRCo9P3C+esgCNZ+jwMGxANs0VPwWahLFRzB8 NkF5qAMBh58xRo0M9FJsYlA5pdQDFk/02gxCCy12yZiu8yum2YTqovT/gTf+rSxFzStIX+ a2Tv4Q6yh5yQWvORqBvgowDyBARYQ5nIoUGek57ZLdzdHfPXE/cjnCI5yz497RBFlG3Pw+ Xnk5tW5uWOO/yKhKmiH6gMZaGsNjwxs+TgGYpXQ3u5po+JXD+CBzDWw7OXVj0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708007021; a=rsa-sha256; cv=none; b=XN2+yJAB2mU7mLJ/b+CQcGk3vpWthoa+F3KTYw5M46Rr1pVpOwCLMj63WwQUXHlM48Zlzy To+7mdf2O2Ya7ssnzUvJI/wliNaAd5xzN2/7NUjiwOBigRA49xNldb1pQB53zoL9UzaD9P ZWG/R7cr5CbvouchtHQOiRksQ0Nqp/v7EiLPVLyN1NlWgOSAarWteXoHeTnCplXVd1d42G o+ypBdQ1siT+VuiLZC4D6b6r2fofmj4R/4+Ga7XS0AwuUJgMKEx0X3sx+RHQ1Cn5XMCjWA ROftld1dcER1ARQjRXmeeoT8MEbyVk08UFOmCkLge8hqOa2BsOCSMg6ApBVFrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708007021; 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=DKE40jHPk4lyUIv05Mi9XyczVp31GYRlul11r3+WMuM=; b=nvEcnt+xWUFCTKPjjjTk5JKwYEoJ8HP4X6ZgOG82jlp7hiWcQjau1WqC2fF5GXMtX6yCaK qCXvLUMVZE2gKxOnbRsZBsVmk3i5MCUF9QWJEAOU0y/74DfVC7IhIDE0zxeKKk2xMYdPHW KExycDtCWSCj06aBqovcPAxXTbAEMlUnq4TJe/AiHSLaUSeA88zDv/yEw2VC8Be+NbDjZF tb7/hgSyya/cZsMx4GUASyXXQ1SkCIWy7HFXAqcytopuyneCBqO0R+om8OwW0HGwx6eZOy aZGB3fuUO0vSQYtKF6cBuU6u2QDbpLooWu0Ig5OGhWISJG+yprY39IfQLQDPLg== 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 4TbHNs5CldzlVk; Thu, 15 Feb 2024 14:23:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41FENfCY047583; Thu, 15 Feb 2024 14:23:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FENfH2047580; Thu, 15 Feb 2024 14:23:41 GMT (envelope-from git) Date: Thu, 15 Feb 2024 14:23:41 GMT Message-Id: <202402151423.41FENfH2047580@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: efec2f0d4e17 - stable/14 - md5: Enter capability mode earlier 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/stable/14 X-Git-Reftype: branch X-Git-Commit: efec2f0d4e1739c94cb2581e6ff25a41fc9e38c2 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=efec2f0d4e1739c94cb2581e6ff25a41fc9e38c2 commit efec2f0d4e1739c94cb2581e6ff25a41fc9e38c2 Author: Ricardo Branco AuthorDate: 2024-01-03 18:00:47 +0000 Commit: Mark Johnston CommitDate: 2024-02-15 14:16:07 +0000 md5: Enter capability mode earlier Reviewed by: markj MFC after: 1 month Pull Request: https://github.com/freebsd/freebsd-src/pull/988 (cherry picked from commit 9b20849bc5f1b500f2de7aeca77f0e6556069bbb) --- sbin/md5/Makefile | 9 ++++++--- sbin/md5/md5.c | 57 +++++++++++++++++++++++++++++++------------------------ 2 files changed, 38 insertions(+), 28 deletions(-) diff --git a/sbin/md5/Makefile b/sbin/md5/Makefile index 359c4b96f9fd..e4e6335ae875 100644 --- a/sbin/md5/Makefile +++ b/sbin/md5/Makefile @@ -59,16 +59,19 @@ MLINKS= md5.1 md5sum.1 \ LIBADD= md -.ifndef(BOOTSTRAPPING) +.include + +.if ${MK_CASPER} != "no" && !defined(RESCUE) && !defined(BOOTSTRAPPING) # Avoid depending on capsicum during bootstrap. caph_limit_stdout() is not # available when building for Linux/MacOS or older FreeBSD hosts. # We need to bootstrap md5 when building on Linux since the md5sum command there # produces different output. CFLAGS+=-DHAVE_CAPSICUM +CFLAGS+=-DWITH_CASPER +LIBADD+= casper +LIBADD+= cap_fileargs .endif -.include - HAS_TESTS= SUBDIR.${MK_TESTS}+= tests diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c index 15fd7ebec5d4..eb9a2ffae1cc 100644 --- a/sbin/md5/md5.c +++ b/sbin/md5/md5.c @@ -47,6 +47,8 @@ #ifdef HAVE_CAPSICUM #include #include +#include +#include #endif /* @@ -311,6 +313,7 @@ gnu_check(const char *checksumsfile) const char *digestname; size_t digestnamelen; size_t hashstrlen; + struct stat st; if (strcmp(checksumsfile, "-") == 0) inp = stdin; @@ -358,6 +361,15 @@ gnu_check(const char *checksumsfile) rec = malloc(sizeof(*rec)); if (rec == NULL) errx(1, "malloc failed"); + + if (*filename == '*' || + *filename == ' ' || + *filename == 'U' || + *filename == '^') { + if (lstat(filename, &st) != 0) + filename++; + } + rec->chksum = strdup(hashstr); rec->filename = strdup(filename); if (rec->chksum == NULL || rec->filename == NULL) @@ -385,6 +397,7 @@ main(int argc, char *argv[]) { #ifdef HAVE_CAPSICUM cap_rights_t rights; + fileargs_t *fa = NULL; #endif const struct option *longopts; const char *shortopts; @@ -585,24 +598,25 @@ main(int argc, char *argv[]) rec = head; } +#ifdef HAVE_CAPSICUM + fa = fileargs_init(argc, argv, O_RDONLY, 0, + cap_rights_init(&rights, CAP_READ, CAP_FSTAT, CAP_FCNTL), FA_OPEN | FA_LSTAT); + if (fa == NULL) + err(1, "Unable to initialize casper"); + if (caph_enter_casper() < 0) + err(1, "Unable to enter capability mode"); +#endif + if (*argv) { do { - struct stat st; const char *filename = *argv; const char *filemode = "rb"; - if (*filename == '*' || - *filename == ' ' || - *filename == 'U' || - *filename == '^') { - if (lstat(filename, &st) != 0) { - input_mode = (int)*filename; - filename++; - } - } - if (input_mode == input_text) - filemode = "r"; +#ifdef HAVE_CAPSICUM + if ((f = fileargs_fopen(fa, filename, filemode)) == NULL) { +#else if ((f = fopen(filename, filemode)) == NULL) { +#endif if (errno != ENOENT || !(cflag && ignoreMissing)) { warn("%s", filename); failed = true; @@ -611,20 +625,10 @@ main(int argc, char *argv[]) rec = rec->next; continue; } - /* - * XXX Enter capability mode on the last argv file. - * When a casper file service or other approach is - * available, switch to that and enter capability mode - * earlier. - */ - if (*(argv + 1) == NULL) { #ifdef HAVE_CAPSICUM - cap_rights_init(&rights, CAP_READ, CAP_FSTAT); - if (caph_rights_limit(fileno(f), &rights) < 0 || - caph_enter() < 0) - err(1, "capsicum"); + if (caph_rights_limit(fileno(f), &rights) < 0) + err(1, "capsicum"); #endif - } if (cflag && mode != mode_bsd) { checkAgainst = rec->chksum; rec = rec->next; @@ -635,7 +639,7 @@ main(int argc, char *argv[]) } while (*++argv); } else if (!cflag && string == NULL && !skip) { #ifdef HAVE_CAPSICUM - if (caph_limit_stdin() < 0 || caph_enter() < 0) + if (caph_limit_stdin() < 0) err(1, "capsicum"); #endif if (mode == mode_bsd) @@ -659,6 +663,9 @@ main(int argc, char *argv[]) if (checksFailed != 0 || (strict && malformed > 0)) return (1); } +#ifdef HAVE_CAPSICUM + fileargs_free(fa); +#endif if (failed) return (1); if (checksFailed > 0) From nobody Thu Feb 15 18:10:51 2024 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 4TbNR0243Yz59nYZ; Thu, 15 Feb 2024 18:10:52 +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 4TbNR01cxtz4pCM; Thu, 15 Feb 2024 18:10:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708020652; 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=fz2DURkpuIkOHc7DKp1t1bqIXH0pUkTOOh71gGbjO18=; b=rwG30HSW9Sj2gSi/UjrWys3JslrLQ5sxxsWfdwk9Fkr/xTSPpV/l7K+kQZ7bWOAFfcPuXA LRgJjusfRFhQyVYOr201Gste/LtALtGEj9fxPELjhEYLmheqCQgzz/0YQJ6KbvTb4MRxQE Cho49scjj0b43AVx+DK++7fFpFyYEO826vhb5/n3efhI3/VkYIPE34zszuRYklW5flWhTd cK2PZxLxV8O5/9rj10CIxaHdZwSOwxYLzybcDx6YdnrM2Rw/Z0tyuSwIKy2duNntt0Lvlm lnV8DQiHVrFQ5sjAYBi6epU36tZ/AcL0XYDIBkFH1qp1aZYQhb0PrunRazDYoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708020652; a=rsa-sha256; cv=none; b=xTPqm1NJPYSLif6F8i0ztxa2iiSSXn8l08nfVL6WZz5BGqqimm6fuRPtDBT5rTIMdRsrKS HSAiw7AXvAplV2XbWaZHVKCIs/DXc2zEVNgAfWHvkiatzW5zfUy+xJouwHOBcTli5hNO6L Xl5BfiibKnkDMblE/IhLbiQo3eQ8RiSLMCb673DMuWFG/h0oE57EX37qso7hK0/lKkCnCF rDwwSL9NtKntW+7JOs1bVgzvNv1iRZC937VjieiJSamFdSBBLZeanfsgMgl6fJMNY44HtG PqOU6qmhiIP3K/NjhR52CRb+1F6aHbudJXk+FuKHKL5s1Pjjjg8nbVJUen5zsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708020652; 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=fz2DURkpuIkOHc7DKp1t1bqIXH0pUkTOOh71gGbjO18=; b=i1ANnmAIxsr40s2OGk9kz/dvuFO/1fJgczN+5Vf1aAGRsxoM3AD90Lfzu5CaVHSpWtHs+s EFNaXsWvPC+KApMWceEhFyWt3MsnF88Wyv1F5kNWOnfWbhocjkOl3/RsSmJdWmHAA22iQq yjZ3Jg/luskEmMp4jmh/lNDXyV3kxIw48rYd/sdmJ0TppZjyaw1SMSS7x5iMfngOMl/faE wLf1zj1zH9LEFbcOutOXfFBZw5gn7hqnD6Sa/5pa2j5goNDo8a1+ByNWVrSeVMIceELsfp oao/e3DS0wOb4AMs75VEPK2n8zG2T9ghrAItBoSMrAdn1ojlKGhXXIcYqK/Lgw== 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 4TbNR00gkCzrYj; Thu, 15 Feb 2024 18:10:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41FIApTX029458; Thu, 15 Feb 2024 18:10:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FIApMI029455; Thu, 15 Feb 2024 18:10:51 GMT (envelope-from git) Date: Thu, 15 Feb 2024 18:10:51 GMT Message-Id: <202402151810.41FIApMI029455@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 313b30b6ab1f - releng/13.3 - lld: work around elftoolchain bug which causes bloated RISCV binaries 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: karels X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.3 X-Git-Reftype: branch X-Git-Commit: 313b30b6ab1f0c9549d29129f2fb6b1e31ef5f0f Auto-Submitted: auto-generated The branch releng/13.3 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=313b30b6ab1f0c9549d29129f2fb6b1e31ef5f0f commit 313b30b6ab1f0c9549d29129f2fb6b1e31ef5f0f Author: Dimitry Andric AuthorDate: 2024-02-14 19:41:09 +0000 Commit: Mike Karels CommitDate: 2024-02-15 18:09:56 +0000 lld: work around elftoolchain bug which causes bloated RISCV binaries The elftoolchain strip(1) command appears to have trouble with the new .riscv.attributes sections being added by lld 17 to RISCV binaries. This causes huge 'holes' in the files, making them larger than necessary. Since nothing in the base system uses the new section yet, patch lld to leave it out for now. Direct commit to stable/13, since this intended to go into the 13.3 release, while the elftoolchain bug is being investigated. Reported by: karels Submitted by: jrtc27 Approved by: re (cperciva) (cherry picked from commit 42ceb92e6a544fa0956eb660b3c16e38189acf20) --- contrib/llvm-project/lld/ELF/Writer.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/llvm-project/lld/ELF/Writer.cpp b/contrib/llvm-project/lld/ELF/Writer.cpp index 368c9aabceae..850a6bb49721 100644 --- a/contrib/llvm-project/lld/ELF/Writer.cpp +++ b/contrib/llvm-project/lld/ELF/Writer.cpp @@ -2044,9 +2044,13 @@ template void Writer::finalizeSections() { addPhdrForSection(part, SHT_MIPS_OPTIONS, PT_MIPS_OPTIONS, PF_R); addPhdrForSection(part, SHT_MIPS_ABIFLAGS, PT_MIPS_ABIFLAGS, PF_R); } +#if 0 + // XXX: This stops elftoolchain strip adjusting .riscv.attributes, + // leaving large holes in binaries. if (config->emachine == EM_RISCV) addPhdrForSection(part, SHT_RISCV_ATTRIBUTES, PT_RISCV_ATTRIBUTES, PF_R); +#endif } Out::programHeaders->size = sizeof(Elf_Phdr) * mainPart->phdrs.size(); From nobody Thu Feb 15 23:56:54 2024 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 4TbX6H2hDcz511gL; Thu, 15 Feb 2024 23:56:55 +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 4TbX6H0yQ6z4nVs; Thu, 15 Feb 2024 23:56:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708041415; 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=cJ/0Xx0MYibNLOvZEA0LjSA7kvpQtmktwQptNh1SQEE=; b=ihsDokKn5b/E9fAaqdVfLjfTBZ5rMdqFZT/hkanXoborAM+QLeb/JkOt2CGUzaM60nEQgh Pgu81xlIAL9jI0bNwazoatYVmn2vPWnPokOOmNgIOwopGyBTEPB6jxrLviflH1444PkbHv iA0FNIAiyPI4/1F/qLOIRRFArYv/1b/qxTCiqY6kryZr1KGOaIaXyDUww4r9p950BQOjU8 GJyRVWRPV8sO/4kgPNdvWzKfOvZNj9yyjfkwybsIwUsAwu4CAj8EDoVejGx6RkHVUnD92j X+COkJsulQUnKWzP9noxRL2mTfpu/XrTkM/Iiu7JqBInU9hNOewTLPhqE0MjLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708041415; 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=cJ/0Xx0MYibNLOvZEA0LjSA7kvpQtmktwQptNh1SQEE=; b=KG3hbtH7neb14d2lUNoICmls7IxAgU2w8HfzyvLiOwdCID4Aq4K6ywbsrcJCurmNDRJH16 ke02mV2JmUEx/iU99Q8wG07u/KVIvZd41UK0ZRH8bo+yjm19vGkiQAFt+iVkiwBRi1oY7j ZguT/9gmc5t56eSq0km6aYJMDlMKgGfzwoF1WPDuN4tG4UtRmelEmNmpdg+/eAqpxdogRa kFv5Jr467mEQgIP6veWoRazOYB/EOLJbE+nrmLi6NAGSxK/1tUG601IjYoM84Bi4t8SZXc 7LL4xxx0aZv2YiKZwRviGGbcEadYB24wZn07actZlv8By5xsV4rDLeclegeQrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708041415; a=rsa-sha256; cv=none; b=KwMqczy+VePY7+MBbDqWtcu0/7Z3vbDiNMbymIyShsqDeBLjrTw7Ce8BX9yavIkJ6OGBy+ hoZnO+UTBeri2i9wTrjm0jZjqhrFRs3zENQe20wTTHumjUkw89UWLasnjkYGPusdPtPlm3 jfytgv7b0XvdmhLeTC9MrJpT9wmIzLGpKfuKPbnyWuNduP7BAwpsfoZlMIrKm5r60beNUI HntF+3lIVNQXMBLC/2C4TlDl0nNVagFh7Ye5RxYhp2PaaS6VvHw2I7cbgVHL3qdFOsJ9c9 K9TdS+nRBkn5BRF9JaS+zcMolqs3Dp2I+Kpm1N47muRYXcDSxxzL3V5vCTondw== 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 4TbX6H010fz12PC; Thu, 15 Feb 2024 23:56:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41FNusCK004919; Thu, 15 Feb 2024 23:56:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FNusZ2004916; Thu, 15 Feb 2024 23:56:54 GMT (envelope-from git) Date: Thu, 15 Feb 2024 23:56:54 GMT Message-Id: <202402152356.41FNusZ2004916@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: a233f7fadfca - releng/13.3 - 13.3: update to BETA3 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.3 X-Git-Reftype: branch X-Git-Commit: a233f7fadfca5cf806201a97e1e200054c7e87c3 Auto-Submitted: auto-generated The branch releng/13.3 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a233f7fadfca5cf806201a97e1e200054c7e87c3 commit a233f7fadfca5cf806201a97e1e200054c7e87c3 Author: Colin Percival AuthorDate: 2024-02-15 23:51:17 +0000 Commit: Colin Percival CommitDate: 2024-02-15 23:51:17 +0000 13.3: update to BETA3 Approved by: re (implicit) Sponsored by: https://www.patreon.com/cperciva --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 0dd1a0604180..a71331c3bb6f 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="13.3" -BRANCH="BETA2" +BRANCH="BETA3" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Feb 16 05:19:20 2024 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 4TbgGK0kM2z59llP; Fri, 16 Feb 2024 05:19:21 +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 4TbgGK012tz4XHk; Fri, 16 Feb 2024 05:19:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708060761; 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=jKGK9h4gF2IXP+ZAah17i7klUEpi/bxUoJj2E5P2SJ0=; b=q1YuEtV2Wk53oswEBjefkMepWGifOD6YBUI7xnnTsbL0C7ZE/ogcpSrh1QnUqObTEn7xnt WVAzTi2HR2a+JT522h8ixwkV3oFpmJ4wWDFHV2tZptzTk7axkiFMNuyVKYdozsGx/j/sWJ aiJvdOEeIamHMmgeDRkNfGfFagpJ8u7sbljDsiaDfawNpyyD8E/uZVOaRFcIJE7QHHWwaf qlIEGm01zFF2RpauuUtu+ATLbaBERTMuLY7o+o3Vq5KjL4exrxH4hJRUr9IpwR5mm2oZ8d Beobx+H/zp1rhWClurudiPg8mFkqUWgoSAT8hPd1KGqvgHZ0WCiyiS56pbE2Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708060761; 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=jKGK9h4gF2IXP+ZAah17i7klUEpi/bxUoJj2E5P2SJ0=; b=eID5hQHl9LRe5VELXNkMUvKW7VQ87ckxHoXPJFSqR50FUZH9lyfa9pIKO0bJYTCSkgZTDy 1D20dJEZOxpX8akQuiNq78VP1h0vHPWD8K7nK0oom0bsXi/oIBLNIoLNMt2m7bx1j5Gtvx LVK/+j3hD9n69WAy6Mrjce0BW/IGuMtyvPe9zavdMJZB6qFkYbXVwpNUP0wo03TskVN98H +/52yHvwF+UDXOe5WYbRWPs1bpV5Y//0swEBwPgm+gPRyoM1TxMWEFvKCzZ/WWaWYKAFVS 67gUB3eyOUdDvJrmecoBq14n5bs+XYgvmNBoPVmwNMKFwUFjwzxMV/KZ545cQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708060761; a=rsa-sha256; cv=none; b=Rh88l2EY7MgOYeOf+NAtziRgx6QV/jETdMfRJdtXWTGv3F1XyIpDEJqPGLU5XchUvNKJcp Z2Ym1Bb6mI70Xn3LN0jG1Sc0kIHNIAJO1JbiOOjMuztkyShcZ1VnXE8QvmPgH1YsHuCkGF 16kdGOOVq1OguBqK54lCBYiwMGlaA23FKCbadNsdVtlMB+NWYsffAQw5KZV/oMQkM7KFUK pcb1+7tSIP8fP7cfXtn8U0Pjf6uNi6llYu2OH2s3LpNktcEA4UygBarYfHLrL+wIgBZd3m JZkj/n2KkYkk46VdC+FmzD6cFx5DPf0z2m+un1gkbVDnPDj/mQ3RsiKumcjF0Q== 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 4TbgGJ69KZz1BFW; Fri, 16 Feb 2024 05:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41G5JKwO045831; Fri, 16 Feb 2024 05:19:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G5JKkN045828; Fri, 16 Feb 2024 05:19:20 GMT (envelope-from git) Date: Fri, 16 Feb 2024 05:19:20 GMT Message-Id: <202402160519.41G5JKkN045828@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 52d7bd8c4268 - stable/14 - graid: MFC: unbreak Promise RAID1 with 4+ providers 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: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 52d7bd8c42689e44e6de4808c284b6213104b910 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=52d7bd8c42689e44e6de4808c284b6213104b910 commit 52d7bd8c42689e44e6de4808c284b6213104b910 Author: Eugene Grosbein AuthorDate: 2024-02-12 07:24:28 +0000 Commit: Eugene Grosbein CommitDate: 2024-02-16 05:18:43 +0000 graid: MFC: unbreak Promise RAID1 with 4+ providers Fix a problem in graid implementation of Promise RAID1 created with 4+ disks. Such an array generally works fine until reboot only due to a bug in metadata writing code. Before the fix, next taste erronously created RAID1E (kind of RAID10) instead of RAID1, hence graid used wrong offsets for I/O operations. The bug did not affect Promise RAID1 arrays with 2 or 3 disks only. Reviewed by: mav (cherry picked from commit 81092e92ea5184c4eeedad58044d72cfef72dd24) --- sys/geom/raid/md_promise.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/geom/raid/md_promise.c b/sys/geom/raid/md_promise.c index 1c22c0756dfd..da2ea3d7da4e 100644 --- a/sys/geom/raid/md_promise.c +++ b/sys/geom/raid/md_promise.c @@ -1763,8 +1763,9 @@ g_raid_md_write_promise(struct g_raid_md_object *md, struct g_raid_volume *tvol, meta->total_disks = vol->v_disks_count; meta->stripe_shift = ffs(vol->v_strip_size / 1024); meta->array_width = vol->v_disks_count; - if (vol->v_raid_level == G_RAID_VOLUME_RL_RAID1 || - vol->v_raid_level == G_RAID_VOLUME_RL_RAID1E) + if (vol->v_raid_level == G_RAID_VOLUME_RL_RAID1) + meta->array_width = 1; + else if (vol->v_raid_level == G_RAID_VOLUME_RL_RAID1E) meta->array_width /= 2; meta->array_number = vol->v_global_id; meta->total_sectors = vol->v_mediasize / 512; From nobody Fri Feb 16 05:24:56 2024 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 4TbgNm5xgYz59mlb; Fri, 16 Feb 2024 05:24:56 +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 4TbgNm5RxGz4YGn; Fri, 16 Feb 2024 05:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708061096; 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=d7c3csSrlDCamk8skKb6eWNKGn8Pv82rr9SdSJvm53M=; b=GoQrCzrbMkPPgFvt7zPiCUcnfGlHugpUQd34W8Gt4ePDx9zdxkQDv2IGRpve1A4kIv4w8m DCT98ggBJjdmzLzFck5FPUlIZMDNpRptsgWuZ9RVZuB8BPjpsTjMAR14UHDs1CvGCKhddh TvdSMO8SqsIdsP3MvM96VjDUz9xcrzxGICXi37idpV2AYZg7plzhQS6VIbVmdtmybKLn5U 9saLmfzCC4+dMY5xq4CLN7m9hSl57wbVgsQoTYK1iG1z59qWgFayCZgSFd5Z/Q/FxA+/Yd 7u0lS0Wbz+Zkrb+Dm+iFGi0J3BD3WsXQPUdCU1fNS3S0ImIQ54TxLjvcvsR9bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708061096; 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=d7c3csSrlDCamk8skKb6eWNKGn8Pv82rr9SdSJvm53M=; b=YB0F5greFifs3JxHpTs9+p9YeEvHrAbo3+qGX5FGq9uoOTSBmvNvF0W54I7eGcuU1WDjg3 oeFBosDfnIA4M1/hazcX3g35MLxepDoCJQozHlTwUN4jNjZzE582bhlicqHDF+WsPZAhyc gV5EGIY4I6PzTrA2m7EKsIIPyd326daMS2kotlNuGVt4rIa3qXvOPEUj1Q3NXn0+up5UDA 7OxafaOqb4FmqhX5DoiJY5x0t5eQswh/YKUtqDZWAls1jtcQP4w+VkJTScotbo+oOqcAZ0 wuH8kNmNqZ5N8zMxraLUbOpwgcMETvVE8BvtqXIYKeNAPSmOBeDKIv4Exg420Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708061096; a=rsa-sha256; cv=none; b=Dsg0S8ZZskiec2EVT43fwwiJgowen7pUMs2HUqFWpp0knZL4yhw0FOIs789L83vnT675tA o3w6zply5TA0GdZkW2eCJ4I+xv6wgVeIEp8LpVR9tUiZJo4HxahaJTu+e8wqdcjxDUDDGZ m3HHdXn5oJaqEDoEo4L/N55CE26P2BtbDyGK8CYY/OWuCQoAUTCj8gqTWxtaxs8Zebx2qs 6hnAfxmQNfH3fdlgS6U+BbOKHWyLgMkRNEi/Eov34eZLVNBAnfsz++BfGFWeHUpndHP3zX Z3apEmFW+65/JMHjmXaSXekVs6kazl/fgQitZ6bAzlAH/V2fhks1/NILjPLRgw== 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 4TbgNm4Vynz1Blk; Fri, 16 Feb 2024 05:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41G5OuEn062568; Fri, 16 Feb 2024 05:24:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G5OuMB062565; Fri, 16 Feb 2024 05:24:56 GMT (envelope-from git) Date: Fri, 16 Feb 2024 05:24:56 GMT Message-Id: <202402160524.41G5OuMB062565@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 77814c95994a - stable/13 - graid: MFC: unbreak Promise RAID1 with 4+ providers 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: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 77814c95994aab102be0e327de788dc1c00c023d Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=77814c95994aab102be0e327de788dc1c00c023d commit 77814c95994aab102be0e327de788dc1c00c023d Author: Eugene Grosbein AuthorDate: 2024-02-12 07:24:28 +0000 Commit: Eugene Grosbein CommitDate: 2024-02-16 05:24:32 +0000 graid: MFC: unbreak Promise RAID1 with 4+ providers Fix a problem in graid implementation of Promise RAID1 created with 4+ disks. Such an array generally works fine until reboot only due to a bug in metadata writing code. Before the fix, next taste erronously created RAID1E (kind of RAID10) instead of RAID1, hence graid used wrong offsets for I/O operations. The bug did not affect Promise RAID1 arrays with 2 or 3 disks only. Reviewed by: mav (cherry picked from commit 81092e92ea5184c4eeedad58044d72cfef72dd24) --- sys/geom/raid/md_promise.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/geom/raid/md_promise.c b/sys/geom/raid/md_promise.c index 1c22c0756dfd..da2ea3d7da4e 100644 --- a/sys/geom/raid/md_promise.c +++ b/sys/geom/raid/md_promise.c @@ -1763,8 +1763,9 @@ g_raid_md_write_promise(struct g_raid_md_object *md, struct g_raid_volume *tvol, meta->total_disks = vol->v_disks_count; meta->stripe_shift = ffs(vol->v_strip_size / 1024); meta->array_width = vol->v_disks_count; - if (vol->v_raid_level == G_RAID_VOLUME_RL_RAID1 || - vol->v_raid_level == G_RAID_VOLUME_RL_RAID1E) + if (vol->v_raid_level == G_RAID_VOLUME_RL_RAID1) + meta->array_width = 1; + else if (vol->v_raid_level == G_RAID_VOLUME_RL_RAID1E) meta->array_width /= 2; meta->array_number = vol->v_global_id; meta->total_sectors = vol->v_mediasize / 512; From nobody Fri Feb 16 05:31:39 2024 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 4TbgXX1VDJz59nB7; Fri, 16 Feb 2024 05:31:40 +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 4TbgXX0p40z4Yhv; Fri, 16 Feb 2024 05:31:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708061500; 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=RGzxuCBgbKfIrutoCr+XveJ41Fzs9xrAejGtSt4t0AM=; b=nEFZF2/2XqTDeygEne8IWTkQZQlmOAKPbDjEoM86hk7Yop5NTjCvVpbdKRgK3Zko3axOnJ CztduLS0ZlpL/IsNWRLCQKI1Ljl67PIQsu7vpJodlEinCl8TjwlD+2Dy/EsDSGoVg+oHh5 DE/kVWXYXp1KqEIhoevbvCi9i7NjivWtHj0hRFLhTyB88+soFQ1acBBfm5ZfqpGxBFGyQq BlxnBwfhYBlEAB7VoW0uIbPB3gsmaI4dOfqwOLyB0Dvhz0/9Goo/8e7TUj1lAoHC8cM+Uq 83oD35cYuV6Dd0+/Sfi5A5QDgaUkpErs9S/NCAK+ofyfhIgcqm55wiMEorvlwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708061500; 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=RGzxuCBgbKfIrutoCr+XveJ41Fzs9xrAejGtSt4t0AM=; b=nRAfRrJ/JDc4ZSXqofHemu1dRTnRJWmMYQS+zsgTJpaP+IWsJcnmIGFG9u8OBiPJEH3K6l ZEahf4MHnJOwHt/IhIgwglId820lQmNgaQqQ9T73/vxsx/5/AuXntrOfu758CcTr7oyoJL ZOJBzh56cxH9asQ/GupUE5E2egiAfLzZCiyCB1YfKnPw8j1yzlfS3D2RBI13g89AcQGnWq ShNgza+BOyVQlqZLWzg85HVu8N5o+BFDPak3sQ3EE05r8ZLgGPjFlyLv5/bAyNDuDI58Ib Y4BilrWS6QCKoHVTp8GFo25HRIIehRwRyjDF56+bXtFVMUe4gi+CfNlhgxMoLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708061500; a=rsa-sha256; cv=none; b=ZzDyrdEvUMfY5e+qi8q2jNituL4d9NXpSR7JWh4+jo2ez6b/cnNFMp4aBniid0FawPK8wQ 6qtNt5GLxZyEkjNb26pT7dIOsL8/u3Ir7TKgEofaYXY4B5kKj3XFU2UfIEdPRwiR32T/6h A5EekIUlmTDG9UYW8NgMKNuiLVfcSJt6T6YyDJj9EMWyQ886NFgIzxvHsLriiTKMcAr5xz AoRPQ4lSqnE+lvc6piG8CVmXYynp7AxS/7QIDx7EECAkF4WPv23CCWjurDzCgLogpAK7aw +7FtJ1bMl1rGK3g2/p+4XvLULyc/OeNPHsgRs+pOCpEQLevTgaOhMaSVFNb/jQ== 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 4TbgXW6ywKz1C16; Fri, 16 Feb 2024 05:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41G5VdfB074908; Fri, 16 Feb 2024 05:31:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G5VdQQ074905; Fri, 16 Feb 2024 05:31:39 GMT (envelope-from git) Date: Fri, 16 Feb 2024 05:31:39 GMT Message-Id: <202402160531.41G5VdQQ074905@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 68bc302ed0e0 - stable/12 - graid: MFC: unbreak Promise RAID1 with 4+ providers 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: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 68bc302ed0e08d496ee1d7be3cdc9e880ed12893 Auto-Submitted: auto-generated The branch stable/12 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=68bc302ed0e08d496ee1d7be3cdc9e880ed12893 commit 68bc302ed0e08d496ee1d7be3cdc9e880ed12893 Author: Eugene Grosbein AuthorDate: 2024-02-12 07:24:28 +0000 Commit: Eugene Grosbein CommitDate: 2024-02-16 05:31:12 +0000 graid: MFC: unbreak Promise RAID1 with 4+ providers Fix a problem in graid implementation of Promise RAID1 created with 4+ disks. Such an array generally works fine until reboot only due to a bug in metadata writing code. Before the fix, next taste erronously created RAID1E (kind of RAID10) instead of RAID1, hence graid used wrong offsets for I/O operations. The bug did not affect Promise RAID1 arrays with 2 or 3 disks only. Reviewed by: mav (cherry picked from commit 81092e92ea5184c4eeedad58044d72cfef72dd24) --- sys/geom/raid/md_promise.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/geom/raid/md_promise.c b/sys/geom/raid/md_promise.c index edbcd074184f..a7a4a3b637b6 100644 --- a/sys/geom/raid/md_promise.c +++ b/sys/geom/raid/md_promise.c @@ -1766,8 +1766,9 @@ g_raid_md_write_promise(struct g_raid_md_object *md, struct g_raid_volume *tvol, meta->total_disks = vol->v_disks_count; meta->stripe_shift = ffs(vol->v_strip_size / 1024); meta->array_width = vol->v_disks_count; - if (vol->v_raid_level == G_RAID_VOLUME_RL_RAID1 || - vol->v_raid_level == G_RAID_VOLUME_RL_RAID1E) + if (vol->v_raid_level == G_RAID_VOLUME_RL_RAID1) + meta->array_width = 1; + else if (vol->v_raid_level == G_RAID_VOLUME_RL_RAID1E) meta->array_width /= 2; meta->array_number = vol->v_global_id; meta->total_sectors = vol->v_mediasize / 512; From nobody Sat Feb 17 13:45:44 2024 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 4TcVS91Bpmz5B1Qx; Sat, 17 Feb 2024 13:45:45 +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 4TcVS86NSgz4PkX; Sat, 17 Feb 2024 13:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708177544; 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=QUla53S5m0HMRX5q0cYZDlCUm4dTUYF2Gt74ygvmVSQ=; b=NWsPwB8ey6NSUfWPe36/DKKzWKnXrdXzPtEByJfhobY6h+T9YzdzFCWqOHPEBijiKBZ/vr 9z8pmZQSLVI/CqMbtX5zaRdlCPvWDl8QgtG+Vsnjg3pGpBP9Avfw65WQMHBqyFR6lnwRFF 9nrASkl20G0gvWopikHdZUuFkcaW3QSX35vrYAol/fyBmoq2IFftuHl4XqkUTRJU7oC8Zq vsJtiAyjIgUA+9wfnehCPvcf9CJY1ux1munCgAFr6jS1gasPwVmY10JwVRI35hEM7EduJb 46nCZPMjOI83md7l4APFLmWDMmgUR/uFVSskXven96reIWze4GNKBiCACMAIbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708177544; 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=QUla53S5m0HMRX5q0cYZDlCUm4dTUYF2Gt74ygvmVSQ=; b=rQuOEpsGdwT528tPBuqVnuZZn4rAzrByTjDvsfejpLXvF8kcW83SoNQCZ9IE2kK6ZUw/Fc zQmhk8tjNe2Ecp91qCZfFMs1GNSgTWkvN2kScfHXCKH4QvrY3zjwOoiMDLddww4Q1s43zq ZWaT4SD1PLcHHIodSZFudjqW+Uegi9saLrABr6KyxwGBLwe+zAKn1io21QDW6oGd+ndLwR LLFeplQz+WqHX+OrydybJBiLilrjXDKyUunSO+8c8Mvk7qhE7MqLQz+JrR5wEEzFgiybTY U/R9chcF4yRBg4al3XUa6wQNZ0OpPtTaXrheRPepx7IArg0CIiQwucbSx6mpTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708177544; a=rsa-sha256; cv=none; b=nxXoNOWSHz6LJHxGkZnh3fA/zCFz5Fm4H5eq4b7IQ2ZAi5NFveKeOBUbZeIaKJ0JokpHNR YMkoYc/GU4SnCLyLmMNZ0Crd6Asr9tJ67OTS62J06y8njDM7TcAydMGDMXSysoBq+5Vpfn 3b/2AznqgiEGP2VF4IDU8ut9/PhPGs7lXHHF7R6mGhlq79thGqnH7IZ+JiZrEY4rqESEzg MVT/sz1SYL8Td9UMQs0G9Qtfe7gGccNNU4pZp1SwdFcjIP/lK6nMXxs+vWFqKLkbnJlU4R E3ZnApppGTaiollKJZZIecDSQnCSooLmzlaGkqzuXuv1KhrAmas3zfZ3iOavpg== 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 4TcVS85Scvz18KY; Sat, 17 Feb 2024 13:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HDji86028826; Sat, 17 Feb 2024 13:45:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HDji8t028823; Sat, 17 Feb 2024 13:45:44 GMT (envelope-from git) Date: Sat, 17 Feb 2024 13:45:44 GMT Message-Id: <202402171345.41HDji8t028823@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: e2b44c401cc2 - stable/14 - unbound: Vendor import 1.19.1 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e2b44c401cc2a59da8c4c0515c6bcb533d09cc73 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=e2b44c401cc2a59da8c4c0515c6bcb533d09cc73 commit e2b44c401cc2a59da8c4c0515c6bcb533d09cc73 Author: Cy Schubert AuthorDate: 2023-11-13 19:44:16 +0000 Commit: Cy Schubert CommitDate: 2024-02-17 13:44:30 +0000 unbound: Vendor import 1.19.1 Release notes at https://www.nlnetlabs.nl/news/2024/Feb/13/unbound-1.19.1-released/ Security: CVE-2023-50387, CVE-2023-50868 (cherry picked from commit b76ef9a7cb8a7c62d10ae8101f41014f34819174) --- contrib/unbound/config.guess | 11 +- contrib/unbound/config.sub | 29 +- contrib/unbound/configure | 25 +- contrib/unbound/configure.ac | 5 +- contrib/unbound/doc/README | 2 +- contrib/unbound/doc/example.conf.in | 2 +- contrib/unbound/doc/libunbound.3.in | 4 +- contrib/unbound/doc/unbound-anchor.8.in | 2 +- contrib/unbound/doc/unbound-checkconf.8.in | 2 +- contrib/unbound/doc/unbound-control.8.in | 2 +- contrib/unbound/doc/unbound-host.1.in | 2 +- contrib/unbound/doc/unbound.8.in | 4 +- contrib/unbound/doc/unbound.conf.5.in | 2 +- contrib/unbound/services/authzone.c | 3 +- contrib/unbound/services/cache/dns.c | 22 ++ contrib/unbound/services/cache/dns.h | 9 + contrib/unbound/testdata/val_any_negcache.rpl | 3 + contrib/unbound/util/fptr_wlist.c | 1 + contrib/unbound/validator/val_nsec.c | 3 +- contrib/unbound/validator/val_nsec3.c | 316 ++++++++++++---- contrib/unbound/validator/val_nsec3.h | 60 +++- contrib/unbound/validator/val_sigcrypt.c | 37 +- contrib/unbound/validator/val_sigcrypt.h | 3 +- contrib/unbound/validator/val_utils.c | 22 +- contrib/unbound/validator/val_utils.h | 4 +- contrib/unbound/validator/validator.c | 499 ++++++++++++++++++++++---- contrib/unbound/validator/validator.h | 18 + lib/libunbound/config.h | 4 +- 28 files changed, 889 insertions(+), 207 deletions(-) diff --git a/contrib/unbound/config.guess b/contrib/unbound/config.guess index cdfc4392047c..f6d217a49f8f 100755 --- a/contrib/unbound/config.guess +++ b/contrib/unbound/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2023 Free Software Foundation, Inc. +# Copyright 1992-2024 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2023-08-22' +timestamp='2024-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -60,7 +60,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2023 Free Software Foundation, Inc. +Copyright 1992-2024 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -165,6 +165,8 @@ Linux|GNU|GNU/*) LIBC=dietlibc #elif defined(__GLIBC__) LIBC=gnu + #elif defined(__LLVM_LIBC__) + LIBC=llvm #else #include /* First heuristic to detect musl libc. */ @@ -1593,6 +1595,9 @@ EOF *:Unleashed:*:*) GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE ;; + *:Ironclad:*:*) + GUESS=$UNAME_MACHINE-unknown-ironclad + ;; esac # Do we have a guess based on uname results? diff --git a/contrib/unbound/config.sub b/contrib/unbound/config.sub index defe52c0c874..2c6a07ab3c34 100755 --- a/contrib/unbound/config.sub +++ b/contrib/unbound/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2023 Free Software Foundation, Inc. +# Copyright 1992-2024 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2023-09-19' +timestamp='2024-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -76,7 +76,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2023 Free Software Foundation, Inc. +Copyright 1992-2024 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -1222,6 +1222,7 @@ case $cpu-$vendor in | moxie \ | mt \ | msp430 \ + | nanomips* \ | nds32 | nds32le | nds32be \ | nfp \ | nios | nios2 | nios2eb | nios2el \ @@ -1253,6 +1254,7 @@ case $cpu-$vendor in | ubicom32 \ | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ | vax \ + | vc4 \ | visium \ | w65 \ | wasm32 | wasm64 \ @@ -1597,7 +1599,7 @@ case $cpu-$vendor in os= obj=elf ;; - mips*-*) + mips*-*|nanomips*-*) os= obj=elf ;; @@ -1721,7 +1723,7 @@ fi case $os in # Sometimes we do "kernel-libc", so those need to count as OSes. - musl* | newlib* | relibc* | uclibc*) + llvm* | musl* | newlib* | relibc* | uclibc*) ;; # Likewise for "kernel-abi" eabi* | gnueabi*) @@ -1766,12 +1768,19 @@ case $os in | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ - | fiwix* | mlibc* | cos* | mbr* ) + | fiwix* | mlibc* | cos* | mbr* | ironclad* ) ;; # This one is extra strict with allowed versions sco3.2v2 | sco3.2v[4-9]* | sco5v6*) # Don't forget version if it is 3.2v4 or newer. ;; + # This refers to builds using the UEFI calling convention + # (which depends on the architecture) and PE file format. + # Note that this is both a different calling convention and + # different file format than that of GNU-EFI + # (x86_64-w64-mingw32). + uefi) + ;; none) ;; kernel* | msvc* ) @@ -1818,8 +1827,9 @@ esac # As a final step for OS-related things, validate the OS-kernel combination # (given a valid OS), if there is a kernel. case $kernel-$os-$obj in - linux-gnu*- | linux-dietlibc*- | linux-android*- | linux-newlib*- \ - | linux-musl*- | linux-relibc*- | linux-uclibc*- | linux-mlibc*- ) + linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \ + | linux-mlibc*- | linux-musl*- | linux-newlib*- \ + | linux-relibc*- | linux-uclibc*- ) ;; uclinux-uclibc*- ) ;; @@ -1827,7 +1837,8 @@ case $kernel-$os-$obj in ;; windows*-msvc*-) ;; - -dietlibc*- | -newlib*- | -musl*- | -relibc*- | -uclibc*- | -mlibc*- ) + -dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -relibc*- \ + | -uclibc*- ) # These are just libc implementations, not actual OSes, and thus # require a kernel. echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2 diff --git a/contrib/unbound/configure b/contrib/unbound/configure index fbe6f8697742..c87c669c8435 100755 --- a/contrib/unbound/configure +++ b/contrib/unbound/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for unbound 1.19.0. +# Generated by GNU Autoconf 2.69 for unbound 1.19.1. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.19.0' -PACKAGE_STRING='unbound 1.19.0' +PACKAGE_VERSION='1.19.1' +PACKAGE_STRING='unbound 1.19.1' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues' PACKAGE_URL='' @@ -1477,7 +1477,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures unbound 1.19.0 to adapt to many kinds of systems. +\`configure' configures unbound 1.19.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1543,7 +1543,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.19.0:";; + short | recursive ) echo "Configuration of unbound 1.19.1:";; esac cat <<\_ACEOF @@ -1785,7 +1785,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.19.0 +unbound configure 1.19.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2494,7 +2494,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by unbound $as_me 1.19.0, which was +It was created by unbound $as_me 1.19.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2846,11 +2846,11 @@ UNBOUND_VERSION_MAJOR=1 UNBOUND_VERSION_MINOR=19 -UNBOUND_VERSION_MICRO=0 +UNBOUND_VERSION_MICRO=1 LIBUNBOUND_CURRENT=9 -LIBUNBOUND_REVISION=23 +LIBUNBOUND_REVISION=24 LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -2941,6 +2941,7 @@ LIBUNBOUND_AGE=1 # 1.17.1 had 9:21:1 # 1.18.0 had 9:22:1 # 1.19.0 had 9:23:1 +# 1.19.1 had 9:24:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -21894,7 +21895,7 @@ _ACEOF -version=1.19.0 +version=1.19.1 date=`date +'%b %e, %Y'` @@ -22413,7 +22414,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by unbound $as_me 1.19.0, which was +This file was extended by unbound $as_me 1.19.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22479,7 +22480,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -unbound config.status 1.19.0 +unbound config.status 1.19.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/contrib/unbound/configure.ac b/contrib/unbound/configure.ac index 1b999596d09a..70fc7e7fdf49 100644 --- a/contrib/unbound/configure.ac +++ b/contrib/unbound/configure.ac @@ -11,14 +11,14 @@ sinclude(dnscrypt/dnscrypt.m4) # must be numbers. ac_defun because of later processing m4_define([VERSION_MAJOR],[1]) m4_define([VERSION_MINOR],[19]) -m4_define([VERSION_MICRO],[0]) +m4_define([VERSION_MICRO],[1]) AC_INIT([unbound],m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]),[unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues],[unbound]) AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR]) AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR]) AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO]) LIBUNBOUND_CURRENT=9 -LIBUNBOUND_REVISION=23 +LIBUNBOUND_REVISION=24 LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -109,6 +109,7 @@ LIBUNBOUND_AGE=1 # 1.17.1 had 9:21:1 # 1.18.0 had 9:22:1 # 1.19.0 had 9:23:1 +# 1.19.1 had 9:24:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary diff --git a/contrib/unbound/doc/README b/contrib/unbound/doc/README index 592a9f4ae8d2..eef91ce02836 100644 --- a/contrib/unbound/doc/README +++ b/contrib/unbound/doc/README @@ -1,4 +1,4 @@ -README for Unbound 1.19.0 +README for Unbound 1.19.1 Copyright 2007 NLnet Labs http://unbound.net diff --git a/contrib/unbound/doc/example.conf.in b/contrib/unbound/doc/example.conf.in index fe0dde69fa19..fcfb1da815db 100644 --- a/contrib/unbound/doc/example.conf.in +++ b/contrib/unbound/doc/example.conf.in @@ -1,7 +1,7 @@ # # Example configuration file. # -# See unbound.conf(5) man page, version 1.19.0. +# See unbound.conf(5) man page, version 1.19.1. # # this is a comment. diff --git a/contrib/unbound/doc/libunbound.3.in b/contrib/unbound/doc/libunbound.3.in index fa090d58186f..4a55eaa9e2ca 100644 --- a/contrib/unbound/doc/libunbound.3.in +++ b/contrib/unbound/doc/libunbound.3.in @@ -1,4 +1,4 @@ -.TH "libunbound" "3" "Nov 8, 2023" "NLnet Labs" "unbound 1.19.0" +.TH "libunbound" "3" "Feb 13, 2024" "NLnet Labs" "unbound 1.19.1" .\" .\" libunbound.3 -- unbound library functions manual .\" @@ -44,7 +44,7 @@ .B ub_ctx_zone_remove, .B ub_ctx_data_add, .B ub_ctx_data_remove -\- Unbound DNS validating resolver 1.19.0 functions. +\- Unbound DNS validating resolver 1.19.1 functions. .SH "SYNOPSIS" .B #include .LP diff --git a/contrib/unbound/doc/unbound-anchor.8.in b/contrib/unbound/doc/unbound-anchor.8.in index a108db9faa72..fee56e9dfa51 100644 --- a/contrib/unbound/doc/unbound-anchor.8.in +++ b/contrib/unbound/doc/unbound-anchor.8.in @@ -1,4 +1,4 @@ -.TH "unbound-anchor" "8" "Nov 8, 2023" "NLnet Labs" "unbound 1.19.0" +.TH "unbound-anchor" "8" "Feb 13, 2024" "NLnet Labs" "unbound 1.19.1" .\" .\" unbound-anchor.8 -- unbound anchor maintenance utility manual .\" diff --git a/contrib/unbound/doc/unbound-checkconf.8.in b/contrib/unbound/doc/unbound-checkconf.8.in index b80c723cd3f0..9a14ef06bc3d 100644 --- a/contrib/unbound/doc/unbound-checkconf.8.in +++ b/contrib/unbound/doc/unbound-checkconf.8.in @@ -1,4 +1,4 @@ -.TH "unbound-checkconf" "8" "Nov 8, 2023" "NLnet Labs" "unbound 1.19.0" +.TH "unbound-checkconf" "8" "Feb 13, 2024" "NLnet Labs" "unbound 1.19.1" .\" .\" unbound-checkconf.8 -- unbound configuration checker manual .\" diff --git a/contrib/unbound/doc/unbound-control.8.in b/contrib/unbound/doc/unbound-control.8.in index 44e73c93dfd5..e747ec47e25a 100644 --- a/contrib/unbound/doc/unbound-control.8.in +++ b/contrib/unbound/doc/unbound-control.8.in @@ -1,4 +1,4 @@ -.TH "unbound-control" "8" "Nov 8, 2023" "NLnet Labs" "unbound 1.19.0" +.TH "unbound-control" "8" "Feb 13, 2024" "NLnet Labs" "unbound 1.19.1" .\" .\" unbound-control.8 -- unbound remote control manual .\" diff --git a/contrib/unbound/doc/unbound-host.1.in b/contrib/unbound/doc/unbound-host.1.in index 36f22ee9b6d1..9c9e9e2bf4a0 100644 --- a/contrib/unbound/doc/unbound-host.1.in +++ b/contrib/unbound/doc/unbound-host.1.in @@ -1,4 +1,4 @@ -.TH "unbound\-host" "1" "Nov 8, 2023" "NLnet Labs" "unbound 1.19.0" +.TH "unbound\-host" "1" "Feb 13, 2024" "NLnet Labs" "unbound 1.19.1" .\" .\" unbound-host.1 -- unbound DNS lookup utility .\" diff --git a/contrib/unbound/doc/unbound.8.in b/contrib/unbound/doc/unbound.8.in index 3d56b7bfa190..4967a22d328c 100644 --- a/contrib/unbound/doc/unbound.8.in +++ b/contrib/unbound/doc/unbound.8.in @@ -1,4 +1,4 @@ -.TH "unbound" "8" "Nov 8, 2023" "NLnet Labs" "unbound 1.19.0" +.TH "unbound" "8" "Feb 13, 2024" "NLnet Labs" "unbound 1.19.1" .\" .\" unbound.8 -- unbound manual .\" @@ -9,7 +9,7 @@ .\" .SH "NAME" .B unbound -\- Unbound DNS validating resolver 1.19.0. +\- Unbound DNS validating resolver 1.19.1. .SH "SYNOPSIS" .B unbound .RB [ \-h ] diff --git a/contrib/unbound/doc/unbound.conf.5.in b/contrib/unbound/doc/unbound.conf.5.in index ac8fa7953f3c..79ca04904c96 100644 --- a/contrib/unbound/doc/unbound.conf.5.in +++ b/contrib/unbound/doc/unbound.conf.5.in @@ -1,4 +1,4 @@ -.TH "unbound.conf" "5" "Nov 8, 2023" "NLnet Labs" "unbound 1.19.0" +.TH "unbound.conf" "5" "Feb 13, 2024" "NLnet Labs" "unbound 1.19.1" .\" .\" unbound.conf.5 -- unbound.conf manual .\" diff --git a/contrib/unbound/services/authzone.c b/contrib/unbound/services/authzone.c index 87844870a25a..761bcc6d9a75 100644 --- a/contrib/unbound/services/authzone.c +++ b/contrib/unbound/services/authzone.c @@ -7774,6 +7774,7 @@ static int zonemd_dnssec_verify_rrset(struct auth_zone* z, enum sec_status sec; struct val_env* ve; int m; + int verified = 0; m = modstack_find(mods, "validator"); if(m == -1) { auth_zone_log(z->name, VERB_ALGO, "zonemd dnssec verify: have " @@ -7797,7 +7798,7 @@ static int zonemd_dnssec_verify_rrset(struct auth_zone* z, "zonemd: verify %s RRset with DNSKEY", typestr); } sec = dnskeyset_verify_rrset(env, ve, &pk, dnskey, sigalg, why_bogus, NULL, - LDNS_SECTION_ANSWER, NULL); + LDNS_SECTION_ANSWER, NULL, &verified); if(sec == sec_status_secure) { return 1; } diff --git a/contrib/unbound/services/cache/dns.c b/contrib/unbound/services/cache/dns.c index 9b4ad5888721..7bc1b7b47bf1 100644 --- a/contrib/unbound/services/cache/dns.c +++ b/contrib/unbound/services/cache/dns.c @@ -690,6 +690,28 @@ tomsg(struct module_env* env, struct query_info* q, struct reply_info* r, return msg; } +struct dns_msg* +dns_msg_deepcopy_region(struct dns_msg* origin, struct regional* region) +{ + size_t i; + struct dns_msg* res = NULL; + res = gen_dns_msg(region, &origin->qinfo, origin->rep->rrset_count); + if(!res) return NULL; + *res->rep = *origin->rep; + if(origin->rep->reason_bogus_str) { + res->rep->reason_bogus_str = regional_strdup(region, + origin->rep->reason_bogus_str); + } + for(i=0; irep->rrset_count; i++) { + res->rep->rrsets[i] = packed_rrset_copy_region( + origin->rep->rrsets[i], region, 0); + if(!res->rep->rrsets[i]) { + return NULL; + } + } + return res; +} + /** synthesize RRset-only response from cached RRset item */ static struct dns_msg* rrset_msg(struct ub_packed_rrset_key* rrset, struct regional* region, diff --git a/contrib/unbound/services/cache/dns.h b/contrib/unbound/services/cache/dns.h index 147f992cbc74..c2bf23c6de54 100644 --- a/contrib/unbound/services/cache/dns.h +++ b/contrib/unbound/services/cache/dns.h @@ -164,6 +164,15 @@ struct dns_msg* tomsg(struct module_env* env, struct query_info* q, struct reply_info* r, struct regional* region, time_t now, int allow_expired, struct regional* scratch); +/** + * Deep copy a dns_msg to a region. + * @param origin: the dns_msg to copy. + * @param region: the region to copy all the data to. + * @return the new dns_msg or NULL on malloc error. + */ +struct dns_msg* dns_msg_deepcopy_region(struct dns_msg* origin, + struct regional* region); + /** * Find cached message * @param env: module environment with the DNS cache. diff --git a/contrib/unbound/testdata/val_any_negcache.rpl b/contrib/unbound/testdata/val_any_negcache.rpl index 77aacba8cc13..8800a2140219 100644 --- a/contrib/unbound/testdata/val_any_negcache.rpl +++ b/contrib/unbound/testdata/val_any_negcache.rpl @@ -199,6 +199,9 @@ SECTION QUESTION example.com. IN ANY ENTRY_END +; Allow validation resuming for the RRSIGs +STEP 21 TIME_PASSES ELAPSE 0.05 + ; recursion happens here. STEP 30 CHECK_ANSWER ENTRY_BEGIN diff --git a/contrib/unbound/util/fptr_wlist.c b/contrib/unbound/util/fptr_wlist.c index 43d38dc3797d..a792a3429549 100644 --- a/contrib/unbound/util/fptr_wlist.c +++ b/contrib/unbound/util/fptr_wlist.c @@ -131,6 +131,7 @@ fptr_whitelist_comm_timer(void (*fptr)(void*)) else if(fptr == &pending_udp_timer_delay_cb) return 1; else if(fptr == &worker_stat_timer_cb) return 1; else if(fptr == &worker_probe_timer_cb) return 1; + else if(fptr == &validate_suspend_timer_cb) return 1; #ifdef UB_ON_WINDOWS else if(fptr == &wsvc_cron_cb) return 1; #endif diff --git a/contrib/unbound/validator/val_nsec.c b/contrib/unbound/validator/val_nsec.c index 17c90d83f594..d0cc67ff5d0b 100644 --- a/contrib/unbound/validator/val_nsec.c +++ b/contrib/unbound/validator/val_nsec.c @@ -181,6 +181,7 @@ nsec_verify_rrset(struct module_env* env, struct val_env* ve, { struct packed_rrset_data* d = (struct packed_rrset_data*) nsec->entry.data; + int verified = 0; if(!d) return 0; if(d->security == sec_status_secure) return 1; @@ -188,7 +189,7 @@ nsec_verify_rrset(struct module_env* env, struct val_env* ve, if(d->security == sec_status_secure) return 1; d->security = val_verify_rrset_entry(env, ve, nsec, kkey, reason, - reason_bogus, LDNS_SECTION_AUTHORITY, qstate); + reason_bogus, LDNS_SECTION_AUTHORITY, qstate, &verified); if(d->security == sec_status_secure) { rrset_update_sec_status(env->rrset_cache, nsec, *env->now); return 1; diff --git a/contrib/unbound/validator/val_nsec3.c b/contrib/unbound/validator/val_nsec3.c index a2b3794f6019..95d1e4d7e4fe 100644 --- a/contrib/unbound/validator/val_nsec3.c +++ b/contrib/unbound/validator/val_nsec3.c @@ -57,6 +57,19 @@ /* we include nsec.h for the bitmap_has_type function */ #include "validator/val_nsec.h" #include "sldns/sbuffer.h" +#include "util/config_file.h" + +/** + * Max number of NSEC3 calculations at once, suspend query for later. + * 8 is low enough and allows for cases where multiple proofs are needed. + */ +#define MAX_NSEC3_CALCULATIONS 8 +/** + * When all allowed NSEC3 calculations at once resulted in error treat as + * bogus. NSEC3 hash errors are not cached and this helps breaks loops with + * erroneous data. + */ +#define MAX_NSEC3_ERRORS -1 /** * This function we get from ldns-compat or from base system @@ -532,6 +545,17 @@ nsec3_hash_cmp(const void* c1, const void* c2) return memcmp(s1, s2, s1len); } +int +nsec3_cache_table_init(struct nsec3_cache_table* ct, struct regional* region) +{ + if(ct->ct) return 1; + ct->ct = (rbtree_type*)regional_alloc(region, sizeof(*ct->ct)); + if(!ct->ct) return 0; + ct->region = region; + rbtree_init(ct->ct, &nsec3_hash_cmp); + return 1; +} + size_t nsec3_get_hashed(sldns_buffer* buf, uint8_t* nm, size_t nmlen, int algo, size_t iter, uint8_t* salt, size_t saltlen, uint8_t* res, size_t max) @@ -646,7 +670,7 @@ nsec3_hash_name(rbtree_type* table, struct regional* region, sldns_buffer* buf, c = (struct nsec3_cached_hash*)rbtree_search(table, &looki); if(c) { *hash = c; - return 1; + return 2; } /* create a new entry */ c = (struct nsec3_cached_hash*)regional_alloc(region, sizeof(*c)); @@ -658,10 +682,10 @@ nsec3_hash_name(rbtree_type* table, struct regional* region, sldns_buffer* buf, c->dname_len = dname_len; r = nsec3_calc_hash(region, buf, c); if(r != 1) - return r; + return r; /* returns -1 or 0 */ r = nsec3_calc_b32(region, buf, c); if(r != 1) - return r; + return r; /* returns 0 */ #ifdef UNBOUND_DEBUG n = #else @@ -704,6 +728,7 @@ nsec3_hash_matches_owner(struct nsec3_filter* flt, struct nsec3_cached_hash* hash, struct ub_packed_rrset_key* s) { uint8_t* nm = s->rk.dname; + if(!hash) return 0; /* please clang */ /* compare, does hash of name based on params in this NSEC3 * match the owner name of this NSEC3? * name must be: base32 . zone name @@ -730,34 +755,50 @@ nsec3_hash_matches_owner(struct nsec3_filter* flt, * @param nmlen: length of name. * @param rrset: nsec3 that matches is returned here. * @param rr: rr number in nsec3 rrset that matches. + * @param calculations: current hash calculations. * @return true if a matching NSEC3 is found, false if not. */ static int find_matching_nsec3(struct module_env* env, struct nsec3_filter* flt, - rbtree_type* ct, uint8_t* nm, size_t nmlen, - struct ub_packed_rrset_key** rrset, int* rr) + struct nsec3_cache_table* ct, uint8_t* nm, size_t nmlen, + struct ub_packed_rrset_key** rrset, int* rr, + int* calculations) { size_t i_rs; int i_rr; struct ub_packed_rrset_key* s; struct nsec3_cached_hash* hash = NULL; int r; + int calc_errors = 0; /* this loop skips other-zone and unknown NSEC3s, also non-NSEC3 RRs */ for(s=filter_first(flt, &i_rs, &i_rr); s; s=filter_next(flt, &i_rs, &i_rr)) { + /* check if we are allowed more calculations */ + if(*calculations >= MAX_NSEC3_CALCULATIONS) { + if(calc_errors == *calculations) { + *calculations = MAX_NSEC3_ERRORS; + } + break; + } /* get name hashed for this NSEC3 RR */ - r = nsec3_hash_name(ct, env->scratch, env->scratch_buffer, + r = nsec3_hash_name(ct->ct, ct->region, env->scratch_buffer, s, i_rr, nm, nmlen, &hash); if(r == 0) { log_err("nsec3: malloc failure"); break; /* alloc failure */ - } else if(r != 1) - continue; /* malformed NSEC3 */ - else if(nsec3_hash_matches_owner(flt, hash, s)) { - *rrset = s; /* rrset with this name */ - *rr = i_rr; /* matches hash with these parameters */ - return 1; + } else if(r < 0) { + /* malformed NSEC3 */ + calc_errors++; + (*calculations)++; + continue; + } else { + if(r == 1) (*calculations)++; + if(nsec3_hash_matches_owner(flt, hash, s)) { + *rrset = s; /* rrset with this name */ + *rr = i_rr; /* matches hash with these parameters */ + return 1; + } } } *rrset = NULL; @@ -775,6 +816,7 @@ nsec3_covers(uint8_t* zone, struct nsec3_cached_hash* hash, if(!nsec3_get_nextowner(rrset, rr, &next, &nextlen)) return 0; /* malformed RR proves nothing */ + if(!hash) return 0; /* please clang */ /* check the owner name is a hashed value . apex * base32 encoded values must have equal length. * hash_value and next hash value must have equal length. */ @@ -823,35 +865,51 @@ nsec3_covers(uint8_t* zone, struct nsec3_cached_hash* hash, * @param nmlen: length of name. * @param rrset: covering NSEC3 rrset is returned here. * @param rr: rr of cover is returned here. + * @param calculations: current hash calculations. * @return true if a covering NSEC3 is found, false if not. */ static int find_covering_nsec3(struct module_env* env, struct nsec3_filter* flt, - rbtree_type* ct, uint8_t* nm, size_t nmlen, - struct ub_packed_rrset_key** rrset, int* rr) + struct nsec3_cache_table* ct, uint8_t* nm, size_t nmlen, + struct ub_packed_rrset_key** rrset, int* rr, + int* calculations) { size_t i_rs; int i_rr; struct ub_packed_rrset_key* s; struct nsec3_cached_hash* hash = NULL; int r; + int calc_errors = 0; /* this loop skips other-zone and unknown NSEC3s, also non-NSEC3 RRs */ for(s=filter_first(flt, &i_rs, &i_rr); s; s=filter_next(flt, &i_rs, &i_rr)) { + /* check if we are allowed more calculations */ + if(*calculations >= MAX_NSEC3_CALCULATIONS) { + if(calc_errors == *calculations) { + *calculations = MAX_NSEC3_ERRORS; + } + break; + } /* get name hashed for this NSEC3 RR */ - r = nsec3_hash_name(ct, env->scratch, env->scratch_buffer, + r = nsec3_hash_name(ct->ct, ct->region, env->scratch_buffer, s, i_rr, nm, nmlen, &hash); if(r == 0) { log_err("nsec3: malloc failure"); break; /* alloc failure */ - } else if(r != 1) - continue; /* malformed NSEC3 */ - else if(nsec3_covers(flt->zone, hash, s, i_rr, - env->scratch_buffer)) { - *rrset = s; /* rrset with this name */ - *rr = i_rr; /* covers hash with these parameters */ - return 1; + } else if(r < 0) { + /* malformed NSEC3 */ + calc_errors++; + (*calculations)++; + continue; + } else { + if(r == 1) (*calculations)++; + if(nsec3_covers(flt->zone, hash, s, i_rr, + env->scratch_buffer)) { + *rrset = s; /* rrset with this name */ + *rr = i_rr; /* covers hash with these parameters */ + return 1; + } } } *rrset = NULL; @@ -869,11 +927,13 @@ find_covering_nsec3(struct module_env* env, struct nsec3_filter* flt, * @param ct: cached hashes table. * @param qinfo: query that is verified for. * @param ce: closest encloser information is returned in here. + * @param calculations: current hash calculations. * @return true if a closest encloser candidate is found, false if not. */ static int -nsec3_find_closest_encloser(struct module_env* env, struct nsec3_filter* flt, - rbtree_type* ct, struct query_info* qinfo, struct ce_response* ce) +nsec3_find_closest_encloser(struct module_env* env, struct nsec3_filter* flt, + struct nsec3_cache_table* ct, struct query_info* qinfo, + struct ce_response* ce, int* calculations) { uint8_t* nm = qinfo->qname; size_t nmlen = qinfo->qname_len; @@ -888,8 +948,12 @@ nsec3_find_closest_encloser(struct module_env* env, struct nsec3_filter* flt, * may be the case. */ while(dname_subdomain_c(nm, flt->zone)) { + if(*calculations >= MAX_NSEC3_CALCULATIONS || + *calculations == MAX_NSEC3_ERRORS) { + return 0; + } if(find_matching_nsec3(env, flt, ct, nm, nmlen, - &ce->ce_rrset, &ce->ce_rr)) { + &ce->ce_rrset, &ce->ce_rr, calculations)) { ce->ce = nm; ce->ce_len = nmlen; return 1; @@ -933,22 +997,38 @@ next_closer(uint8_t* qname, size_t qnamelen, uint8_t* ce, * If set true, and the return value is true, then you can be * certain that the ce.nc_rrset and ce.nc_rr are set properly. * @param ce: closest encloser information is returned in here. + * @param calculations: pointer to the current NSEC3 hash calculations. * @return bogus if no closest encloser could be proven. * secure if a closest encloser could be proven, ce is set. * insecure if the closest-encloser candidate turns out to prove * that an insecure delegation exists above the qname. + * unchecked if no more hash calculations are allowed at this point. */ static enum sec_status -nsec3_prove_closest_encloser(struct module_env* env, struct nsec3_filter* flt, - rbtree_type* ct, struct query_info* qinfo, int prove_does_not_exist, - struct ce_response* ce) +nsec3_prove_closest_encloser(struct module_env* env, struct nsec3_filter* flt, + struct nsec3_cache_table* ct, struct query_info* qinfo, + int prove_does_not_exist, struct ce_response* ce, int* calculations) { uint8_t* nc; size_t nc_len; /* robust: clean out ce, in case it gets abused later */ memset(ce, 0, sizeof(*ce)); - if(!nsec3_find_closest_encloser(env, flt, ct, qinfo, ce)) { + if(!nsec3_find_closest_encloser(env, flt, ct, qinfo, ce, calculations)) { + if(*calculations == MAX_NSEC3_ERRORS) { + verbose(VERB_ALGO, "nsec3 proveClosestEncloser: could " + "not find a candidate for the closest " + "encloser; all attempted hash calculations " + "were erroneous; bogus"); + return sec_status_bogus; + } else if(*calculations >= MAX_NSEC3_CALCULATIONS) { + verbose(VERB_ALGO, "nsec3 proveClosestEncloser: could " + "not find a candidate for the closest " + "encloser; reached MAX_NSEC3_CALCULATIONS " + "(%d); unchecked still", + MAX_NSEC3_CALCULATIONS); + return sec_status_unchecked; + } verbose(VERB_ALGO, "nsec3 proveClosestEncloser: could " "not find a candidate for the closest encloser."); return sec_status_bogus; @@ -989,9 +1069,23 @@ nsec3_prove_closest_encloser(struct module_env* env, struct nsec3_filter* flt, /* Otherwise, we need to show that the next closer name is covered. */ next_closer(qinfo->qname, qinfo->qname_len, ce->ce, &nc, &nc_len); if(!find_covering_nsec3(env, flt, ct, nc, nc_len, - &ce->nc_rrset, &ce->nc_rr)) { + &ce->nc_rrset, &ce->nc_rr, calculations)) { + if(*calculations == MAX_NSEC3_ERRORS) { + verbose(VERB_ALGO, "nsec3: Could not find proof that the " + "candidate encloser was the closest encloser; " + "all attempted hash calculations were " + "erroneous; bogus"); + return sec_status_bogus; + } else if(*calculations >= MAX_NSEC3_CALCULATIONS) { + verbose(VERB_ALGO, "nsec3: Could not find proof that the " + "candidate encloser was the closest encloser; " + "reached MAX_NSEC3_CALCULATIONS (%d); " + "unchecked still", + MAX_NSEC3_CALCULATIONS); + return sec_status_unchecked; + } verbose(VERB_ALGO, "nsec3: Could not find proof that the " - "candidate encloser was the closest encloser"); + "candidate encloser was the closest encloser"); return sec_status_bogus; } return sec_status_secure; @@ -1019,8 +1113,8 @@ nsec3_ce_wildcard(struct regional* region, uint8_t* ce, size_t celen, /** Do the name error proof */ static enum sec_status -nsec3_do_prove_nameerror(struct module_env* env, struct nsec3_filter* flt, - rbtree_type* ct, struct query_info* qinfo) +nsec3_do_prove_nameerror(struct module_env* env, struct nsec3_filter* flt, + struct nsec3_cache_table* ct, struct query_info* qinfo, int* calc) { struct ce_response ce; uint8_t* wc; @@ -1032,11 +1126,15 @@ nsec3_do_prove_nameerror(struct module_env* env, struct nsec3_filter* flt, /* First locate and prove the closest encloser to qname. We will * use the variant that fails if the closest encloser turns out * to be qname. */ - sec = nsec3_prove_closest_encloser(env, flt, ct, qinfo, 1, &ce); + sec = nsec3_prove_closest_encloser(env, flt, ct, qinfo, 1, &ce, calc); if(sec != sec_status_secure) { if(sec == sec_status_bogus) verbose(VERB_ALGO, "nsec3 nameerror proof: failed " "to prove a closest encloser"); + else if(sec == sec_status_unchecked) + verbose(VERB_ALGO, "nsec3 nameerror proof: will " + "continue proving closest encloser after " + "suspend"); else verbose(VERB_ALGO, "nsec3 nameerror proof: closest " "nsec3 is an insecure delegation"); return sec; @@ -1046,9 +1144,27 @@ nsec3_do_prove_nameerror(struct module_env* env, struct nsec3_filter* flt, /* At this point, we know that qname does not exist. Now we need * to prove that the wildcard does not exist. */ log_assert(ce.ce); - wc = nsec3_ce_wildcard(env->scratch, ce.ce, ce.ce_len, &wclen); - if(!wc || !find_covering_nsec3(env, flt, ct, wc, wclen, - &wc_rrset, &wc_rr)) { + wc = nsec3_ce_wildcard(ct->region, ce.ce, ce.ce_len, &wclen); + if(!wc) { + verbose(VERB_ALGO, "nsec3 nameerror proof: could not prove " + "that the applicable wildcard did not exist."); + return sec_status_bogus; + } + if(!find_covering_nsec3(env, flt, ct, wc, wclen, &wc_rrset, &wc_rr, calc)) { + if(*calc == MAX_NSEC3_ERRORS) { + verbose(VERB_ALGO, "nsec3 nameerror proof: could not prove " + "that the applicable wildcard did not exist; " + "all attempted hash calculations were " + "erroneous; bogus"); + return sec_status_bogus; + } else if(*calc >= MAX_NSEC3_CALCULATIONS) { + verbose(VERB_ALGO, "nsec3 nameerror proof: could not prove " + "that the applicable wildcard did not exist; " + "reached MAX_NSEC3_CALCULATIONS (%d); " + "unchecked still", + MAX_NSEC3_CALCULATIONS); + return sec_status_unchecked; + } verbose(VERB_ALGO, "nsec3 nameerror proof: could not prove " "that the applicable wildcard did not exist."); return sec_status_bogus; @@ -1064,14 +1180,13 @@ nsec3_do_prove_nameerror(struct module_env* env, struct nsec3_filter* flt, enum sec_status nsec3_prove_nameerror(struct module_env* env, struct val_env* ve, struct ub_packed_rrset_key** list, size_t num, - struct query_info* qinfo, struct key_entry_key* kkey) + struct query_info* qinfo, struct key_entry_key* kkey, + struct nsec3_cache_table* ct, int* calc) { - rbtree_type ct; struct nsec3_filter flt; if(!list || num == 0 || !kkey || !key_entry_isgood(kkey)) return sec_status_bogus; /* no valid NSEC3s, bogus */ - rbtree_init(&ct, &nsec3_hash_cmp); /* init names-to-hash cache */ filter_init(&flt, list, num, qinfo); /* init RR iterator */ if(!flt.zone) return sec_status_bogus; /* no RRs */ @@ -1079,7 +1194,7 @@ nsec3_prove_nameerror(struct module_env* env, struct val_env* ve, return sec_status_insecure; /* iteration count too high */ log_nametypeclass(VERB_ALGO, "start nsec3 nameerror proof, zone", flt.zone, 0, 0); - return nsec3_do_prove_nameerror(env, &flt, &ct, qinfo); + return nsec3_do_prove_nameerror(env, &flt, ct, qinfo, calc); } /* @@ -1089,8 +1204,9 @@ nsec3_prove_nameerror(struct module_env* env, struct val_env* ve, /** Do the nodata proof */ static enum sec_status -nsec3_do_prove_nodata(struct module_env* env, struct nsec3_filter* flt, - rbtree_type* ct, struct query_info* qinfo) +nsec3_do_prove_nodata(struct module_env* env, struct nsec3_filter* flt, + struct nsec3_cache_table* ct, struct query_info* qinfo, + int* calc) { struct ce_response ce; uint8_t* wc; @@ -1100,7 +1216,7 @@ nsec3_do_prove_nodata(struct module_env* env, struct nsec3_filter* flt, enum sec_status sec; if(find_matching_nsec3(env, flt, ct, qinfo->qname, qinfo->qname_len, - &rrset, &rr)) { + &rrset, &rr, calc)) { /* cases 1 and 2 */ if(nsec3_has_type(rrset, rr, qinfo->qtype)) { verbose(VERB_ALGO, "proveNodata: Matching NSEC3 " @@ -1144,11 +1260,23 @@ nsec3_do_prove_nodata(struct module_env* env, struct nsec3_filter* flt, } return sec_status_secure; } + if(*calc == MAX_NSEC3_ERRORS) { + verbose(VERB_ALGO, "proveNodata: all attempted hash " + "calculations were erroneous while finding a matching " + "NSEC3, bogus"); + return sec_status_bogus; + } else if(*calc >= MAX_NSEC3_CALCULATIONS) { + verbose(VERB_ALGO, "proveNodata: reached " + "MAX_NSEC3_CALCULATIONS (%d) while finding a " + "matching NSEC3; unchecked still", *** 1722 LINES SKIPPED *** From nobody Sat Feb 17 13:48:29 2024 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 4TcVWK5mjmz5B26n; Sat, 17 Feb 2024 13:48:29 +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 4TcVWK2Szbz4QNS; Sat, 17 Feb 2024 13:48:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708177709; 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=mfQ8LgzI2Jx3FHhAH8/ZAQh0UfeCOXcqXUoYCGrHfyo=; b=jYkn39l+5YE8vMECnzlj7sr7Xs9LfzFDLcByy49PzV06TuSDo/1Ezrb24VXauVoPuEwsVm SinredFl1UlD665Ruu36JZJWzzTFjQJL9TYDvlGp9ZQu9jqf17zxguNjYT4F7x8OAuGTT5 x6UN0HEb4Yxr4WP2ztqkaqjeOmCOM64d3aW3Vwv5xESviSPJ9v6FG3268z3Ov3JVRuEIA4 D+Z6A+P4Z2YfQqPUPyzltRkbhy72E/JMxXVf/ga4wiILEkBmACvAu+KgJR3U+baLxga0sA SynmE1TYjkVD2KdNxIttG0FkdGRMICmmvtt8kbEMO4jC9OcdH46uhxOL83Jt8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708177709; 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=mfQ8LgzI2Jx3FHhAH8/ZAQh0UfeCOXcqXUoYCGrHfyo=; b=wJ2mGJcgjtr8xe7/OfDykSjZlC/2pUdYYPyK+MgCd3HTQqj4LcMTvnD+FdI+tS8NW/GJFz CPkTRskKxyBUxqdYvEjaASVB16ltNKOw7hAD0VkACbacWvw00oxbCnZMES+m2mzJ/gPjBU HbpkjNX6wbm4ze1SkwXo5pQW+0Sf9loPrGocNMyu1iVini5j3yoZzppLlCFfRsVYRMlyUK tOoKPJs0kGbT3ZdkTU2bj0RO7tEMHX5nxX7mUc4dhHY1AyWAoEoRpGGmEBGV5rpP6Cg82J 8PZrkxjtbMPXeX76QExP6rVnMnh2dq1RTIubjZ1wHX65sS1UUT2ucCXM4FFlKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708177709; a=rsa-sha256; cv=none; b=NW65deukS7ekAWwZKFAmWJ5hzjSa85u/GrMiYsEBB/UYet4p6y94U1KxPIebX+2fJJ5+8b leaFLFRqHvkBYAJma09n6bVo7g5Ho7a6D8D6IDvU3v7vG8yqmxoMFbpCtj/Flu5SmUyHLg VtfWclE4d+lKWWZGLZ5q85DG/mP9g5XnZB2sXhI2FBn6GeVuwaBjPk1TyK9NdtkPwGtWkM 8Cp8Fkw3tFPKYtJ4lZ99hQ3e1K9UcgTCf81Zs0kyaLVXA8JVsgcfYJdei3ZxzD4+V6y3Xf 9Ti9C+PcWgfA3qqC3CKjv9h4Xn0A3Z0dFfg9YPHaFWpOeJSCdHnKDKZewvibpQ== 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 4TcVWK1Wcqz19Cs; Sat, 17 Feb 2024 13:48:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HDmT32029299; Sat, 17 Feb 2024 13:48:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HDmT47029296; Sat, 17 Feb 2024 13:48:29 GMT (envelope-from git) Date: Sat, 17 Feb 2024 13:48:29 GMT Message-Id: <202402171348.41HDmT47029296@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: abe4ced2b9de - stable/13 - unbound: Vendor import 1.19.1 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: abe4ced2b9de0a3dd44d7e2068cfd7fa2b428c16 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=abe4ced2b9de0a3dd44d7e2068cfd7fa2b428c16 commit abe4ced2b9de0a3dd44d7e2068cfd7fa2b428c16 Author: Cy Schubert AuthorDate: 2023-11-13 19:44:16 +0000 Commit: Cy Schubert CommitDate: 2024-02-17 13:47:29 +0000 unbound: Vendor import 1.19.1 Release notes at https://www.nlnetlabs.nl/news/2024/Feb/13/unbound-1.19.1-released/ Security: CVE-2023-50387, CVE-2023-50868 MFC after: 3 days (cherry picked from commit b76ef9a7cb8a7c62d10ae8101f41014f34819174) --- contrib/unbound/config.guess | 11 +- contrib/unbound/config.sub | 29 +- contrib/unbound/configure | 25 +- contrib/unbound/configure.ac | 5 +- contrib/unbound/doc/README | 2 +- contrib/unbound/doc/example.conf.in | 2 +- contrib/unbound/doc/libunbound.3.in | 4 +- contrib/unbound/doc/unbound-anchor.8.in | 2 +- contrib/unbound/doc/unbound-checkconf.8.in | 2 +- contrib/unbound/doc/unbound-control.8.in | 2 +- contrib/unbound/doc/unbound-host.1.in | 2 +- contrib/unbound/doc/unbound.8.in | 4 +- contrib/unbound/doc/unbound.conf.5.in | 2 +- contrib/unbound/services/authzone.c | 3 +- contrib/unbound/services/cache/dns.c | 22 ++ contrib/unbound/services/cache/dns.h | 9 + contrib/unbound/testdata/val_any_negcache.rpl | 3 + contrib/unbound/util/fptr_wlist.c | 1 + contrib/unbound/validator/val_nsec.c | 3 +- contrib/unbound/validator/val_nsec3.c | 316 ++++++++++++---- contrib/unbound/validator/val_nsec3.h | 60 +++- contrib/unbound/validator/val_sigcrypt.c | 37 +- contrib/unbound/validator/val_sigcrypt.h | 3 +- contrib/unbound/validator/val_utils.c | 22 +- contrib/unbound/validator/val_utils.h | 4 +- contrib/unbound/validator/validator.c | 499 ++++++++++++++++++++++---- contrib/unbound/validator/validator.h | 18 + usr.sbin/unbound/config.h | 4 +- 28 files changed, 889 insertions(+), 207 deletions(-) diff --git a/contrib/unbound/config.guess b/contrib/unbound/config.guess index cdfc4392047c..f6d217a49f8f 100755 --- a/contrib/unbound/config.guess +++ b/contrib/unbound/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2023 Free Software Foundation, Inc. +# Copyright 1992-2024 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2023-08-22' +timestamp='2024-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -60,7 +60,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2023 Free Software Foundation, Inc. +Copyright 1992-2024 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -165,6 +165,8 @@ Linux|GNU|GNU/*) LIBC=dietlibc #elif defined(__GLIBC__) LIBC=gnu + #elif defined(__LLVM_LIBC__) + LIBC=llvm #else #include /* First heuristic to detect musl libc. */ @@ -1593,6 +1595,9 @@ EOF *:Unleashed:*:*) GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE ;; + *:Ironclad:*:*) + GUESS=$UNAME_MACHINE-unknown-ironclad + ;; esac # Do we have a guess based on uname results? diff --git a/contrib/unbound/config.sub b/contrib/unbound/config.sub index defe52c0c874..2c6a07ab3c34 100755 --- a/contrib/unbound/config.sub +++ b/contrib/unbound/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2023 Free Software Foundation, Inc. +# Copyright 1992-2024 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2023-09-19' +timestamp='2024-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -76,7 +76,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2023 Free Software Foundation, Inc. +Copyright 1992-2024 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -1222,6 +1222,7 @@ case $cpu-$vendor in | moxie \ | mt \ | msp430 \ + | nanomips* \ | nds32 | nds32le | nds32be \ | nfp \ | nios | nios2 | nios2eb | nios2el \ @@ -1253,6 +1254,7 @@ case $cpu-$vendor in | ubicom32 \ | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ | vax \ + | vc4 \ | visium \ | w65 \ | wasm32 | wasm64 \ @@ -1597,7 +1599,7 @@ case $cpu-$vendor in os= obj=elf ;; - mips*-*) + mips*-*|nanomips*-*) os= obj=elf ;; @@ -1721,7 +1723,7 @@ fi case $os in # Sometimes we do "kernel-libc", so those need to count as OSes. - musl* | newlib* | relibc* | uclibc*) + llvm* | musl* | newlib* | relibc* | uclibc*) ;; # Likewise for "kernel-abi" eabi* | gnueabi*) @@ -1766,12 +1768,19 @@ case $os in | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ - | fiwix* | mlibc* | cos* | mbr* ) + | fiwix* | mlibc* | cos* | mbr* | ironclad* ) ;; # This one is extra strict with allowed versions sco3.2v2 | sco3.2v[4-9]* | sco5v6*) # Don't forget version if it is 3.2v4 or newer. ;; + # This refers to builds using the UEFI calling convention + # (which depends on the architecture) and PE file format. + # Note that this is both a different calling convention and + # different file format than that of GNU-EFI + # (x86_64-w64-mingw32). + uefi) + ;; none) ;; kernel* | msvc* ) @@ -1818,8 +1827,9 @@ esac # As a final step for OS-related things, validate the OS-kernel combination # (given a valid OS), if there is a kernel. case $kernel-$os-$obj in - linux-gnu*- | linux-dietlibc*- | linux-android*- | linux-newlib*- \ - | linux-musl*- | linux-relibc*- | linux-uclibc*- | linux-mlibc*- ) + linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \ + | linux-mlibc*- | linux-musl*- | linux-newlib*- \ + | linux-relibc*- | linux-uclibc*- ) ;; uclinux-uclibc*- ) ;; @@ -1827,7 +1837,8 @@ case $kernel-$os-$obj in ;; windows*-msvc*-) ;; - -dietlibc*- | -newlib*- | -musl*- | -relibc*- | -uclibc*- | -mlibc*- ) + -dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -relibc*- \ + | -uclibc*- ) # These are just libc implementations, not actual OSes, and thus # require a kernel. echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2 diff --git a/contrib/unbound/configure b/contrib/unbound/configure index fbe6f8697742..c87c669c8435 100755 --- a/contrib/unbound/configure +++ b/contrib/unbound/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for unbound 1.19.0. +# Generated by GNU Autoconf 2.69 for unbound 1.19.1. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.19.0' -PACKAGE_STRING='unbound 1.19.0' +PACKAGE_VERSION='1.19.1' +PACKAGE_STRING='unbound 1.19.1' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues' PACKAGE_URL='' @@ -1477,7 +1477,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures unbound 1.19.0 to adapt to many kinds of systems. +\`configure' configures unbound 1.19.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1543,7 +1543,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.19.0:";; + short | recursive ) echo "Configuration of unbound 1.19.1:";; esac cat <<\_ACEOF @@ -1785,7 +1785,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.19.0 +unbound configure 1.19.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2494,7 +2494,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by unbound $as_me 1.19.0, which was +It was created by unbound $as_me 1.19.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2846,11 +2846,11 @@ UNBOUND_VERSION_MAJOR=1 UNBOUND_VERSION_MINOR=19 -UNBOUND_VERSION_MICRO=0 +UNBOUND_VERSION_MICRO=1 LIBUNBOUND_CURRENT=9 -LIBUNBOUND_REVISION=23 +LIBUNBOUND_REVISION=24 LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -2941,6 +2941,7 @@ LIBUNBOUND_AGE=1 # 1.17.1 had 9:21:1 # 1.18.0 had 9:22:1 # 1.19.0 had 9:23:1 +# 1.19.1 had 9:24:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -21894,7 +21895,7 @@ _ACEOF -version=1.19.0 +version=1.19.1 date=`date +'%b %e, %Y'` @@ -22413,7 +22414,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by unbound $as_me 1.19.0, which was +This file was extended by unbound $as_me 1.19.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22479,7 +22480,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -unbound config.status 1.19.0 +unbound config.status 1.19.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/contrib/unbound/configure.ac b/contrib/unbound/configure.ac index 1b999596d09a..70fc7e7fdf49 100644 --- a/contrib/unbound/configure.ac +++ b/contrib/unbound/configure.ac @@ -11,14 +11,14 @@ sinclude(dnscrypt/dnscrypt.m4) # must be numbers. ac_defun because of later processing m4_define([VERSION_MAJOR],[1]) m4_define([VERSION_MINOR],[19]) -m4_define([VERSION_MICRO],[0]) +m4_define([VERSION_MICRO],[1]) AC_INIT([unbound],m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]),[unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues],[unbound]) AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR]) AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR]) AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO]) LIBUNBOUND_CURRENT=9 -LIBUNBOUND_REVISION=23 +LIBUNBOUND_REVISION=24 LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -109,6 +109,7 @@ LIBUNBOUND_AGE=1 # 1.17.1 had 9:21:1 # 1.18.0 had 9:22:1 # 1.19.0 had 9:23:1 +# 1.19.1 had 9:24:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary diff --git a/contrib/unbound/doc/README b/contrib/unbound/doc/README index 592a9f4ae8d2..eef91ce02836 100644 --- a/contrib/unbound/doc/README +++ b/contrib/unbound/doc/README @@ -1,4 +1,4 @@ -README for Unbound 1.19.0 +README for Unbound 1.19.1 Copyright 2007 NLnet Labs http://unbound.net diff --git a/contrib/unbound/doc/example.conf.in b/contrib/unbound/doc/example.conf.in index fe0dde69fa19..fcfb1da815db 100644 --- a/contrib/unbound/doc/example.conf.in +++ b/contrib/unbound/doc/example.conf.in @@ -1,7 +1,7 @@ # # Example configuration file. # -# See unbound.conf(5) man page, version 1.19.0. +# See unbound.conf(5) man page, version 1.19.1. # # this is a comment. diff --git a/contrib/unbound/doc/libunbound.3.in b/contrib/unbound/doc/libunbound.3.in index fa090d58186f..4a55eaa9e2ca 100644 --- a/contrib/unbound/doc/libunbound.3.in +++ b/contrib/unbound/doc/libunbound.3.in @@ -1,4 +1,4 @@ -.TH "libunbound" "3" "Nov 8, 2023" "NLnet Labs" "unbound 1.19.0" +.TH "libunbound" "3" "Feb 13, 2024" "NLnet Labs" "unbound 1.19.1" .\" .\" libunbound.3 -- unbound library functions manual .\" @@ -44,7 +44,7 @@ .B ub_ctx_zone_remove, .B ub_ctx_data_add, .B ub_ctx_data_remove -\- Unbound DNS validating resolver 1.19.0 functions. +\- Unbound DNS validating resolver 1.19.1 functions. .SH "SYNOPSIS" .B #include .LP diff --git a/contrib/unbound/doc/unbound-anchor.8.in b/contrib/unbound/doc/unbound-anchor.8.in index a108db9faa72..fee56e9dfa51 100644 --- a/contrib/unbound/doc/unbound-anchor.8.in +++ b/contrib/unbound/doc/unbound-anchor.8.in @@ -1,4 +1,4 @@ -.TH "unbound-anchor" "8" "Nov 8, 2023" "NLnet Labs" "unbound 1.19.0" +.TH "unbound-anchor" "8" "Feb 13, 2024" "NLnet Labs" "unbound 1.19.1" .\" .\" unbound-anchor.8 -- unbound anchor maintenance utility manual .\" diff --git a/contrib/unbound/doc/unbound-checkconf.8.in b/contrib/unbound/doc/unbound-checkconf.8.in index b80c723cd3f0..9a14ef06bc3d 100644 --- a/contrib/unbound/doc/unbound-checkconf.8.in +++ b/contrib/unbound/doc/unbound-checkconf.8.in @@ -1,4 +1,4 @@ -.TH "unbound-checkconf" "8" "Nov 8, 2023" "NLnet Labs" "unbound 1.19.0" +.TH "unbound-checkconf" "8" "Feb 13, 2024" "NLnet Labs" "unbound 1.19.1" .\" .\" unbound-checkconf.8 -- unbound configuration checker manual .\" diff --git a/contrib/unbound/doc/unbound-control.8.in b/contrib/unbound/doc/unbound-control.8.in index 44e73c93dfd5..e747ec47e25a 100644 --- a/contrib/unbound/doc/unbound-control.8.in +++ b/contrib/unbound/doc/unbound-control.8.in @@ -1,4 +1,4 @@ -.TH "unbound-control" "8" "Nov 8, 2023" "NLnet Labs" "unbound 1.19.0" +.TH "unbound-control" "8" "Feb 13, 2024" "NLnet Labs" "unbound 1.19.1" .\" .\" unbound-control.8 -- unbound remote control manual .\" diff --git a/contrib/unbound/doc/unbound-host.1.in b/contrib/unbound/doc/unbound-host.1.in index 36f22ee9b6d1..9c9e9e2bf4a0 100644 --- a/contrib/unbound/doc/unbound-host.1.in +++ b/contrib/unbound/doc/unbound-host.1.in @@ -1,4 +1,4 @@ -.TH "unbound\-host" "1" "Nov 8, 2023" "NLnet Labs" "unbound 1.19.0" +.TH "unbound\-host" "1" "Feb 13, 2024" "NLnet Labs" "unbound 1.19.1" .\" .\" unbound-host.1 -- unbound DNS lookup utility .\" diff --git a/contrib/unbound/doc/unbound.8.in b/contrib/unbound/doc/unbound.8.in index 3d56b7bfa190..4967a22d328c 100644 --- a/contrib/unbound/doc/unbound.8.in +++ b/contrib/unbound/doc/unbound.8.in @@ -1,4 +1,4 @@ -.TH "unbound" "8" "Nov 8, 2023" "NLnet Labs" "unbound 1.19.0" +.TH "unbound" "8" "Feb 13, 2024" "NLnet Labs" "unbound 1.19.1" .\" .\" unbound.8 -- unbound manual .\" @@ -9,7 +9,7 @@ .\" .SH "NAME" .B unbound -\- Unbound DNS validating resolver 1.19.0. +\- Unbound DNS validating resolver 1.19.1. .SH "SYNOPSIS" .B unbound .RB [ \-h ] diff --git a/contrib/unbound/doc/unbound.conf.5.in b/contrib/unbound/doc/unbound.conf.5.in index ac8fa7953f3c..79ca04904c96 100644 --- a/contrib/unbound/doc/unbound.conf.5.in +++ b/contrib/unbound/doc/unbound.conf.5.in @@ -1,4 +1,4 @@ -.TH "unbound.conf" "5" "Nov 8, 2023" "NLnet Labs" "unbound 1.19.0" +.TH "unbound.conf" "5" "Feb 13, 2024" "NLnet Labs" "unbound 1.19.1" .\" .\" unbound.conf.5 -- unbound.conf manual .\" diff --git a/contrib/unbound/services/authzone.c b/contrib/unbound/services/authzone.c index 87844870a25a..761bcc6d9a75 100644 --- a/contrib/unbound/services/authzone.c +++ b/contrib/unbound/services/authzone.c @@ -7774,6 +7774,7 @@ static int zonemd_dnssec_verify_rrset(struct auth_zone* z, enum sec_status sec; struct val_env* ve; int m; + int verified = 0; m = modstack_find(mods, "validator"); if(m == -1) { auth_zone_log(z->name, VERB_ALGO, "zonemd dnssec verify: have " @@ -7797,7 +7798,7 @@ static int zonemd_dnssec_verify_rrset(struct auth_zone* z, "zonemd: verify %s RRset with DNSKEY", typestr); } sec = dnskeyset_verify_rrset(env, ve, &pk, dnskey, sigalg, why_bogus, NULL, - LDNS_SECTION_ANSWER, NULL); + LDNS_SECTION_ANSWER, NULL, &verified); if(sec == sec_status_secure) { return 1; } diff --git a/contrib/unbound/services/cache/dns.c b/contrib/unbound/services/cache/dns.c index 9b4ad5888721..7bc1b7b47bf1 100644 --- a/contrib/unbound/services/cache/dns.c +++ b/contrib/unbound/services/cache/dns.c @@ -690,6 +690,28 @@ tomsg(struct module_env* env, struct query_info* q, struct reply_info* r, return msg; } +struct dns_msg* +dns_msg_deepcopy_region(struct dns_msg* origin, struct regional* region) +{ + size_t i; + struct dns_msg* res = NULL; + res = gen_dns_msg(region, &origin->qinfo, origin->rep->rrset_count); + if(!res) return NULL; + *res->rep = *origin->rep; + if(origin->rep->reason_bogus_str) { + res->rep->reason_bogus_str = regional_strdup(region, + origin->rep->reason_bogus_str); + } + for(i=0; irep->rrset_count; i++) { + res->rep->rrsets[i] = packed_rrset_copy_region( + origin->rep->rrsets[i], region, 0); + if(!res->rep->rrsets[i]) { + return NULL; + } + } + return res; +} + /** synthesize RRset-only response from cached RRset item */ static struct dns_msg* rrset_msg(struct ub_packed_rrset_key* rrset, struct regional* region, diff --git a/contrib/unbound/services/cache/dns.h b/contrib/unbound/services/cache/dns.h index 147f992cbc74..c2bf23c6de54 100644 --- a/contrib/unbound/services/cache/dns.h +++ b/contrib/unbound/services/cache/dns.h @@ -164,6 +164,15 @@ struct dns_msg* tomsg(struct module_env* env, struct query_info* q, struct reply_info* r, struct regional* region, time_t now, int allow_expired, struct regional* scratch); +/** + * Deep copy a dns_msg to a region. + * @param origin: the dns_msg to copy. + * @param region: the region to copy all the data to. + * @return the new dns_msg or NULL on malloc error. + */ +struct dns_msg* dns_msg_deepcopy_region(struct dns_msg* origin, + struct regional* region); + /** * Find cached message * @param env: module environment with the DNS cache. diff --git a/contrib/unbound/testdata/val_any_negcache.rpl b/contrib/unbound/testdata/val_any_negcache.rpl index 77aacba8cc13..8800a2140219 100644 --- a/contrib/unbound/testdata/val_any_negcache.rpl +++ b/contrib/unbound/testdata/val_any_negcache.rpl @@ -199,6 +199,9 @@ SECTION QUESTION example.com. IN ANY ENTRY_END +; Allow validation resuming for the RRSIGs +STEP 21 TIME_PASSES ELAPSE 0.05 + ; recursion happens here. STEP 30 CHECK_ANSWER ENTRY_BEGIN diff --git a/contrib/unbound/util/fptr_wlist.c b/contrib/unbound/util/fptr_wlist.c index 43d38dc3797d..a792a3429549 100644 --- a/contrib/unbound/util/fptr_wlist.c +++ b/contrib/unbound/util/fptr_wlist.c @@ -131,6 +131,7 @@ fptr_whitelist_comm_timer(void (*fptr)(void*)) else if(fptr == &pending_udp_timer_delay_cb) return 1; else if(fptr == &worker_stat_timer_cb) return 1; else if(fptr == &worker_probe_timer_cb) return 1; + else if(fptr == &validate_suspend_timer_cb) return 1; #ifdef UB_ON_WINDOWS else if(fptr == &wsvc_cron_cb) return 1; #endif diff --git a/contrib/unbound/validator/val_nsec.c b/contrib/unbound/validator/val_nsec.c index 17c90d83f594..d0cc67ff5d0b 100644 --- a/contrib/unbound/validator/val_nsec.c +++ b/contrib/unbound/validator/val_nsec.c @@ -181,6 +181,7 @@ nsec_verify_rrset(struct module_env* env, struct val_env* ve, { struct packed_rrset_data* d = (struct packed_rrset_data*) nsec->entry.data; + int verified = 0; if(!d) return 0; if(d->security == sec_status_secure) return 1; @@ -188,7 +189,7 @@ nsec_verify_rrset(struct module_env* env, struct val_env* ve, if(d->security == sec_status_secure) return 1; d->security = val_verify_rrset_entry(env, ve, nsec, kkey, reason, - reason_bogus, LDNS_SECTION_AUTHORITY, qstate); + reason_bogus, LDNS_SECTION_AUTHORITY, qstate, &verified); if(d->security == sec_status_secure) { rrset_update_sec_status(env->rrset_cache, nsec, *env->now); return 1; diff --git a/contrib/unbound/validator/val_nsec3.c b/contrib/unbound/validator/val_nsec3.c index a2b3794f6019..95d1e4d7e4fe 100644 --- a/contrib/unbound/validator/val_nsec3.c +++ b/contrib/unbound/validator/val_nsec3.c @@ -57,6 +57,19 @@ /* we include nsec.h for the bitmap_has_type function */ #include "validator/val_nsec.h" #include "sldns/sbuffer.h" +#include "util/config_file.h" + +/** + * Max number of NSEC3 calculations at once, suspend query for later. + * 8 is low enough and allows for cases where multiple proofs are needed. + */ +#define MAX_NSEC3_CALCULATIONS 8 +/** + * When all allowed NSEC3 calculations at once resulted in error treat as + * bogus. NSEC3 hash errors are not cached and this helps breaks loops with + * erroneous data. + */ +#define MAX_NSEC3_ERRORS -1 /** * This function we get from ldns-compat or from base system @@ -532,6 +545,17 @@ nsec3_hash_cmp(const void* c1, const void* c2) return memcmp(s1, s2, s1len); } +int +nsec3_cache_table_init(struct nsec3_cache_table* ct, struct regional* region) +{ + if(ct->ct) return 1; + ct->ct = (rbtree_type*)regional_alloc(region, sizeof(*ct->ct)); + if(!ct->ct) return 0; + ct->region = region; + rbtree_init(ct->ct, &nsec3_hash_cmp); + return 1; +} + size_t nsec3_get_hashed(sldns_buffer* buf, uint8_t* nm, size_t nmlen, int algo, size_t iter, uint8_t* salt, size_t saltlen, uint8_t* res, size_t max) @@ -646,7 +670,7 @@ nsec3_hash_name(rbtree_type* table, struct regional* region, sldns_buffer* buf, c = (struct nsec3_cached_hash*)rbtree_search(table, &looki); if(c) { *hash = c; - return 1; + return 2; } /* create a new entry */ c = (struct nsec3_cached_hash*)regional_alloc(region, sizeof(*c)); @@ -658,10 +682,10 @@ nsec3_hash_name(rbtree_type* table, struct regional* region, sldns_buffer* buf, c->dname_len = dname_len; r = nsec3_calc_hash(region, buf, c); if(r != 1) - return r; + return r; /* returns -1 or 0 */ r = nsec3_calc_b32(region, buf, c); if(r != 1) - return r; + return r; /* returns 0 */ #ifdef UNBOUND_DEBUG n = #else @@ -704,6 +728,7 @@ nsec3_hash_matches_owner(struct nsec3_filter* flt, struct nsec3_cached_hash* hash, struct ub_packed_rrset_key* s) { uint8_t* nm = s->rk.dname; + if(!hash) return 0; /* please clang */ /* compare, does hash of name based on params in this NSEC3 * match the owner name of this NSEC3? * name must be: base32 . zone name @@ -730,34 +755,50 @@ nsec3_hash_matches_owner(struct nsec3_filter* flt, * @param nmlen: length of name. * @param rrset: nsec3 that matches is returned here. * @param rr: rr number in nsec3 rrset that matches. + * @param calculations: current hash calculations. * @return true if a matching NSEC3 is found, false if not. */ static int find_matching_nsec3(struct module_env* env, struct nsec3_filter* flt, - rbtree_type* ct, uint8_t* nm, size_t nmlen, - struct ub_packed_rrset_key** rrset, int* rr) + struct nsec3_cache_table* ct, uint8_t* nm, size_t nmlen, + struct ub_packed_rrset_key** rrset, int* rr, + int* calculations) { size_t i_rs; int i_rr; struct ub_packed_rrset_key* s; struct nsec3_cached_hash* hash = NULL; int r; + int calc_errors = 0; /* this loop skips other-zone and unknown NSEC3s, also non-NSEC3 RRs */ for(s=filter_first(flt, &i_rs, &i_rr); s; s=filter_next(flt, &i_rs, &i_rr)) { + /* check if we are allowed more calculations */ + if(*calculations >= MAX_NSEC3_CALCULATIONS) { + if(calc_errors == *calculations) { + *calculations = MAX_NSEC3_ERRORS; + } + break; + } /* get name hashed for this NSEC3 RR */ - r = nsec3_hash_name(ct, env->scratch, env->scratch_buffer, + r = nsec3_hash_name(ct->ct, ct->region, env->scratch_buffer, s, i_rr, nm, nmlen, &hash); if(r == 0) { log_err("nsec3: malloc failure"); break; /* alloc failure */ - } else if(r != 1) - continue; /* malformed NSEC3 */ - else if(nsec3_hash_matches_owner(flt, hash, s)) { - *rrset = s; /* rrset with this name */ - *rr = i_rr; /* matches hash with these parameters */ - return 1; + } else if(r < 0) { + /* malformed NSEC3 */ + calc_errors++; + (*calculations)++; + continue; + } else { + if(r == 1) (*calculations)++; + if(nsec3_hash_matches_owner(flt, hash, s)) { + *rrset = s; /* rrset with this name */ + *rr = i_rr; /* matches hash with these parameters */ + return 1; + } } } *rrset = NULL; @@ -775,6 +816,7 @@ nsec3_covers(uint8_t* zone, struct nsec3_cached_hash* hash, if(!nsec3_get_nextowner(rrset, rr, &next, &nextlen)) return 0; /* malformed RR proves nothing */ + if(!hash) return 0; /* please clang */ /* check the owner name is a hashed value . apex * base32 encoded values must have equal length. * hash_value and next hash value must have equal length. */ @@ -823,35 +865,51 @@ nsec3_covers(uint8_t* zone, struct nsec3_cached_hash* hash, * @param nmlen: length of name. * @param rrset: covering NSEC3 rrset is returned here. * @param rr: rr of cover is returned here. + * @param calculations: current hash calculations. * @return true if a covering NSEC3 is found, false if not. */ static int find_covering_nsec3(struct module_env* env, struct nsec3_filter* flt, - rbtree_type* ct, uint8_t* nm, size_t nmlen, - struct ub_packed_rrset_key** rrset, int* rr) + struct nsec3_cache_table* ct, uint8_t* nm, size_t nmlen, + struct ub_packed_rrset_key** rrset, int* rr, + int* calculations) { size_t i_rs; int i_rr; struct ub_packed_rrset_key* s; struct nsec3_cached_hash* hash = NULL; int r; + int calc_errors = 0; /* this loop skips other-zone and unknown NSEC3s, also non-NSEC3 RRs */ for(s=filter_first(flt, &i_rs, &i_rr); s; s=filter_next(flt, &i_rs, &i_rr)) { + /* check if we are allowed more calculations */ + if(*calculations >= MAX_NSEC3_CALCULATIONS) { + if(calc_errors == *calculations) { + *calculations = MAX_NSEC3_ERRORS; + } + break; + } /* get name hashed for this NSEC3 RR */ - r = nsec3_hash_name(ct, env->scratch, env->scratch_buffer, + r = nsec3_hash_name(ct->ct, ct->region, env->scratch_buffer, s, i_rr, nm, nmlen, &hash); if(r == 0) { log_err("nsec3: malloc failure"); break; /* alloc failure */ - } else if(r != 1) - continue; /* malformed NSEC3 */ - else if(nsec3_covers(flt->zone, hash, s, i_rr, - env->scratch_buffer)) { - *rrset = s; /* rrset with this name */ - *rr = i_rr; /* covers hash with these parameters */ - return 1; + } else if(r < 0) { + /* malformed NSEC3 */ + calc_errors++; + (*calculations)++; + continue; + } else { + if(r == 1) (*calculations)++; + if(nsec3_covers(flt->zone, hash, s, i_rr, + env->scratch_buffer)) { + *rrset = s; /* rrset with this name */ + *rr = i_rr; /* covers hash with these parameters */ + return 1; + } } } *rrset = NULL; @@ -869,11 +927,13 @@ find_covering_nsec3(struct module_env* env, struct nsec3_filter* flt, * @param ct: cached hashes table. * @param qinfo: query that is verified for. * @param ce: closest encloser information is returned in here. + * @param calculations: current hash calculations. * @return true if a closest encloser candidate is found, false if not. */ static int -nsec3_find_closest_encloser(struct module_env* env, struct nsec3_filter* flt, - rbtree_type* ct, struct query_info* qinfo, struct ce_response* ce) +nsec3_find_closest_encloser(struct module_env* env, struct nsec3_filter* flt, + struct nsec3_cache_table* ct, struct query_info* qinfo, + struct ce_response* ce, int* calculations) { uint8_t* nm = qinfo->qname; size_t nmlen = qinfo->qname_len; @@ -888,8 +948,12 @@ nsec3_find_closest_encloser(struct module_env* env, struct nsec3_filter* flt, * may be the case. */ while(dname_subdomain_c(nm, flt->zone)) { + if(*calculations >= MAX_NSEC3_CALCULATIONS || + *calculations == MAX_NSEC3_ERRORS) { + return 0; + } if(find_matching_nsec3(env, flt, ct, nm, nmlen, - &ce->ce_rrset, &ce->ce_rr)) { + &ce->ce_rrset, &ce->ce_rr, calculations)) { ce->ce = nm; ce->ce_len = nmlen; return 1; @@ -933,22 +997,38 @@ next_closer(uint8_t* qname, size_t qnamelen, uint8_t* ce, * If set true, and the return value is true, then you can be * certain that the ce.nc_rrset and ce.nc_rr are set properly. * @param ce: closest encloser information is returned in here. + * @param calculations: pointer to the current NSEC3 hash calculations. * @return bogus if no closest encloser could be proven. * secure if a closest encloser could be proven, ce is set. * insecure if the closest-encloser candidate turns out to prove * that an insecure delegation exists above the qname. + * unchecked if no more hash calculations are allowed at this point. */ static enum sec_status -nsec3_prove_closest_encloser(struct module_env* env, struct nsec3_filter* flt, - rbtree_type* ct, struct query_info* qinfo, int prove_does_not_exist, - struct ce_response* ce) +nsec3_prove_closest_encloser(struct module_env* env, struct nsec3_filter* flt, + struct nsec3_cache_table* ct, struct query_info* qinfo, + int prove_does_not_exist, struct ce_response* ce, int* calculations) { uint8_t* nc; size_t nc_len; /* robust: clean out ce, in case it gets abused later */ memset(ce, 0, sizeof(*ce)); - if(!nsec3_find_closest_encloser(env, flt, ct, qinfo, ce)) { + if(!nsec3_find_closest_encloser(env, flt, ct, qinfo, ce, calculations)) { + if(*calculations == MAX_NSEC3_ERRORS) { + verbose(VERB_ALGO, "nsec3 proveClosestEncloser: could " + "not find a candidate for the closest " + "encloser; all attempted hash calculations " + "were erroneous; bogus"); + return sec_status_bogus; + } else if(*calculations >= MAX_NSEC3_CALCULATIONS) { + verbose(VERB_ALGO, "nsec3 proveClosestEncloser: could " + "not find a candidate for the closest " + "encloser; reached MAX_NSEC3_CALCULATIONS " + "(%d); unchecked still", + MAX_NSEC3_CALCULATIONS); + return sec_status_unchecked; + } verbose(VERB_ALGO, "nsec3 proveClosestEncloser: could " "not find a candidate for the closest encloser."); return sec_status_bogus; @@ -989,9 +1069,23 @@ nsec3_prove_closest_encloser(struct module_env* env, struct nsec3_filter* flt, /* Otherwise, we need to show that the next closer name is covered. */ next_closer(qinfo->qname, qinfo->qname_len, ce->ce, &nc, &nc_len); if(!find_covering_nsec3(env, flt, ct, nc, nc_len, - &ce->nc_rrset, &ce->nc_rr)) { + &ce->nc_rrset, &ce->nc_rr, calculations)) { + if(*calculations == MAX_NSEC3_ERRORS) { + verbose(VERB_ALGO, "nsec3: Could not find proof that the " + "candidate encloser was the closest encloser; " + "all attempted hash calculations were " + "erroneous; bogus"); + return sec_status_bogus; + } else if(*calculations >= MAX_NSEC3_CALCULATIONS) { + verbose(VERB_ALGO, "nsec3: Could not find proof that the " + "candidate encloser was the closest encloser; " + "reached MAX_NSEC3_CALCULATIONS (%d); " + "unchecked still", + MAX_NSEC3_CALCULATIONS); + return sec_status_unchecked; + } verbose(VERB_ALGO, "nsec3: Could not find proof that the " - "candidate encloser was the closest encloser"); + "candidate encloser was the closest encloser"); return sec_status_bogus; } return sec_status_secure; @@ -1019,8 +1113,8 @@ nsec3_ce_wildcard(struct regional* region, uint8_t* ce, size_t celen, /** Do the name error proof */ static enum sec_status -nsec3_do_prove_nameerror(struct module_env* env, struct nsec3_filter* flt, - rbtree_type* ct, struct query_info* qinfo) +nsec3_do_prove_nameerror(struct module_env* env, struct nsec3_filter* flt, + struct nsec3_cache_table* ct, struct query_info* qinfo, int* calc) { struct ce_response ce; uint8_t* wc; @@ -1032,11 +1126,15 @@ nsec3_do_prove_nameerror(struct module_env* env, struct nsec3_filter* flt, /* First locate and prove the closest encloser to qname. We will * use the variant that fails if the closest encloser turns out * to be qname. */ - sec = nsec3_prove_closest_encloser(env, flt, ct, qinfo, 1, &ce); + sec = nsec3_prove_closest_encloser(env, flt, ct, qinfo, 1, &ce, calc); if(sec != sec_status_secure) { if(sec == sec_status_bogus) verbose(VERB_ALGO, "nsec3 nameerror proof: failed " "to prove a closest encloser"); + else if(sec == sec_status_unchecked) + verbose(VERB_ALGO, "nsec3 nameerror proof: will " + "continue proving closest encloser after " + "suspend"); else verbose(VERB_ALGO, "nsec3 nameerror proof: closest " "nsec3 is an insecure delegation"); return sec; @@ -1046,9 +1144,27 @@ nsec3_do_prove_nameerror(struct module_env* env, struct nsec3_filter* flt, /* At this point, we know that qname does not exist. Now we need * to prove that the wildcard does not exist. */ log_assert(ce.ce); - wc = nsec3_ce_wildcard(env->scratch, ce.ce, ce.ce_len, &wclen); - if(!wc || !find_covering_nsec3(env, flt, ct, wc, wclen, - &wc_rrset, &wc_rr)) { + wc = nsec3_ce_wildcard(ct->region, ce.ce, ce.ce_len, &wclen); + if(!wc) { + verbose(VERB_ALGO, "nsec3 nameerror proof: could not prove " + "that the applicable wildcard did not exist."); + return sec_status_bogus; + } + if(!find_covering_nsec3(env, flt, ct, wc, wclen, &wc_rrset, &wc_rr, calc)) { + if(*calc == MAX_NSEC3_ERRORS) { + verbose(VERB_ALGO, "nsec3 nameerror proof: could not prove " + "that the applicable wildcard did not exist; " + "all attempted hash calculations were " + "erroneous; bogus"); + return sec_status_bogus; + } else if(*calc >= MAX_NSEC3_CALCULATIONS) { + verbose(VERB_ALGO, "nsec3 nameerror proof: could not prove " + "that the applicable wildcard did not exist; " + "reached MAX_NSEC3_CALCULATIONS (%d); " + "unchecked still", + MAX_NSEC3_CALCULATIONS); + return sec_status_unchecked; + } verbose(VERB_ALGO, "nsec3 nameerror proof: could not prove " "that the applicable wildcard did not exist."); return sec_status_bogus; @@ -1064,14 +1180,13 @@ nsec3_do_prove_nameerror(struct module_env* env, struct nsec3_filter* flt, enum sec_status nsec3_prove_nameerror(struct module_env* env, struct val_env* ve, struct ub_packed_rrset_key** list, size_t num, - struct query_info* qinfo, struct key_entry_key* kkey) + struct query_info* qinfo, struct key_entry_key* kkey, + struct nsec3_cache_table* ct, int* calc) { - rbtree_type ct; struct nsec3_filter flt; if(!list || num == 0 || !kkey || !key_entry_isgood(kkey)) return sec_status_bogus; /* no valid NSEC3s, bogus */ - rbtree_init(&ct, &nsec3_hash_cmp); /* init names-to-hash cache */ filter_init(&flt, list, num, qinfo); /* init RR iterator */ if(!flt.zone) return sec_status_bogus; /* no RRs */ @@ -1079,7 +1194,7 @@ nsec3_prove_nameerror(struct module_env* env, struct val_env* ve, return sec_status_insecure; /* iteration count too high */ log_nametypeclass(VERB_ALGO, "start nsec3 nameerror proof, zone", flt.zone, 0, 0); - return nsec3_do_prove_nameerror(env, &flt, &ct, qinfo); + return nsec3_do_prove_nameerror(env, &flt, ct, qinfo, calc); } /* @@ -1089,8 +1204,9 @@ nsec3_prove_nameerror(struct module_env* env, struct val_env* ve, /** Do the nodata proof */ static enum sec_status -nsec3_do_prove_nodata(struct module_env* env, struct nsec3_filter* flt, - rbtree_type* ct, struct query_info* qinfo) +nsec3_do_prove_nodata(struct module_env* env, struct nsec3_filter* flt, + struct nsec3_cache_table* ct, struct query_info* qinfo, + int* calc) { struct ce_response ce; uint8_t* wc; @@ -1100,7 +1216,7 @@ nsec3_do_prove_nodata(struct module_env* env, struct nsec3_filter* flt, enum sec_status sec; if(find_matching_nsec3(env, flt, ct, qinfo->qname, qinfo->qname_len, - &rrset, &rr)) { + &rrset, &rr, calc)) { /* cases 1 and 2 */ if(nsec3_has_type(rrset, rr, qinfo->qtype)) { verbose(VERB_ALGO, "proveNodata: Matching NSEC3 " @@ -1144,11 +1260,23 @@ nsec3_do_prove_nodata(struct module_env* env, struct nsec3_filter* flt, } return sec_status_secure; } + if(*calc == MAX_NSEC3_ERRORS) { + verbose(VERB_ALGO, "proveNodata: all attempted hash " + "calculations were erroneous while finding a matching " + "NSEC3, bogus"); + return sec_status_bogus; + } else if(*calc >= MAX_NSEC3_CALCULATIONS) { + verbose(VERB_ALGO, "proveNodata: reached " + "MAX_NSEC3_CALCULATIONS (%d) while finding a " *** 1723 LINES SKIPPED *** From nobody Sat Feb 17 15:12:14 2024 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 4TcXMy6q7Rz5BFYs; Sat, 17 Feb 2024 15:12:14 +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 4TcXMy6Ntxz4XxV; Sat, 17 Feb 2024 15:12:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182734; 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=SeIdYOcqfIG6iIHLejXK+ZQZ7pBbYFvZZLtfrRfheXo=; b=AzaE/XBMYpCKxcx+ROjlPJoNOi2jb3WOe43VPu/xpFaa87C5MTwJnQl2LwQSmnJ+OWt+cO EmjH05lK6vOLu64cGTsIzlFIxjFRhiuU7qnODuTwAJvPdyLys6ksstw0+L9KGr61RXtOEr +Vd7mAb38lKdFbIiltBtT/RRSX/vV0Vd7xzoCefUivlNYewDJI1bHtHjrsrV6fjH8Rdaem VL4r9KHSbHhoyaly7DEKtuWIukknKwqOubebOSv7BNQaxT03EokxxRnaZLOJFQuy6vb9bl KoV2BvIHzQIieVpqYP2eNN4y0UuEPmd6OP4awvTcKvH3VlVq+04QMvC4lmLTMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182734; 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=SeIdYOcqfIG6iIHLejXK+ZQZ7pBbYFvZZLtfrRfheXo=; b=csESPgtycfJOq/IQp8Kr0mgLKCPqGN0r7G/Ic3hMbQ7Ns5Przw5NTccFda2hDsZxSyTes7 UHZFUBVgnWEs24r4Q4pnxL663ZFBWuwErp7EwrTXNeSiyLIWonMRafZq6qi6j9PBnctAIM nYdNvsAhp52ki9826SSd4YYNjkTiXkLDKorg7nXBaZVCTpJYYov99rzNLY4g1dxhoReVWh sGm1X0BBtDf6p3g4Xq3G+NHfKa2FECfEn9/7O2rnrLCVQqQ0+gpSqhuD8q3p63Sr7mJLyR EqQUf+LNQ8HEj4semyVb3NAX0VHxWRGbzp/YAl46gO9Y5PTpusg/Hg+8zm2wow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708182734; a=rsa-sha256; cv=none; b=fg2WHL19vSXOqoqwZxgtA5U/gp8nix4+qkmLN8iSoTHzYVZspibHdWk0pVN0/Ms35Voq5B xAjFx9WMrNRD5vwB6ooYtIxY9Sjkqntm5thUrmXlPRtwXy/Z64Kex06Ccm1AN7cea0pNGk wKolEKUZhg3afomSrxBwSFGgC99t9/V0AJCn8hc5AGp0shCgB5fvX9pHwkXy3W4k2G5y7v IIlMlr37MNRLe+Tcm52iq+vgs+1yjaoeuO4y1UX4cOw2n7JjrtBdlAJrGYSYNlhqlN2nBb NC5DiQ0TWMilcjBC9BWI4I6kxoMi7CWF1IqASQeZeKHIT5gT3wMfEi0PomKefA== 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 4TcXMy5S3Jz1CG0; Sat, 17 Feb 2024 15:12:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HFCEl8077038; Sat, 17 Feb 2024 15:12:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HFCEd0077035; Sat, 17 Feb 2024 15:12:14 GMT (envelope-from git) Date: Sat, 17 Feb 2024 15:12:14 GMT Message-Id: <202402171512.41HFCEd0077035@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 1efdba436281 - stable/14 - ds1307: restore hints-based configuration on FDT systems 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1efdba436281337bfd54e941cf60c74492780598 Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=1efdba436281337bfd54e941cf60c74492780598 commit 1efdba436281337bfd54e941cf60c74492780598 Author: Andriy Gapon AuthorDate: 2023-05-02 20:46:39 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 14:15:10 +0000 ds1307: restore hints-based configuration on FDT systems Fall-through to non-FDT probe code if no matching device node is found. While here, fix indentation of the switch statement. Also, make the device description for the hints-based attachment the same as for FDT attachment. Fixes: 2486b446db ds1307: add support for the EPSON RX-8035SA I2C RTC (cherry picked from commit 34694f3da7f9537c34b1878206c65a8cda16c6c0) --- sys/dev/iicbus/rtc/ds1307.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/dev/iicbus/rtc/ds1307.c b/sys/dev/iicbus/rtc/ds1307.c index e8d24880571c..cc232bae0e94 100644 --- a/sys/dev/iicbus/rtc/ds1307.c +++ b/sys/dev/iicbus/rtc/ds1307.c @@ -225,10 +225,8 @@ ds1307_probe(device_t dev) return (ENXIO); compat = ofw_bus_search_compatible(dev, ds1307_compat_data); - if (compat->ocd_str == NULL) - return (ENXIO); - - switch(compat->ocd_data) { + if (compat->ocd_str != NULL) { + switch(compat->ocd_data) { case TYPE_DS1307: device_set_desc(dev, "Dallas DS1307"); break; @@ -244,11 +242,12 @@ ds1307_probe(device_t dev) default: device_set_desc(dev, "Unknown DS1307-like device"); break; + } + return (BUS_PROBE_DEFAULT); } - return (BUS_PROBE_DEFAULT); #endif - device_set_desc(dev, "Maxim DS1307 RTC"); + device_set_desc(dev, "Maxim DS1307"); return (BUS_PROBE_NOWILDCARD); } From nobody Sat Feb 17 15:12:15 2024 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 4TcXN01rbqz5BFTl; Sat, 17 Feb 2024 15:12:16 +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 4TcXN001bBz4XvF; Sat, 17 Feb 2024 15:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182736; 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=174vmQNg0LvFkysB+y1O5fF/G7d8HJjCDJSv78jDM3Y=; b=EJJwTsuUSnsQN0PHgcdt2QPdR+er0+0IuULy9CI//3czOVfM0Ga3z6Idq+aTHc3WptMufx VtnaVfDzy2fGgYMBmfE+Ht3CdsQ6jlY1Xjhgw684aqojHTenLRP4NZyuz0nz45u3aJY45J 3LzL7xlar6DpINJl9x+M7JKmvR8BeGly448HQYf/fbsNr8TQfVuVkJ1DFwcunOKBXfxsuM a3j/UpMHcs+9KtSCG+1XYgROto+oyX/zJ0hcqWiQ8svKvGsB5CsqFW+mkDcSDeAHj6qhil FKri+cfrIR2Z49ZpGz3hPaR1VNJk7w0z6CoEaTDG91/86vHo+H3tNcYd6sgqkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182736; 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=174vmQNg0LvFkysB+y1O5fF/G7d8HJjCDJSv78jDM3Y=; b=c+LUL9HixbNm0NnVxfulG+o6bNEhlNU3cHTusC3+nCTRiVqueUrBOYCSd2FvCBqndtgc+J eGzZ3cywE9APck9tEL8N+GdTPqIzSM6kKDU8gWdhkWbGidzfDmc0Dn3hvrx5vhj9DCA75n edDh2FMb3U4d41QAsNTW7ycWfD/3pOMxPT7FADn1/BBmdfT8DzV9XAGE7VpOWh9fxlhTVi Pj0YWvnbIYfpRrSHQ7mfcdwAqleH9o0QfsWNKm+vKZMEkejDerW7OkZ0chM6nv2minRckD A2QnenHj5E34VH4YK8o4qQgQUTlyYedgd2V1Nl4GBwUBjs3LCMxTjjVfpQU9yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708182736; a=rsa-sha256; cv=none; b=bpm08qzrmr4ToBH+YDNUhWOnDR+FH59K6GZA3/hNPNPeW4OzhwcpWz6voU0QJ0yO2LL+rM DGZxhGOlbPlQde2xcXXhEvgEYX0CdjYsd+drPBYRpD5g6FoQ9EGm0A86h4LHULRNoCrYB9 4BNnFS8Kh037pF1LBx9qdihRhIi8cJ6EbKavITpCElknFq8qOIEGlWE83LzgekYDdIYsjy mhAUWVZ3pVTOlzcuUl/harajl+yBRkFd7dKCj3xs2ntIijOynWr9Csw2ewjbpFPpbCdwTt qoC1gAmTOmccCBnp1YeV9fDchCS+0KruPMIUr7aFquMHsvE83VYEPQHWROEkKg== 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 4TcXMz6CKQz1CD2; Sat, 17 Feb 2024 15:12:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HFCFgj077083; Sat, 17 Feb 2024 15:12:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HFCFCc077080; Sat, 17 Feb 2024 15:12:15 GMT (envelope-from git) Date: Sat, 17 Feb 2024 15:12:15 GMT Message-Id: <202402171512.41HFCFCc077080@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 2036512135c9 - stable/14 - usbdevs: add Ralink RT7601 aka MT7601 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2036512135c921e82c97c956c99b4c750a353c83 Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=2036512135c921e82c97c956c99b4c750a353c83 commit 2036512135c921e82c97c956c99b4c750a353c83 Author: Andriy Gapon AuthorDate: 2022-07-10 20:11:56 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 14:15:10 +0000 usbdevs: add Ralink RT7601 aka MT7601 This is a popular USB WiFi chip. Unfortunately, it's not supported by FreeBSD yet. (cherry picked from commit 5b54b6ac8ca1bc0653a3b31e79c1bffd9b227c6e) --- sys/dev/usb/usbdevs | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 221761af4fe7..65dcb06c2f3f 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4042,6 +4042,7 @@ product RALINK RT3573 0x3573 RT3573 product RALINK RT5370 0x5370 RT5370 product RALINK RT5372 0x5372 RT5372 product RALINK RT5572 0x5572 RT5572 +product RALINK RT7601 0x7601 RT7601 product RALINK RT8070 0x8070 RT8070 product RALINK RT2570_3 0x9020 RT2500USB Wireless Adapter product RALINK RT2573_2 0x9021 RT2501USB Wireless Adapter From nobody Sat Feb 17 15:12:16 2024 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 4TcXN16ctDz5BFX1; Sat, 17 Feb 2024 15:12:17 +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 4TcXN116svz4XdJ; Sat, 17 Feb 2024 15:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182737; 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=y7/er6UhvarUWrZFLDU5avATaNXqZbshK6YuuhOMPbI=; b=Z7rRl/ba0TBjwYUPuYnOY425m7FV5SeauGe9EbmFyuKVyRa+DKdNchMfmMJOxYe8qBTrmU 8XEAR6AY7bGnwJMwy0hvN+9P6uO0xDrZC7Zhmqdo/Yd8C4LOKOwb9/gnIBVg1V+nyt0DOf 4LykepOiTnaUOcVPIf26MIBgrE+h2rfyNjh7fYDB6sbPg42MazrirS9gEA8JYhX8IZnxR9 j3TLSyqxs0yp47cCECHLpullpDzz16flEYXeSJb5A6xZMnWlm8zqFH9NiJltkWLZgbbZAI jwehdl4TjdTO4+jpAWE+mIMQAeN8ReFsP3tpt5HAI5VYWswlPwPYI/Iv91Hd6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182737; 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=y7/er6UhvarUWrZFLDU5avATaNXqZbshK6YuuhOMPbI=; b=gO6/U/eedKcL5ay3ao/1ER0AaakeX0Vx/Pad2lSFGU4+7mh04RDDZuRJm++odUOIVhWmLP +xoDjUXvbsbSLmsuxFF3tG8H0l3R/aTVimvMj124BIm340yTtknTxEjxYbXDw/oPsGSGkV AQnZiaTUDTLoSC19bgIpWpsE407ppaqz9PCbDWexa0CZeeK6hAFgGzzoLJsTPgOywY5awM 0ltYzlRRWMFkA8e0WJ6rRZ5LKt5h2jwzNmX3dUFQPizr1MUXjlb7QB9yImWB07dZyZayIh ihDQQ2LW/1VMFaDvk0tL0EoChXqUFQ4/S++vD+FzTQWRYOognX4Vxpwz/+TkQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708182737; a=rsa-sha256; cv=none; b=udeDGYy3uKRBKViz5ClQMDpKM+Cjefen19YT+u81xSdw0o1Fbsi9EyF4hoZNCwBEDNv9a2 obAZiK8t8wNUlq2yvl3ERk8SIU3B8KxzGWdoWH3AVadYD9WAsU4utVefwHjCdj4VV78Prd kHdkJxcITxaLpvR9LzJxVvX3Ueac3HK6kX3TbLuQG3dzo6r6Dx6AnAYlFANfFuUxdVeHhn 6D0i18t5VigDPGZHa4l54q7cwCzjwyCEvphBdTY9tgOBTCIEaydXNst0JXAmGi8771kIBS A4ZmjRO8FreETheBt22nyGKez30CXQBSJtTBWBzhTcPua5kMl6zeOlFOjuapZQ== 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 4TcXN10DfGz1C98; Sat, 17 Feb 2024 15:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HFCGBQ077135; Sat, 17 Feb 2024 15:12:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HFCG9S077132; Sat, 17 Feb 2024 15:12:16 GMT (envelope-from git) Date: Sat, 17 Feb 2024 15:12:16 GMT Message-Id: <202402171512.41HFCG9S077132@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 87a7011b0974 - stable/14 - add allwinner overlays for enabling additional USB ports 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 87a7011b0974492c3244fbd97516c24de7f2755f Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=87a7011b0974492c3244fbd97516c24de7f2755f commit 87a7011b0974492c3244fbd97516c24de7f2755f Author: Andriy Gapon AuthorDate: 2022-07-10 20:09:23 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 14:15:10 +0000 add allwinner overlays for enabling additional USB ports For instance, on NanoPi NEO two additional ports are available via a GPIO header. (cherry picked from commit 197944948e6229f625306f38403737ed723e544e) --- sys/dts/arm/overlays/sun8i-h3-usb1.dtso | 14 ++++++++++++++ sys/dts/arm/overlays/sun8i-h3-usb2.dtso | 14 ++++++++++++++ sys/modules/dtb/allwinner/Makefile | 4 +++- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/sys/dts/arm/overlays/sun8i-h3-usb1.dtso b/sys/dts/arm/overlays/sun8i-h3-usb1.dtso new file mode 100644 index 000000000000..247faa370a14 --- /dev/null +++ b/sys/dts/arm/overlays/sun8i-h3-usb1.dtso @@ -0,0 +1,14 @@ +/dts-v1/; +/plugin/; + +/ { + compatible = "allwinner,sun8i-h3"; +}; + +&{/soc/usb@1c1b000} { + status = "okay"; +}; + +&{/soc/usb@1c1b400} { + status = "okay"; +}; diff --git a/sys/dts/arm/overlays/sun8i-h3-usb2.dtso b/sys/dts/arm/overlays/sun8i-h3-usb2.dtso new file mode 100644 index 000000000000..02533289e3dc --- /dev/null +++ b/sys/dts/arm/overlays/sun8i-h3-usb2.dtso @@ -0,0 +1,14 @@ +/dts-v1/; +/plugin/; + +/ { + compatible = "allwinner,sun8i-h3"; +}; + +&{/soc/usb@1c1c000} { + status = "okay"; +}; + +&{/soc/usb@1c1c400} { + status = "okay"; +}; diff --git a/sys/modules/dtb/allwinner/Makefile b/sys/modules/dtb/allwinner/Makefile index 524636e380d6..f04be9ca0dc9 100644 --- a/sys/modules/dtb/allwinner/Makefile +++ b/sys/modules/dtb/allwinner/Makefile @@ -29,7 +29,9 @@ DTSO= sun8i-a83t-sid.dtso \ sun8i-h3-mmc0-disable.dtso \ sun8i-h3-mmc1-disable.dtso \ sun8i-h3-mmc2-disable.dtso \ - sun8i-h3-spi0.dtso + sun8i-h3-spi0.dtso \ + sun8i-h3-usb1.dtso \ + sun8i-h3-usb2.dtso LINKS= \ ${DTBDIR}/sun4i-a10-cubieboard.dtb ${DTBDIR}/cubieboard.dtb \ From nobody Sat Feb 17 15:12:18 2024 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 4TcXN25Cxcz5BFSJ; Sat, 17 Feb 2024 15:12:18 +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 4TcXN22hDcz4XZg; Sat, 17 Feb 2024 15:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182738; 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=RQ1uRPaRxAImZme9+Vwf+N9FoCmC1pDIewIo2VtoycA=; b=eBKT7+XN7by1/hyBV4EVZGbIwK1sG0SxUDOL9e1mxneVl5KQYjE3A6l6jzlaQ9esRq6LIk /RBeZziFi0XJ+KLSQPuab3HtF+e8gBCROyf1m1BucdX0b4j0yJMbYIcgS9+4220BCI2SuQ qBzu94QEDZm67sFi05nXHtLZ21kz4uyqRAYGvB3BU/kCCDc3E5QIa/94My2amgcyE/FdRv hPQbNwwMx3bqkD0vTyv5Ax9LXmXV1p9KruoBeP0/Lpz+3ck5EMVrgwfZPkHNNokMUpHXAn NVP39VGaxBE/YUe+fCmeJMTN36oFpeQ/6r6HMyaX9iC/Bbfd4zeabEdRrHOivw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182738; 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=RQ1uRPaRxAImZme9+Vwf+N9FoCmC1pDIewIo2VtoycA=; b=xoGlZwFZ3XxzhD9eIdroAv7qtFVIfjyxg+9hC1TwTbFt7qAyacdnKDCjnYPvgBWwKcvBzW 2TeCE5W+2qEtrPqgzpicYfWoDJmDdwEkl2B/eC+eaC02iYPN6eE7WMhGQi3Lx3Ow8qxsN+ 4stSGxLzLjz95B0w/gPtH7x4fwKrTT+L2NO8h8ervprbGq+KnBkjhGbJ5Y2ZnmUAr9j3xa 7phYxYjGLV85OQ+G0YzIyXTTXxONiqSePNreJkuf8rWiAjOjKKj6k5H0OuJnvoE0I2xUOp mlw8LQ5ZjndfZPfo5Ih97QpvC6g+3Bz8LQHYmWPwLNH+mSvFDYj1P4wKm3x3tQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708182738; a=rsa-sha256; cv=none; b=AVBZjNDLvuf62CK+YqGaA+OucRgif+477JhvLPZz5IWgd/CLiF7AlXXNrnwp5EaZ4ggx8B WaU2YbrMGLzyKy96x/gZsbjo7PtbXTGeWKpI3hbJjEQhxjJuSHcdgfFVjwM1w1AZv54uJs bywJvo6rXUEbDbr4Svd2I0mJauMLB7zP34mlp/n6Kr0izyfqypLUXSH5/dybKRqcEMw63K vB/9BNdfJvhXWqfQCYlkrRPv7gHkMc99mp9SZ7FUzliYgf4XmKsqSqTDIxdrbQ18mT5EkC vQkwM2rxmageXsn9DFb3Wn3+LkLf/m52xQNtEhDX2L9VUyFXDtM4TxsEQdV66A== 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 4TcXN21Vc4z1CD3; Sat, 17 Feb 2024 15:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HFCI0R077183; Sat, 17 Feb 2024 15:12:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HFCI4p077180; Sat, 17 Feb 2024 15:12:18 GMT (envelope-from git) Date: Sat, 17 Feb 2024 15:12:18 GMT Message-Id: <202402171512.41HFCI4p077180@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 1595c09ee252 - stable/14 - gpiopower: trigger low, high and both edges 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1595c09ee2527f9d1a50a07e922c003889be1769 Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=1595c09ee2527f9d1a50a07e922c003889be1769 commit 1595c09ee2527f9d1a50a07e922c003889be1769 Author: Andriy Gapon AuthorDate: 2024-01-28 11:29:41 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 14:15:10 +0000 gpiopower: trigger low, high and both edges Power off or reset may be activated either by low or high signal or by an edge. So, try everything. Also, the driver now supports DTS properties for timings. Finally, the driver does not change the pin configuration during attach. It is assumed that the pin is already in a state that does not trigger the power event (otherwise we wouldn't be running). (cherry picked from commit 320e4beb97618c6964380bfa404a3e96c5de7663) --- sys/dev/gpio/gpiopower.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/sys/dev/gpio/gpiopower.c b/sys/dev/gpio/gpiopower.c index 5c369396813f..2f09f79850d5 100644 --- a/sys/dev/gpio/gpiopower.c +++ b/sys/dev/gpio/gpiopower.c @@ -34,6 +34,7 @@ #include #include +#include #include #include @@ -41,6 +42,9 @@ struct gpiopower_softc { gpio_pin_t sc_pin; int sc_rbmask; + int sc_hi_period; + int sc_lo_period; + int sc_timeout; }; static void gpiopower_assert(device_t dev, int howto); @@ -65,6 +69,7 @@ gpiopower_attach(device_t dev) { struct gpiopower_softc *sc; phandle_t node; + uint32_t prop; sc = device_get_softc(dev); @@ -80,9 +85,20 @@ gpiopower_attach(device_t dev) sc->sc_rbmask = RB_HALT | RB_POWEROFF; else sc->sc_rbmask = 0; + + sc->sc_hi_period = 100000; + sc->sc_lo_period = 100000; + sc->sc_timeout = 1000000; + + if ((OF_getprop(node, "active-delay-ms", &prop, sizeof(prop))) > 0) + sc->sc_hi_period = fdt32_to_cpu(prop) * 1000; + if ((OF_getprop(node, "inactive-delay-ms", &prop, sizeof(prop))) > 0) + sc->sc_lo_period = fdt32_to_cpu(prop) * 1000; + if ((OF_getprop(node, "timeout-ms", &prop, sizeof(prop))) > 0) + sc->sc_timeout = fdt32_to_cpu(prop) * 1000; + EVENTHANDLER_REGISTER(shutdown_final, gpiopower_assert, dev, SHUTDOWN_PRI_LAST); - gpio_pin_setflags(sc->sc_pin, GPIO_PIN_OUTPUT); return (0); } @@ -107,10 +123,16 @@ gpiopower_assert(device_t dev, int howto) else return; + gpio_pin_setflags(sc->sc_pin, GPIO_PIN_OUTPUT); + gpio_pin_set_active(sc->sc_pin, true); + DELAY(sc->sc_hi_period); + gpio_pin_set_active(sc->sc_pin, false); + DELAY(sc->sc_lo_period); gpio_pin_set_active(sc->sc_pin, true); + DELAY(sc->sc_timeout); - /* Wait a second for it to trip */ - DELAY(10000000); + device_printf(dev, "%s failed\n", + (howto & RB_POWEROFF) != 0 ? "power off" : "reset"); } static device_method_t gpiopower_methods[] = { From nobody Sat Feb 17 15:12:19 2024 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 4TcXN34cg6z5BFZ1; Sat, 17 Feb 2024 15:12:19 +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 4TcXN32YBWz4Xdk; Sat, 17 Feb 2024 15:12:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182739; 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=bcrF18OFybjIvYib1v9tACPI8ujc2nvboJKoyao2HoY=; b=XuGtoWyrkIbXRHgtKZC2kHYk3ulG72540ueicxpI/5yZjelXZImeJcLK5o0eSetXdsHVC0 7gNkQH6dgF021I/1cq8w3iedmBVJspZdKxPcfEVYW2uYwNi+DpW3Gre4cH/ZlrBreZ1EQG Ymsqu+lJNScJgqVg/Ga5ChGj7LP3gALjlqb7n51jVuXdDJta2qtjgLXKCxtpLp3w20igMC sWchpsNAak2Fc5MQ6KyRW+nW97aKMwcm4uj3+ALmL0keAinGc3W2GJtea1C3xRsphurr77 cq8dzudL+O1L4vjjkzZTvRHeZ1GYoyEBrFr3zRPRYX3XzeqGREQNGMZl3EzbXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182739; 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=bcrF18OFybjIvYib1v9tACPI8ujc2nvboJKoyao2HoY=; b=Zw5hcPX4QqvxNPTBAGO6GHwVhAdGZp4mk+QhaQwtfsgBbszfABxn7ez8EA5ozd/r0APy0L F827yqHmzEP2BaoXMyCHZPgllnXXFIfAKLQu/HYX17CxGH1rRDCQ3J9bN/ooln1utWrSFv 5aqNr7obgw7hgA+22IYDTMLvOWO/SHx++IQwqs5XurhP0xm+XDuK1a1aJscTd4F3I/d8rK 2HZ5otsan+ApIIWMxjjdJuheIED6IBAOWWy56RQ6461zNTgjQvph9dnwlWuwEEWQzw5PCM wVxlqZgIatkRJM3C2puAzEHe0vL9otY4OJzTuHEfYFA8Hb/OVd4vcQ9/W8uQPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708182739; a=rsa-sha256; cv=none; b=SGKL8GiD6hLTBUbsLDYeXhXqusqaLEhteWfpnXSbJRm6m3o7e2qGzYA8qL7W0eTBVYQGCw FABEE//JRti5xlWKxzjT6ib6zA6oP0tyUQj3O2izfWKud/cOdJ4OlnizKViyID7SfmMha8 O7M2BQ72nRKDk5FSkFsQrqNfhrkBbRoEY6irxn+WnzPw2ljG0NRGH76cJNGr/nW8J14T/J 3iQ1fyDmPVf9oemq/uX71l0d5Fiuh+RdCF2hEvGbtXe/H2QX7AjD7k7ht0RGpObOqOnnMr bAVxXslL2FF4Qyl201LogKM0c304KK7x6bDYpLktxt+LJjqbq+UdzBVZdnYP4w== 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 4TcXN31f4Sz1C9C; Sat, 17 Feb 2024 15:12:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HFCJWb077431; Sat, 17 Feb 2024 15:12:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HFCJ70077417; Sat, 17 Feb 2024 15:12:19 GMT (envelope-from git) Date: Sat, 17 Feb 2024 15:12:19 GMT Message-Id: <202402171512.41HFCJ70077417@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: d6e54e538e83 - stable/14 - audio_soc: set "status" as being at simplebus 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d6e54e538e833c88b0eaa1d391af6afc22b1b6b9 Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=d6e54e538e833c88b0eaa1d391af6afc22b1b6b9 commit d6e54e538e833c88b0eaa1d391af6afc22b1b6b9 Author: Andriy Gapon AuthorDate: 2022-01-11 12:28:48 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 14:15:10 +0000 audio_soc: set "status" as being at simplebus This is more true and less confusing than previous "at EXPERIMENT". (cherry picked from commit b587cb69f35cd7bd280fe1f8c82b37f56f10d5cf) --- sys/dev/sound/fdt/audio_soc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sound/fdt/audio_soc.c b/sys/dev/sound/fdt/audio_soc.c index c7f09e3787db..3e937720bb5b 100644 --- a/sys/dev/sound/fdt/audio_soc.c +++ b/sys/dev/sound/fdt/audio_soc.c @@ -408,7 +408,7 @@ audio_soc_init(void *arg) pcm_addchan(sc->dev, PCMDIR_PLAY, &audio_soc_chan_class, &sc->play_channel); pcm_addchan(sc->dev, PCMDIR_REC, &audio_soc_chan_class, &sc->rec_channel); - pcm_setstatus(sc->dev, "at EXPERIMENT"); + pcm_setstatus(sc->dev, "at simplebus"); AUDIO_DAI_SETUP_INTR(sc->cpu_dev, audio_soc_intr, sc); AUDIO_DAI_SETUP_MIXER(sc->codec_dev, sc->dev); From nobody Sat Feb 17 15:12:20 2024 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 4TcXN44ftrz5BFJc; Sat, 17 Feb 2024 15:12:20 +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 4TcXN43MkBz4Y1k; Sat, 17 Feb 2024 15:12:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182740; 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=GlitcDUPrsj9iNlCty++56VSOYw9QZLYmAaX2VYJSKA=; b=jLoU2CbCDnoxcHsx7vPn3sUOAyP4NMa+IfQjbfAlJalw2khXhmOhnU/NLOqkbreX6Agtqb xBQHt7GcFFzvXXpgBTYJUmUwgG6uIpdPV/6uVM46lDbsCSg/ICzf5bkXqc35wikIcl/Jl2 iLWxkH7cGwBufMYnaYe7ah0RiEpqhpgR5RbNbdy87k+49FKSu8ANhjCyIykW2kspW8Wsf8 eVttttqCXkY4OQJdjhJ19aaHQbGV80h6B+7pvMUyKClxTASsuTBOp9Lnmciyq5yiJ1oqoD y6JMiP8YuIw/zZIW8t/WeiIqeNufgspOpWGVNyVl6r4fVM980oq5NNPFfw6PDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182740; 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=GlitcDUPrsj9iNlCty++56VSOYw9QZLYmAaX2VYJSKA=; b=ZPNnzueyzZD5yGmT/DJaZ7CLYvjlOEnNnwlDKebWEFXekXA/DGjjBnPTDB7wle1l6QacWm cKJBwe0h4gEXkQyUeIsjr3WZkGik7YmsBjcZSilEqSZA04vev6dDyIa4lR/hhr/oZ0Xz4f ch43Q0ZMnMeHF4GvjN79+fMsXegN/7hnTx4ySbNE31kztQ1+Qv1aZu59neqaSwkVBjV8/E eJa7BZb5Rj6u0XCBGZ6KNGfnIV1gw+FNJUaiMLQUdIhH0Cps/VhSB05PlNwtZaX9xOTAcH jGpaJRoiMRk/Isg5PpG8V98nPSsoBXpfnpaQ4My4xsWkvdhwLWVMfyrEc07ibQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708182740; a=rsa-sha256; cv=none; b=RJk9C3jKdmwxfuwGnZxaxHoY6XUMv+czgQGiHeemV3wMlh6cTsXHyG3rPtZUMz9aS07NvD EJeHzw2B+dUGbDGl8pyRLC2oPOW5r6AybJ9JNrTqFSPLlUD6H+TfVYlswjMfB6HW/DsUPP XdPD0GkyZdPg6oEYz6P3209tTTt9je4FKJqRU1fi7TB2F00tLRUaHwevg1Yjnj8dp9WO0p IHYKAWcF9eEA+m/rlqWlC4zASwfIlnEHCYd+KDBbVA6S0SIs1btIEOqCeL3K/Bt5i6FVWR CRLHoPMxXv8oRuBY1QjG0DZ0Kr8DhG7pdsYgKA7Wwa79R67JE+gbMYbnY6dibQ== 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 4TcXN42R3Mz1CQh; Sat, 17 Feb 2024 15:12:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HFCKbl078919; Sat, 17 Feb 2024 15:12:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HFCKFX078905; Sat, 17 Feb 2024 15:12:20 GMT (envelope-from git) Date: Sat, 17 Feb 2024 15:12:20 GMT Message-Id: <202402171512.41HFCKFX078905@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 7742d4d404db - stable/14 - rk3328_codec: remove diagostic printfs 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7742d4d404db92e05d50eaabe48a8c7bfc77fa62 Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=7742d4d404db92e05d50eaabe48a8c7bfc77fa62 commit 7742d4d404db92e05d50eaabe48a8c7bfc77fa62 Author: Andriy Gapon AuthorDate: 2022-01-11 12:01:31 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 14:15:10 +0000 rk3328_codec: remove diagostic printfs Most likeyly there were intended as reminders for unimplemented functions, but they do not seem to be useful. Also, a small style nit. (cherry picked from commit 408a9efd75ddcf59a05069681c3b32cb1118aa9a) --- sys/arm64/rockchip/rk3328_codec.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/sys/arm64/rockchip/rk3328_codec.c b/sys/arm64/rockchip/rk3328_codec.c index e4aa05c4dfc8..b797ac3d26b4 100644 --- a/sys/arm64/rockchip/rk3328_codec.c +++ b/sys/arm64/rockchip/rk3328_codec.c @@ -435,11 +435,9 @@ rkcodec_mixer_set(struct snd_mixer *m, unsigned dev, unsigned left, unsigned rig RKCODEC_LOCK(sc); switch(dev) { case SOUND_MIXER_VOLUME: - printf("[%s] %s:%d\n", __func__, __FILE__, __LINE__); break; case SOUND_MIXER_MIC: - printf("[%s] %s:%d\n", __func__, __FILE__, __LINE__); break; default: break; @@ -547,27 +545,15 @@ rkcodec_dai_trigger(device_t dev, int go, int pcm_dir) { // struct rkcodec_softc *sc = device_get_softc(dev); - if ((pcm_dir != PCMDIR_PLAY) && (pcm_dir != PCMDIR_REC)) + if (pcm_dir != PCMDIR_PLAY && pcm_dir != PCMDIR_REC) return (EINVAL); switch (go) { case PCMTRIG_START: - if (pcm_dir == PCMDIR_PLAY) { - printf("[%s] %s:%d\n", __func__, __FILE__, __LINE__); - } - else if (pcm_dir == PCMDIR_REC) { - printf("[%s] %s:%d\n", __func__, __FILE__, __LINE__); - } break; case PCMTRIG_STOP: case PCMTRIG_ABORT: - if (pcm_dir == PCMDIR_PLAY) { - printf("[%s] %s:%d\n", __func__, __FILE__, __LINE__); - } - else if (pcm_dir == PCMDIR_REC) { - printf("[%s] %s:%d\n", __func__, __FILE__, __LINE__); - } break; } From nobody Sat Feb 17 15:12:21 2024 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 4TcXN54Z1Tz5BFcL; Sat, 17 Feb 2024 15:12:21 +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 4TcXN53fTTz4XbR; Sat, 17 Feb 2024 15:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182741; 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=yjMJWQT5PTIWTWK/52TsBKu/MtnkPl+Zkc2qudeN+lw=; b=Dxk1KwQLb8qRypsVPNn9GbuwAPlnG5axoGx3KC3ajqydecFRhIgA5PxpQgt475pu6itCOF UGRFSDrkgkUEid9JqINRAPy6WuBI2qEkxmv3Os+6PbV1/pB3KOvjj92EHWksHnwjA6Pe91 JAb8y+bqROhBj3tbioVp6g6CUr6yxOmM9I5VbdE16zSIwpbKJw9Mbv9JHeB4k5VSrgd0uT z2rDda+zyGJfjeIqbfE8rKJt4FrHA5o0b37hIAfavH5+UhEcIa0UgMreKTa6nEdDuGnDXN WikpderniZ9HYG1eoyphSDojppWtNdnVQDKVSSb/NcbU2lYUH8DuZ9tkBC4Hmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182741; 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=yjMJWQT5PTIWTWK/52TsBKu/MtnkPl+Zkc2qudeN+lw=; b=Judr+aEVoWXP/+oez1NF3ODi25dp+TJfKzfS0tE71oAUvdwPySx43XYqxXOFIwJIYaVIpJ HRUYjpidB/bzs1GO9U2QDtlowUNjgfvXJ8V7wvnOeu8kkkw+9Kpift4ekRPH9WWR4nMfJq +SKtNzkjiXkTwIq/MpylZM+PZq39d+RSk1GuM0bhgXeNkhNoSBzIm0WK/eTbXozxUWP8aL nnZ+6v09x+SjPwyMLxmS4j4Jb4Hwd0iKb7LV6R4QDGzwL4A4nEAd6LPDF9bnuMjmJ1VZXp 33c87tgcKDVTyjrOPHs/S+/faHH3boAUl4NFcovN8ahYPBCEvoKhnf+jJbUvGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708182741; a=rsa-sha256; cv=none; b=Y8H/aA1fP64ikplnu2JIZ9W9lYCEVpBDEcKufOHJWXkWYRUeukzhM6+O6fDaisxOIpr1p9 LATw8UlvqXrFucwavU+UyOcphPsm3OhPCvljGEaIfV6Gmj1axlq9+xeDO5QRVjb2SaMbnk jLBCv9kLOOGyVR3o/31WfPbRdv2iOOul+SIGL9Vkc98Jo49K1orYEM9/RHCQxXHOpQY/8F Sb4d6qNSeXJSCxMq31yPHkwWWEnDTmCPmNMNYNjSjkwJbN8EH3wMu84J1GTdLtcRxeONSk biINiPl0cuBaxTCUXIUrj3mTTsCdGIst1I7510n1Xi8l5fn0R6Ws7h+8CBQZ2A== 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 4TcXN52mVCz1C9D; Sat, 17 Feb 2024 15:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HFCL6T080167; Sat, 17 Feb 2024 15:12:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HFCL2Z080156; Sat, 17 Feb 2024 15:12:21 GMT (envelope-from git) Date: Sat, 17 Feb 2024 15:12:21 GMT Message-Id: <202402171512.41HFCL2Z080156@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 52dfb8b11453 - stable/14 - rk_i2s: change interrupt type from MISC to AV (audio/video) 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 52dfb8b11453c30e9afcdafc9bf581401eb912a6 Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=52dfb8b11453c30e9afcdafc9bf581401eb912a6 commit 52dfb8b11453c30e9afcdafc9bf581401eb912a6 Author: Andriy Gapon AuthorDate: 2021-09-24 17:06:49 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 14:15:10 +0000 rk_i2s: change interrupt type from MISC to AV (audio/video) This gives a higher priority to the interrupt handling thread. We need it because its work (filling the hardware FIFO) is time sensitive. (cherry picked from commit 406e959d07c78521fb755d94dc784d377f302cfe) --- sys/arm64/rockchip/rk_i2s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/rockchip/rk_i2s.c b/sys/arm64/rockchip/rk_i2s.c index b1356a17987e..85a45af50af8 100644 --- a/sys/arm64/rockchip/rk_i2s.c +++ b/sys/arm64/rockchip/rk_i2s.c @@ -545,7 +545,7 @@ rk_i2s_dai_setup_intr(device_t dev, driver_intr_t intr_handler, void *intr_arg) struct rk_i2s_softc *sc = device_get_softc(dev); if (bus_setup_intr(dev, sc->res[1], - INTR_TYPE_MISC | INTR_MPSAFE, NULL, intr_handler, intr_arg, + INTR_TYPE_AV | INTR_MPSAFE, NULL, intr_handler, intr_arg, &sc->intrhand)) { device_printf(dev, "cannot setup interrupt handler\n"); return (ENXIO); From nobody Sat Feb 17 15:12:22 2024 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 4TcXN70KQXz5BFV9; Sat, 17 Feb 2024 15:12:23 +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 4TcXN64nLMz4Xyl; Sat, 17 Feb 2024 15:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182742; 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=KFo8uE+YgxrtgBgCLcuz6MyrS86cnrtmUFqs/uv7cL0=; b=EcxH/na5beRGoatjFYKM1BQwG0vTdd710Foc1SqMhXfOmM0nga9OatCiZo7XJWDuU5yTqY i+wtIH9EXq0/j6gGX3yyFn2llsa/t0jd28xYUSBVCNwzk3yrpANsuzPvmks5QCWfwAtSNe 3lcHV0nBzDn6+0Cg1joz3w2V1I91gko5XGJtWYiBIxntUo/XO3cB6KovSN6X7LEksKL7Q1 RO6aFDbbVD1x0rqZ7ey5mud2s5zz0KcwsXxYTrOpNLR+kItKToiz25fR/r2Qz6zma0QNrm NJmSy8tsqYefjmlyQwhcfHhGUxOf62tLl5og0LTJSId6b5iL9FLobxhGjrO3FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182742; 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=KFo8uE+YgxrtgBgCLcuz6MyrS86cnrtmUFqs/uv7cL0=; b=ezQBeKIScwm2Y5npPGNmgHMEaG7GnprGwnd1yayuXGZt8vASajYMONJbO3qDGfRCCo+LGD //R83t/Mo/Dvx56ccXwzvIUKNVhrM8OWUjWRp8FQkXK7JdP7X5co3TWAe42E4P9LmVhRpq EnmAaddm2DKJjkhwRSJ95KOKfX7aUlYllNhcuPR4uS5nseWTj2pWZs9aBg5wV8jx0xVJdH aPDhV0kODCuzDdhc3cG2IMDHjhta5sPGU+9nEmA+2pVOdVDwr/Oh8yut2LecmotSXhPX78 LScLwpYZBtkjHi99bk9tNFaUJs6zKLff2SzJAYY5PEmQkA1ksDKsCmfDZJTgAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708182742; a=rsa-sha256; cv=none; b=tRdeCdeMnAuRE8oS6q03VGtP+PbAqiR09rbSuCiH39GVwD26XIAHVPR/8KcgXyGmMfx0Nu aNOce4IXC89NQvIxXQRYNzrSlPJrswJN3KPkG3W2r5LyKClN4Ry67mtDJbOvx1N9PH8gt1 MXLRA3hb1cNmsX1YzwhuEvF8Dk8of5LcLlVvNi9fLvqkqgxj1Y2SiNeNpwQqP1m4ggzJbn XuRR9PplkgRxfvPSb3hQpHBNY/s2czz7ipiSzuVUVK3tj45vmc7RDV7cwsJzHfOvvVbByh Z4PZRHkduHXKjOwrYdWLedoo93cHlhGqf7OVMNIYZSwredElp/hWVD1tUgP5Ig== 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 4TcXN63vDzz1Bt8; Sat, 17 Feb 2024 15:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HFCMmv080508; Sat, 17 Feb 2024 15:12:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HFCMdj080505; Sat, 17 Feb 2024 15:12:22 GMT (envelope-from git) Date: Sat, 17 Feb 2024 15:12:22 GMT Message-Id: <202402171512.41HFCMdj080505@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 1dd72f26e3a3 - stable/14 - rk_i2s: remove unused definition 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1dd72f26e3a3d3afdde27658ce91a3373cf62cf8 Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=1dd72f26e3a3d3afdde27658ce91a3373cf62cf8 commit 1dd72f26e3a3d3afdde27658ce91a3373cf62cf8 Author: Andriy Gapon AuthorDate: 2021-09-24 17:04:27 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 14:15:10 +0000 rk_i2s: remove unused definition (cherry picked from commit 89cb925fddac372f74068b9e57528090299032a2) --- sys/arm64/rockchip/rk_i2s.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/arm64/rockchip/rk_i2s.c b/sys/arm64/rockchip/rk_i2s.c index 85a45af50af8..2ec7d21ad7e8 100644 --- a/sys/arm64/rockchip/rk_i2s.c +++ b/sys/arm64/rockchip/rk_i2s.c @@ -51,8 +51,6 @@ #include #include "audio_dai_if.h" -#define AUDIO_BUFFER_SIZE 48000 * 4 - #define I2S_TXCR 0x0000 #define I2S_CSR_2 (0 << 15) #define I2S_CSR_4 (1 << 15) From nobody Sat Feb 17 15:12:23 2024 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 4TcXN81HBvz5BFP8; Sat, 17 Feb 2024 15:12:24 +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 4TcXN75kqFz4XlC; Sat, 17 Feb 2024 15:12:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182743; 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=C5zUlMVTkxlnx4XnLiB/NLBF4ZPx0vbYMtQt9+RD2Zk=; b=cCVDOdgxEimLWfosjLiCYWC5W0SxjL/LYDA3Iy/VZB8aNfmFkR7iQTbGrHz8T42aq4MBkI tcyIwJpamBIawrQJhlPIEUudjjjxi5/ibksAW2ibJ54UC2Dp4aJYlp2zGcpXjB6SkBPztv mqUOafFcbtijCmoV/ToKm6oMCa4vZsbcUe4/+i6ERtIL4Otaex6UWyLmqZjkc1BTpKaYyV fW8kBIWykSPrUmDrmt0Wv+EY4fxKzGCGwY47nAc/ml0qS18FRn3yH+fYdfmrTtNY/+Ehvm 3M73Dnoitg9sesNBGn2h8U53KQkiuxK7hNTb4iqMz0aKugvV/h/BsLHxS49Gxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182743; 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=C5zUlMVTkxlnx4XnLiB/NLBF4ZPx0vbYMtQt9+RD2Zk=; b=exaCm56FS1LXuX99Ufp87AHwRFrY4Pirzn4XUUVloTaYaKW+fZTTOJL/pkiG40Qx1etSxw 7Ocu6/xRP8qyDMySMF7iYEXGcWBd2lidE290/sH1CeUzJv2JwF8yJeeOSTdZI9RhGpy3qn DdwK71DdTUNjcje9KvpNEyEQYr0mDS9477nxJ2z0J/xjU+XbttLqG+T8NEjpZpUkIlOy7h xDgne8ANROHPSy19tVsKrFaBenS6kATZlpY/sb79XAHmU4k8aqfE6fHPA8ZbV2h2NXSudN gNcT3ED00GIBcOJcEAbeLL0/9NppZtM1x7tB7f02W+0/xM8B9RWRz+xfOAHb6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708182743; a=rsa-sha256; cv=none; b=xyKajKg35nWFrRjfvhqRcCn+tqTW/fhSBUl4vIjTzP9MMGszlYw1WeJurir9CmRCHp54tb EYDtxL03f31vCuiKQplyB7cEIkLktCq3HiqgQ1RsX/s4jn9mCusmeN6ZkdulIYpWSMTgEp 4LcT+FJAZuQluvZemMn8Vo71GzUqC2x2lbrNRAsQETDWNAm/N5dbKlir4kx3RMfbQjmGuN ex8aV7kB62z7nDVXjD8BAA+WKf5iQHA64mC7LtUlHFjo2Vt98DwWA4U45bH2YOpLxBuuZ8 Q8LHTSdFQMjkagg/35U4LV6uGOl4w09c3YaE0s2RLknRDyuX+UxhVP34q4yY7w== 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 4TcXN74rvjz1C6t; Sat, 17 Feb 2024 15:12:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HFCNOu080547; Sat, 17 Feb 2024 15:12:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HFCNKp080544; Sat, 17 Feb 2024 15:12:23 GMT (envelope-from git) Date: Sat, 17 Feb 2024 15:12:23 GMT Message-Id: <202402171512.41HFCNKp080544@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 96b8d8a62bd7 - stable/14 - dwmmc: fix a typo 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 96b8d8a62bd73383db36802e00e70b441e5eb1bc Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=96b8d8a62bd73383db36802e00e70b441e5eb1bc commit 96b8d8a62bd73383db36802e00e70b441e5eb1bc Author: Andriy Gapon AuthorDate: 2021-09-24 16:32:39 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 14:15:11 +0000 dwmmc: fix a typo (cherry picked from commit ea7f45d3d8d5d41a9cded5765dea43ed215a663b) --- sys/dev/mmc/host/dwmmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mmc/host/dwmmc.c b/sys/dev/mmc/host/dwmmc.c index 53c3e0b646fe..be6f5e9de2d1 100644 --- a/sys/dev/mmc/host/dwmmc.c +++ b/sys/dev/mmc/host/dwmmc.c @@ -879,7 +879,7 @@ dwmmc_update_ios(device_t brdev, device_t reqdev) sc = device_get_softc(brdev); ios = &sc->host.ios; - dprintf("Setting up clk %u bus_width %d, timming: %d\n", + dprintf("Setting up clk %u bus_width %d, timing: %d\n", ios->clock, ios->bus_width, ios->timing); switch (ios->power_mode) { From nobody Sat Feb 17 15:12:24 2024 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 4TcXN935mJz5BFXV; Sat, 17 Feb 2024 15:12:25 +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 4TcXN86YWgz4YC2; Sat, 17 Feb 2024 15:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182744; 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=WcpdIVY6huOLOzts0hp6zTcozwx51PG5aE+wYk4g74Q=; b=GXaXb6jxOAVzoOv5yZIGwe6J9UiZjudrsAtbK2dMcJ9S9PP044YRQzyICRnIscYT397IEi zCi3BkHE2u1s8jWwBGt9e+qWwk/1NI4nkO4yxHvowGhP9TUgaN8zGbZerCQLreKnAPw8jo g6oo1Uog2SBdsDqLyei2tR3Yb8ML3oSBiXmTG41O5Ou8mweAFfQw4seUJNLAu1y320ItRZ Fo4RsETg4ti/Ul2e+iMg7vmErm42EWruxROKBiC/ZpS5B9ie3PeDXkAYq+jTn3PLbHW9lz k1AH0eKPyYY59xGtAvG+nv8xHddR1y+gL1lQAeCX0ZHze044Z/jLEA93kjmq1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182744; 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=WcpdIVY6huOLOzts0hp6zTcozwx51PG5aE+wYk4g74Q=; b=ZlCetHkI7RN+1K/0Q6rJ936UgGGIVcGnKiu6tsLQj1SobrgUaiYLBFKSkNSU7OrinEz7/A ZYs43y9OiGSVx2d3dwqp1mSvui4pSZc+GbaKi8d4MKzwCFcISIeQA9MS3z7CBn1/oKxCHv yFHplj3ssRENJFdDVFo1cI9eyhT4/EZs+J+R9McxpSvn4X8elebFY+BuwgSuGF7VH2kPn0 z2+qs/kO6Jqb7iisM18Qy9fHua62Iel5dM9gr7o2NHqayN2rBHo0hbXoN6KWNiaq9kGJX1 5X+Yc8HOTmuQQ+BLeHsWxgWb4TGm0U9xT0aG86GXlRf9thXbAeyp906r77E51Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708182744; a=rsa-sha256; cv=none; b=OSQfLlyabRdDu2At95jlJjalnPA+mhGpJ4ZwlPtOAyFMA1OoFNdGxv2j5tDTlntQTN7Gla PrafoWUcYvkFGISxXEZLofrmesOhrLlqjVNUuisrsM9QIs7ezHjpAN0y6DUNYuGss5QNSS OXwm6d1hnwSAXXbipi5GAENZIrS0neQWvbZVFr3bgUK63Ug2Kha4+/Tedrf94xewtEBcDA lVrGy2LR8vANzfojYuLDhIphe1F2p8KsAgDLJx0EMHqaWxrV+nq36BThOayQxxakHKpfkB wO44NZI/BciMlLuyVrkezyuliMiRglGDKKeO6Bxro+DD+SqDLeKgwsYB56I9zQ== 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 4TcXN85gBQz1BkD; Sat, 17 Feb 2024 15:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HFCOlZ080589; Sat, 17 Feb 2024 15:12:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HFCO2f080586; Sat, 17 Feb 2024 15:12:24 GMT (envelope-from git) Date: Sat, 17 Feb 2024 15:12:24 GMT Message-Id: <202402171512.41HFCO2f080586@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: cd5038b62ec2 - stable/14 - mmc_fdt_parse: remove redundant bootverbose check 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cd5038b62ec2a256e5f85c67358f7b73a4d4c22b Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=cd5038b62ec2a256e5f85c67358f7b73a4d4c22b commit cd5038b62ec2a256e5f85c67358f7b73a4d4c22b Author: Andriy Gapon AuthorDate: 2021-09-24 16:26:06 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 14:15:11 +0000 mmc_fdt_parse: remove redundant bootverbose check (cherry picked from commit 43ca38eb59ff194fb6d8ad589e74147d94717bf4) --- sys/dev/mmc/mmc_fdt_helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mmc/mmc_fdt_helpers.c b/sys/dev/mmc/mmc_fdt_helpers.c index 56d6037f86f9..30538ea20ca3 100644 --- a/sys/dev/mmc/mmc_fdt_helpers.c +++ b/sys/dev/mmc/mmc_fdt_helpers.c @@ -67,7 +67,7 @@ mmc_fdt_parse(device_t dev, phandle_t node, struct mmc_helper *helper, device_printf(dev, "vmmc-supply regulator found\n"); } if (regulator_get_by_ofw_property(dev, 0, "vqmmc-supply", - &helper->vqmmc_supply) == 0 && bootverbose) { + &helper->vqmmc_supply) == 0) { if (bootverbose) device_printf(dev, "vqmmc-supply regulator found\n"); } From nobody Sat Feb 17 15:12:25 2024 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 4TcXNB2lcJz5BFXY; Sat, 17 Feb 2024 15:12:26 +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 4TcXNB0Ycwz4Y0K; Sat, 17 Feb 2024 15:12:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182746; 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=zhc7w9TmGAxedIHr87dbuoxW93IXB2iUk0xl7PV+T8g=; b=HiORWCKeS6gBKkxJU4FMxFNB053vJELCyUFtZaq65OmdPEaxMRIHSycNg6ThlRZgbcoquC nc74ymPEuUrWn1btQ5OfBhhHkq6RjwX2NjDi+5iDs754y9FJfrGZ1JgZXcHfdJQLbZ7BI7 BBMiCNj5qZ/7kOTsY3yGjhPZkVVUoeMhB1+GgxN2RSk3fJHOHLKsxDQb0hr6I+IifNzvrK /HSWbm63iyAwpNAOWdf8oqldDWTnbCnMKt5qJlkUO9PCcJGcqRMMAQ7qUoK0ogps/hFHcr Gg3PCdBz33emn0XnFTZfpV6lHbggOW7FnW4R3w5CmvDwCjNUSagjOyX0eyirsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182746; 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=zhc7w9TmGAxedIHr87dbuoxW93IXB2iUk0xl7PV+T8g=; b=ZVKyMgXoOiIPS2yb4Xspj6mqCSqmCeRRhJ9mZju17HC21Ry6zkENrm/wl3UwARqSg2xjKY d82BgjJWaLg/prxnXWYioeiMp8aPXrhtNGmGzFSHvMaYHUe1z1LCKt5RmseGrWBbVLUfas xn7yqQc8KCIrI0sZijQ1r6NGfi9kamZnF/PkQWsfDuNfRyyTpAzXWkj5DnAibTMdOc62gq 9+vFaCyavLDoEatojt4np/G+yOeBwCb9sgpfQrYKBtMhNaPBI0r1/4AxqDYHR0uGI00k0g oC1N7y7rBZJNB3ZVqSSUpTBmY0s5Vnl/4aqtdqo/6Fkrt5Evd6hhYYMafstGcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708182746; a=rsa-sha256; cv=none; b=D6kfJ1AbCUszAXjHPHZBZUuYIoqY8eZtzF8vGOX3H7UflqZkQ3CpIsJbs8XjdIlkGnq0Yq DbQcmTfeHS5zLuAYGh8786UhWfwW+TTuntOqKMedPTilUHot1b0daEjLcR1pgGABYOdHb8 GGS80FnKal62dBYC4eaihiPnwLoezMJ5rxnveNwt2pCqKZZ3FuytMeUwPcbD27To7s2w71 MTguhdORu2EYwmPWphbVNdghXHGv/A3FkoHFjiy/OJmkHNUKijgxXqMI3D+SlC81xlyMrt Szbc4ZZmcz2tXGgSD71ZlwBfPx+HZJrljfq6w2E0TS984PRFqJG4P1khcQOhwQ== 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 4TcXN96fjqz1C9F; Sat, 17 Feb 2024 15:12:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HFCPlu080643; Sat, 17 Feb 2024 15:12:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HFCPFB080640; Sat, 17 Feb 2024 15:12:25 GMT (envelope-from git) Date: Sat, 17 Feb 2024 15:12:25 GMT Message-Id: <202402171512.41HFCPFB080640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: e009f28ea46d - stable/14 - fix signature of ipmi_shutdown_event 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e009f28ea46d7a14f374ce42062b29ce28d564c0 Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=e009f28ea46d7a14f374ce42062b29ce28d564c0 commit e009f28ea46d7a14f374ce42062b29ce28d564c0 Author: Andriy Gapon AuthorDate: 2023-01-03 17:22:21 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 14:15:11 +0000 fix signature of ipmi_shutdown_event The function had a signature of watchdog_fn while in fact it is used as shutdown_fn. (cherry picked from commit 90dc7889825d13290955d0eb7e1fb4388c0a0135) --- sys/dev/ipmi/ipmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ipmi/ipmi.c b/sys/dev/ipmi/ipmi.c index 262c24051025..3f66c3c199e3 100644 --- a/sys/dev/ipmi/ipmi.c +++ b/sys/dev/ipmi/ipmi.c @@ -754,7 +754,7 @@ ipmi_wd_event(void *arg, unsigned int cmd, int *error) } static void -ipmi_shutdown_event(void *arg, unsigned int cmd, int *error) +ipmi_shutdown_event(void *arg, int howto) { struct ipmi_softc *sc = arg; From nobody Sat Feb 17 15:12:26 2024 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 4TcXNC2ntpz5BFXZ; Sat, 17 Feb 2024 15:12:27 +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 4TcXNC1SBYz4Y5g; Sat, 17 Feb 2024 15:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182747; 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=wx+803ighEo8jozgAdMtZSXxq1EwcKhyYL2tZEJ04kA=; b=db23hJwshjoj8bB0yzD/Fj8ROW4mq5YogTZKioRF3Ffgzu6wcvsxAAtP5yd/el3YVL/S0w Ej4ZU+O/t6V1f1aHgazMnWMo2XoYOlv+fdidWakgFHm1Lc11Iwp/Ng5DRK3RQDoyYeiFeH tdKZOKtrUeV846Py2Y60BwelougAFWZ/AU01Jw6Ry2/NtbejOsfOEvZMNk6vNLwqgpzmXk xPBGGfLO8mtD1040ehw+gkPfGpED6FPtmY4XU9h2gKqYWtGa8ISC2IedJOb3syPyGKppfh oof9L72GTFXU0TJqqJ/OeL1aJclqOW4PQ2AXsPkxUjNNFp8XDzJM2qUbXb81Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182747; 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=wx+803ighEo8jozgAdMtZSXxq1EwcKhyYL2tZEJ04kA=; b=TgNTCx98RGrRgUvqjeb9aahOejPU5qiEcBMSxOEQoRhavVydEFGlKnkQaQ5M0IoePUGgw/ +qqdBPJ1eRyKR6w3Zt2r+EwweJeAPzaWjQTIt5Z9I39ITmhdfp8+9zr1e+OBoXPP04neoI rR0lUXVeZxW7JhfNNY9qmKiBB31YRKNKNDagREIH73+Shlb1IGqUGGcyB31nvK+SKxG1FG oO1Hz8aJPu31N3O/k09uHDsbAtoK7nz2hjMJRs+WB5bkDmfMm/u8hkTm98Qxrc9nm4N48d NHImbproYcu/WhJSJsv0abGhP0i2orpQ28089IbIGR+FBYjhNfkmWtQnuKmGLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708182747; a=rsa-sha256; cv=none; b=ZNJCoxjdEk/sT/wPC+G7NozmXvQB5scQ5J5t+poFwavIm9vxlInWGjemiZoWO2usKpQi06 DF7bcYcseqSpIMiYbYZAb9rggkKyc60u1rXf3I3eh4Tjzuj/VqxwGzaZ2IM80B6WBhPhEv AyIUF/PXWaqoEkjRSk7UDnVezH87d+JYa8JxSIcidO4/jID+Mceo/J6R6AIFOTSqqgIsGr O0ebEPKc1FxiGaHDVcfpALAhs2nOkTKSM3X/Y90hp0bWbJUVwiX0U4qVz04p9se90BrbMq 1bZVu6gd/7ydCDsRI5PuSLztEOaix9k/utRyxT5yviU9/IlnQ3hbLDU9YGAEoQ== 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 4TcXNC0YnTz1CG4; Sat, 17 Feb 2024 15:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HFCQ49080711; Sat, 17 Feb 2024 15:12:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HFCQ5B080709; Sat, 17 Feb 2024 15:12:26 GMT (envelope-from git) Date: Sat, 17 Feb 2024 15:12:26 GMT Message-Id: <202402171512.41HFCQ5B080709@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: b5d826b1b6bc - stable/14 - change ipmi watchdog to awlays stop when system is halted 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b5d826b1b6bc863ae2d72b6ba18d0ece424e9824 Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=b5d826b1b6bc863ae2d72b6ba18d0ece424e9824 commit b5d826b1b6bc863ae2d72b6ba18d0ece424e9824 Author: Andriy Gapon AuthorDate: 2023-01-03 17:26:45 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 14:15:11 +0000 change ipmi watchdog to awlays stop when system is halted That is, wd_shutdown_countdown value is ignored when halting. A halted system should remain halted for as long as needed until a power cycle, so the watchdog should not reset the system. (cherry picked from commit 8fdb26160160c4507eb2f644a982a3e05984cdf6) --- sys/dev/ipmi/ipmi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/dev/ipmi/ipmi.c b/sys/dev/ipmi/ipmi.c index 3f66c3c199e3..d311f168baf5 100644 --- a/sys/dev/ipmi/ipmi.c +++ b/sys/dev/ipmi/ipmi.c @@ -767,6 +767,10 @@ ipmi_shutdown_event(void *arg, int howto) * Zero value in wd_shutdown_countdown will disable watchdog; * Negative value in wd_shutdown_countdown will keep existing state; * + * System halt is a special case of shutdown where wd_shutdown_countdown + * is ignored and watchdog is disabled to ensure that the system remains + * halted as requested. + * * Revert to using a power cycle to ensure that the watchdog will * do something useful here. Having the watchdog send an NMI * instead is useless during shutdown, and might be ignored if an @@ -774,7 +778,7 @@ ipmi_shutdown_event(void *arg, int howto) */ wd_in_shutdown = true; - if (wd_shutdown_countdown == 0) { + if (wd_shutdown_countdown == 0 || (howto & RB_HALT) != 0) { /* disable watchdog */ ipmi_set_watchdog(sc, 0); sc->ipmi_watchdog_active = 0; From nobody Sat Feb 17 15:12:28 2024 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 4TcXND5ztMz5BFXc; Sat, 17 Feb 2024 15:12:28 +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 4TcXND2Smyz4YP3; Sat, 17 Feb 2024 15:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182748; 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=jt4DYKJaeIIqOVM/CLuhvfiks6i6zvwL+TovUQr2LbE=; b=WDh4zsnLP33WB6ING5V9/RFdpEIJ6K/o4etpLlSZpfqFuXDHyGr3BqTc2OlifovSSgkDnx oY1ZUvW0gi/foREO7GfT/TwRNM3rdqir2ev22eZ8xExfYIlrd0LBTOoxV8ayIBzkBBhFAE kNufI6W7pI0TXn7FcqZzN3xGmdViXQqM9PlVW9i1tEUJvRj2om1LJyHOAMgQVFbN37gF7s 62/PbNbB+2j23p/28jMuVw9rSbwdBH0j+MF8TCY+B2aHbZzleYd4WH00dXZhlrcRZE+Rgi UeFSDMG/ycSW9nJGi1AVDuGEi1tpQhNOrUayLM71SU0+qfwoc4hOsbzKbkq+uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182748; 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=jt4DYKJaeIIqOVM/CLuhvfiks6i6zvwL+TovUQr2LbE=; b=P1FJBRSdedznDDx7sYSJTGe15jtVloKU1ft6UN31vRkH07hbrQgDa1pA6bWsFboic7TEvc XehTZdvchzIfN55bdUYdAG0V96xOOC8jb8Goh1VBuVVa3oQ9n7oS301quPcjqOVDJSZpmi f9PlANjtCW+fm6oDmGrhj1i26fVWYJvP5FNk2ekCJQi4TCst2sV2gbtTzDhw0UldYP3mVg xoTWK7Mj5hVC5pOsnhb5ScMklDKgXgDvqXxg766CaRnohCHRBeUb+y1SW/xVR7yPYGCv0G zpLji/ilumLRw9kbvGE26szWhPYUSdGu7nY0+U+HPuiutGel0bPNvgcby5dXCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708182748; a=rsa-sha256; cv=none; b=k8jTqLAUQp3vwAn9TQ3r3R/p8Bn4JreCkmX+9KqlZ5L9p5O7rVYubKN1+Bdvi8Qm585t6n toHRAn72CwgEWapTY9SNTfNY717Toau/h8dlpyJju32VD4pq6DX6OlpPjV8bs2m4Y/WVXL Er2LWf86sZXvBo4im+aQ6v2uSjJ5Wgt80sXdH5wQ9IlVGFf6TlJt0uthLCyaB54ThnQeiP 38T3fle8/sPziB+rdHGt9QkaWEau67eWhA1qyJECa/PsLJs5L9V6oOg0vzT3qzYhDoUC+C ksK4G9w8VbbIFjTu3K7Q214FK5CBEXYpE/Y0KqVcvWdMBHiDKD6nmdwyDI3Mpw== 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 4TcXND1ZnKz1CG5; Sat, 17 Feb 2024 15:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HFCSeM080753; Sat, 17 Feb 2024 15:12:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HFCSF1080750; Sat, 17 Feb 2024 15:12:28 GMT (envelope-from git) Date: Sat, 17 Feb 2024 15:12:28 GMT Message-Id: <202402171512.41HFCSF1080750@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: a9bab712eb10 - stable/14 - ichsmb: fix block read operation 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a9bab712eb10de15d28ada67e369e75dcbd09d9e Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=a9bab712eb10de15d28ada67e369e75dcbd09d9e commit a9bab712eb10de15d28ada67e369e75dcbd09d9e Author: Andriy Gapon AuthorDate: 2022-09-13 21:26:35 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 14:15:11 +0000 ichsmb: fix block read operation First of all and unlike I2C, it's not the master that dictates how many bytes to read in block read operation. It's the device that informs the master how many bytes it's sending back. Thus, for ichsmb_bread() the count parameter is purely an output parameter. The code has been changed to reflect that. The sanity checking of the response length is now done once it (the first byte of the response) is received. While here, handling of ICH_HST_STA_FAILED status bit has been added. Plus some code style improvements and some new code comments in the vicinity of the changed code. (cherry picked from commit cbf7c81b608bb9311e50df9481447dc843083a0e) --- sys/dev/ichsmb/ichsmb.c | 61 ++++++++++++++++++++++++++++++++------------- sys/dev/ichsmb/ichsmb_var.h | 5 ++-- 2 files changed, 46 insertions(+), 20 deletions(-) diff --git a/sys/dev/ichsmb/ichsmb.c b/sys/dev/ichsmb/ichsmb.c index 7405f625e69f..94fc03d2bc67 100644 --- a/sys/dev/ichsmb/ichsmb.c +++ b/sys/dev/ichsmb/ichsmb.c @@ -389,8 +389,8 @@ ichsmb_bwrite(device_t dev, u_char slave, char cmd, u_char count, char *buf) return (SMB_EINVAL); bcopy(buf, sc->block_data, count); sc->block_count = count; - sc->block_index = 1; - sc->block_write = 1; + sc->block_index = 1; /* buf[0] is written here */ + sc->block_write = true; mtx_lock(&sc->mutex); sc->ich_cmd = ICH_HST_CNT_SMB_CMD_BLOCK; @@ -413,26 +413,23 @@ ichsmb_bread(device_t dev, u_char slave, char cmd, u_char *count, char *buf) const sc_p sc = device_get_softc(dev); int smb_error; - DBG("slave=0x%02x cmd=0x%02x count=%d\n", slave, (u_char)cmd, count); + DBG("slave=0x%02x cmd=0x%02x\n", slave, (u_char)cmd); KASSERT(sc->ich_cmd == -1, ("%s: ich_cmd=%d\n", __func__ , sc->ich_cmd)); - if (*count < 1 || *count > 32) - return (SMB_EINVAL); bzero(sc->block_data, sizeof(sc->block_data)); sc->block_count = 0; sc->block_index = 0; - sc->block_write = 0; + sc->block_write = false; mtx_lock(&sc->mutex); sc->ich_cmd = ICH_HST_CNT_SMB_CMD_BLOCK; bus_write_1(sc->io_res, ICH_XMIT_SLVA, slave | ICH_XMIT_SLVA_READ); bus_write_1(sc->io_res, ICH_HST_CMD, cmd); - bus_write_1(sc->io_res, ICH_D0, *count); /* XXX? */ bus_write_1(sc->io_res, ICH_HST_CNT, ICH_HST_CNT_START | ICH_HST_CNT_INTREN | sc->ich_cmd); if ((smb_error = ichsmb_wait(sc)) == SMB_ENOERR) { - bcopy(sc->block_data, buf, min(sc->block_count, *count)); + bcopy(sc->block_data, buf, sc->block_count); *count = sc->block_count; } mtx_unlock(&sc->mutex); @@ -515,21 +512,35 @@ ichsmb_device_intr(void *cookie) /* Check for unexpected interrupt */ ok_bits = ICH_HST_STA_SMBALERT_STS; - cmd_index = sc->ich_cmd >> 2; + + if (sc->killed) { + sc->killed = 0; + ok_bits |= ICH_HST_STA_FAILED; + bus_write_1(sc->io_res, ICH_HST_CNT, + ICH_HST_CNT_INTREN); + } + if (sc->ich_cmd != -1) { + cmd_index = sc->ich_cmd >> 2; KASSERT(cmd_index < sizeof(ichsmb_state_irqs), ("%s: ich_cmd=%d", device_get_nameunit(dev), sc->ich_cmd)); ok_bits |= ichsmb_state_irqs[cmd_index]; } if ((status & ~ok_bits) != 0) { - device_printf(dev, "irq 0x%02x during %d\n", status, - cmd_index); + device_printf(dev, "irq 0x%02x during 0x%02x\n", status, + sc->ich_cmd); bus_write_1(sc->io_res, ICH_HST_STA, (status & ~ok_bits)); continue; } + /* Check for killed / aborted command */ + if (status & ICH_HST_STA_FAILED) { + sc->smb_error = SMB_EABORT; + goto finished; + } + /* Check for bus error */ if (status & ICH_HST_STA_BUS_ERR) { sc->smb_error = SMB_ECOLLI; /* XXX SMB_EBUSERR? */ @@ -558,6 +569,18 @@ ichsmb_device_intr(void *cookie) if (sc->block_index == 0) { sc->block_count = bus_read_1( sc->io_res, ICH_D0); + if (sc->block_count < 1 || + sc->block_count > 32) { + device_printf(dev, "block read " + "wrong length: %d\n", + sc->block_count); + bus_write_1(sc->io_res, + ICH_HST_CNT, + ICH_HST_CNT_KILL | + ICH_HST_CNT_INTREN); + sc->block_count = 0; + sc->killed = true; + } } /* Get next byte, if any */ @@ -568,15 +591,17 @@ ichsmb_device_intr(void *cookie) bus_read_1(sc->io_res, ICH_BLOCK_DB); - /* Set "LAST_BYTE" bit before reading - the last byte of block data */ - if (sc->block_index - >= sc->block_count - 1) { + /* + * Set "LAST_BYTE" bit before reading + * the last byte of block data + */ + if (sc->block_index == + sc->block_count - 1) { bus_write_1(sc->io_res, ICH_HST_CNT, - ICH_HST_CNT_LAST_BYTE - | ICH_HST_CNT_INTREN - | sc->ich_cmd); + ICH_HST_CNT_LAST_BYTE | + ICH_HST_CNT_INTREN | + sc->ich_cmd); } } } diff --git a/sys/dev/ichsmb/ichsmb_var.h b/sys/dev/ichsmb/ichsmb_var.h index abef219465e6..7fb14804d3c4 100644 --- a/sys/dev/ichsmb/ichsmb_var.h +++ b/sys/dev/ichsmb/ichsmb_var.h @@ -58,8 +58,9 @@ struct ichsmb_softc { int smb_error; /* result of smb command */ int block_count; /* count for block read/write */ int block_index; /* index for block read/write */ - u_char block_write; /* 0=read, 1=write */ - u_char block_data[32]; /* block read/write data */ + bool block_write; /* block write or block read */ + uint8_t block_data[32]; /* block read/write data */ + bool killed; /* killed current transfer */ struct mtx mutex; /* device mutex */ }; typedef struct ichsmb_softc *sc_p; From nobody Sat Feb 17 15:12:29 2024 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 4TcXNF6wlLz5BFPG; Sat, 17 Feb 2024 15:12:29 +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 4TcXNF3Vn5z4YRd; Sat, 17 Feb 2024 15:12:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182749; 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=p/KOY4Qkiok19C2UadZTr7vjePAmjyNleDUKUQuaDZA=; b=ErYSsYzcp1mQhxK8hC+K0Y5VhKR6RHPBDhPAlxVb8gBy8F3u3Aja/pptA1fwv5DaPGHy6J KklptBJijOSwZNeDs8n+Cn4zPMTX092589PtcpzZTkQUFHpZAZ8Lchxf4z0r31lFE9tP+J pD1qxWD8u30yEjGq+uzFAuXYCIE13LkzsPz2BurDerAfEikxm7suJ4RTfL0L4HA50dl/y1 VKWUiZBroSICN+8tQ0abZYO+VTwzNw1Dx5uCI2vvOx8s0oc4hcEsZEL0Bp7l66n3BoAjft qvd2wAdwOd0b3lYRDilPnWYIQFZF1rR04+hqvB+bFpw3NQXNElv4liFki344Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182749; 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=p/KOY4Qkiok19C2UadZTr7vjePAmjyNleDUKUQuaDZA=; b=yqXx4WSkpYb3I6PqpitBb2ZS5R58hwPs5ixwvmbv8Ds/b2WrnBZx3Sxi/7tRdNRDCynY+7 qfgSSRGyg2yMMVdWxagqBYFOjvt+jutUf2sB2DjtJ981sd+qbcb8B1v1Q+mvW6ntCABAwQ FlvWE1xwZLTWGQTInzY+0l7Fnk9YYLvE4GCkb7+NwrRRWZe/CTEnslOQqAWuwjCwaEEsXj 3TOxA75sJRoAGlM8G9pC4YxOOxB6U34zj4aG4KIfbeB5Dyzs6o9thscfS+wDt+jsPaftu/ KFCjLCiyc9K2S+B1h7KFA2bIBdftfhsunIkAtCS5K1LXu5G7Ge9ctVef6PMsZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708182749; a=rsa-sha256; cv=none; b=em8cr0tzQPcSR4lzguVRJ1a77GG+FlDDLBMsK8KLyX530BHfiGveQhn6Qn2FYUalmYP8uL yoWEYRBgY7m1Yun0Y0wsZWb6JVCaOvdNd6C5Mgo8GlUHvfEdX01QWvnby2qBxlVG78x4UY DvGbPspr9zVIOtPYHnThQHMXdIyzBINiH0FRtFZtq4FOJN8UEBK1HusYyHH3RvBDq0ICkJ lZd4a9SN1fv5dkkoXnG4xq5o+e+BKwqEHaarCQ2TvUaxr3fougdXwuy7S9TVuoWc3cb56/ /l7dNoftPwEsw3CMdzGh4eoQi8wcNbwPOxv+WDQQe3Zq+MmBd7V01rl6/zdcuQ== 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 4TcXNF2c3Gz1BkF; Sat, 17 Feb 2024 15:12:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HFCTdq080807; Sat, 17 Feb 2024 15:12:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HFCT15080804; Sat, 17 Feb 2024 15:12:29 GMT (envelope-from git) Date: Sat, 17 Feb 2024 15:12:29 GMT Message-Id: <202402171512.41HFCT15080804@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: fb9c50f983ff - stable/14 - dtrace: make 'ring' and 'fill' policies imply 'noswitch' flag 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fb9c50f983ff6bdd6f33a22ae7d5b391435dd02a Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=fb9c50f983ff6bdd6f33a22ae7d5b391435dd02a commit fb9c50f983ff6bdd6f33a22ae7d5b391435dd02a Author: Andriy Gapon AuthorDate: 2021-12-24 09:38:38 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 14:18:04 +0000 dtrace: make 'ring' and 'fill' policies imply 'noswitch' flag This should disable allocation of the second per-CPU principal buffer which is never used. This will also enable additional asserts for buffers that are never switched. (cherry picked from commit e92491d95ff3500e140eafa614e88ca84ffb0d26) --- sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c index ce02676e0dc1..83c0648b23b1 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c +++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c @@ -12058,7 +12058,6 @@ dtrace_buffer_switch(dtrace_buffer_t *buf) hrtime_t now; ASSERT(!(buf->dtb_flags & DTRACEBUF_NOSWITCH)); - ASSERT(!(buf->dtb_flags & DTRACEBUF_RING)); cookie = dtrace_interrupt_disable(); now = dtrace_gethrtime(); @@ -14866,10 +14865,10 @@ dtrace_state_buffer(dtrace_state_t *state, dtrace_buffer_t *buf, int which) if (which == DTRACEOPT_BUFSIZE) { if (opt[DTRACEOPT_BUFPOLICY] == DTRACEOPT_BUFPOLICY_RING) - flags |= DTRACEBUF_RING; + flags |= DTRACEBUF_RING | DTRACEBUF_NOSWITCH; if (opt[DTRACEOPT_BUFPOLICY] == DTRACEOPT_BUFPOLICY_FILL) - flags |= DTRACEBUF_FILL; + flags |= DTRACEBUF_FILL | DTRACEBUF_NOSWITCH; if (state != dtrace_anon.dta_state || state->dts_activity != DTRACE_ACTIVITY_ACTIVE) From nobody Sat Feb 17 15:12:30 2024 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 4TcXNG6zj3z5BFXk; Sat, 17 Feb 2024 15:12: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 4TcXNG4d8Jz4YK9; Sat, 17 Feb 2024 15:12:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182750; 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=dThkLWguHA71YkuwloxcfxrKZp4Iv3Rqd8wVmRqXlXM=; b=ML0fuws4MGcd03oGIridemLQhJkhQ/nqLTrXCrBA8aV/xjqScfk9pVD3A6u+oVRLf8bj7g GgenffcZt5WM21gP69wVK6Aqwa/g4QmEqwKnNaLr99qj2XUK0SJ/fhEKtGigebCtZ+yFJN 7nAVqIkpfMNFT9c/O1POryVn+vhbHd5R0yPMWQhzi8Kc+vraiYUQXaFXdhnQu83xj9Wfbr LHePW5sQ3VXRQK6QUCqp/p3LqbkB7RF4IxIhq2668AEf4huy6ZD0DEQnzFMtebbkX3CL/j T2waZvRJia2dRBQNuh9NVYkaoAWYJAjlX9jcCbcYpUb0erzQ6roUh0G07LfPUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182750; 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=dThkLWguHA71YkuwloxcfxrKZp4Iv3Rqd8wVmRqXlXM=; b=YklKDJG3vMdPRVJ8gPeiV615ZKNvyEy7sgsRk6TwEUqGW5iAnJo2AvPT3EIAIgZs1fZfFI cxsR4V4N/qVNImxDy4lsDhSOzbWFiV8BGSbUyglwtvvvfqW6HlXkkymqbF7rMdAN2gBKW/ fuR83V9mOhYMA/9YNj1LqzX1JuhrJCi2BCw4Ll/u/1LIUC2tJVp/ti/kLmEWLXnLE/u6ec v+8NNX+Z9oQ7dvywtsGphhUIxA5Q/aC7ibcx2kciLOlQnkQSnWTM3HJoAGTULXUGTyDYyx co0cgj7+y7fQJZbgY/7Z613vZZNd2M4Go4pAboCt5m8a0iV4WROHmyTNpPDjhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708182750; a=rsa-sha256; cv=none; b=CukPbJ4bvtA9TcIw9nsFZQyfbbYB/mZxRg6/QtzT++GQk90FAYxJd3PR//e740fUzfBrZU r1D8cFX99FWks7OgkvAm+9yPKL+xk1AIerTMmg7nBnqF7uxLTfphtkHNyUHtG4kpxDgjqS Sa78h2/AbsNLfRDdT6u3sLJafTs07FHqagYFkqko+R6PVY4UhnzkteJosB+ciYKn3o2j3r 8jRfKGRRoa7QV7RH/tGpMvt7fLg6lVcveLATKJtf/NZFP0ndWMO6JqSd1uLM+jHmERVXVU Cj7pEi/smz3WrcdLQnKQja2Ez0hsOE4EaRdC1DA7xMmxLXCu91C2sQFmKC/cXg== 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 4TcXNG3ks0z1CD8; Sat, 17 Feb 2024 15:12:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HFCUP1080853; Sat, 17 Feb 2024 15:12:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HFCUit080850; Sat, 17 Feb 2024 15:12:30 GMT (envelope-from git) Date: Sat, 17 Feb 2024 15:12:30 GMT Message-Id: <202402171512.41HFCUit080850@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 782b71ccfb1c - stable/14 - hdaa_pcmchannel_setup: do not advertise AC3 8+0 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 782b71ccfb1cd83a6c58e955a92ec7ace949036a Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=782b71ccfb1cd83a6c58e955a92ec7ace949036a commit 782b71ccfb1cd83a6c58e955a92ec7ace949036a Author: Andriy Gapon AuthorDate: 2024-01-28 13:18:02 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 14:18:04 +0000 hdaa_pcmchannel_setup: do not advertise AC3 8+0 The rest of the sound system supports 7+1 maximum and is not aware of 8+0. I believe that these messages are caused by 8+0: kernel: feeder_init(0xfffff801f935d680) on feeder_matrix returned 22 kernel: pcm0: feeder_build_matrix(): can't add feeder_matrix (cherry picked from commit c053a56c0f5df6db5223316831142e1d8afff64f) --- sys/dev/sound/pci/hda/hdaa.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c index 02f4babcd331..dcd10cb36510 100644 --- a/sys/dev/sound/pci/hda/hdaa.c +++ b/sys/dev/sound/pci/hda/hdaa.c @@ -5426,7 +5426,6 @@ hdaa_pcmchannel_setup(struct hdaa_chan *ch) if (HDA_PARAM_SUPP_STREAM_FORMATS_AC3(fmtcap)) { ch->fmtlist[i++] = SND_FORMAT(AFMT_AC3, 2, 0); if (channels >= 8) { - ch->fmtlist[i++] = SND_FORMAT(AFMT_AC3, 8, 0); ch->fmtlist[i++] = SND_FORMAT(AFMT_AC3, 8, 1); } } From nobody Sat Feb 17 15:12:31 2024 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 4TcXNJ15yMz5BFrq; Sat, 17 Feb 2024 15:12:32 +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 4TcXNH5fr4z4YHP; Sat, 17 Feb 2024 15:12:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182751; 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=EMYtqtJ6WaoD0Fc7kkOIlYdmSheXpPzOoVHBWHsEQjM=; b=XlZeq+xNaxf55G+l1/OSCaxQPegRP79EJtP9VNgVNIczOk47zIznZDu2ATzsm+ewlOevWj +MsiTmZAFF6uv0AhF4fc/vhUT5CR9p/poiQU0MKlDw6atLy3udkHBmtdw7cG7D1wVcQpAC vutDbWhxvafs18v1eHXf8B/o/Ybfb8nyhuhv3tpGHyHi9acmsGZDHUbg8pbpbyg9WDe+sF 6MPcLDhaQDtJeYukADtHVhuvhncw9ZKRFflqWJOgCL9DdPC3p66R2BABRRlKlyeje2E8za E2l6mxHUXe7uwB+JclcmtevDHd30Y/eJtR7LbnL/qY+424JqvqoOtc7NxDTRBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182751; 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=EMYtqtJ6WaoD0Fc7kkOIlYdmSheXpPzOoVHBWHsEQjM=; b=FqyN9vKGBtmiTleaOyjZ62TauDhPsPcskD/m+qlc0tQZ0H8RtqEFoesjNSBKsP8rXST+5m J2xDJ+03FkQdRxCrWsUHijY6eqxYMKU2OU5VtmBvrc5LjMEhb93hPV4VbMjS/Djl6bLbl7 kxEmp9IS9NidHiTczv7lr+YDVwVCPo1G6abm2pxm33vbWb1xM289dMtcCVEeR6ET8nA4iP VHudbuVxbCA/x+hgs45Yol/Otsew0mGMwpMP6poPX1llDA3vVklrMiLZsPWEfMkXUUxxLC OULj5vtuNyJOyUAS6Lie69u3tEr7yb59/VZzBJiKJdMNRsGn3da+XhCqQNIURw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708182751; a=rsa-sha256; cv=none; b=kNjq+ozq0rlLJzsbAUrZ/cMIlt/+pCBeSNjD1f7i79+tpAZy+jgxbnZsjhmj5JvSIB8eYU izSxU5fpNCdiUhvYDfPbR5kPnmk8tna/dLiU8jMksmjeZSEVs00ja4B9upFRiyY48pN4A4 yq2eLdRH37MigYmTYVxKC+qtfL5+Wl8QRZoU+GBa59BqIihNomme9sZpHqWdO23SbTwAEO 6e9F6Qbh2Fqp4HDo/xZmy6y5S01wEJN/ss73e42MDOKusOIGyec1+JoUTJR8A6Ur3Whily zEiSHTpkYCxPDhyzOvxFzgWQoZXB34WgYHeF+OaCVWT4t+OHl/v453+d5XrBVA== 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 4TcXNH4msDz1CQn; Sat, 17 Feb 2024 15:12:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HFCVVb080909; Sat, 17 Feb 2024 15:12:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HFCVYP080906; Sat, 17 Feb 2024 15:12:31 GMT (envelope-from git) Date: Sat, 17 Feb 2024 15:12:31 GMT Message-Id: <202402171512.41HFCVYP080906@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 191462cb674c - stable/14 - efibootmgr: fix potential endless loop with -v 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 191462cb674c092de392aa8e31054115d9aa74f8 Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=191462cb674c092de392aa8e31054115d9aa74f8 commit 191462cb674c092de392aa8e31054115d9aa74f8 Author: Andriy Gapon AuthorDate: 2022-10-25 21:10:39 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 14:18:04 +0000 efibootmgr: fix potential endless loop with -v I observed the problem on a system with fairly old and, apparently, buggy EFI implementation. A list of boot devices had an invalid trailing entry. efidp_size() for that entry returned zero, which means that the code got stuck looping on that entry. (cherry picked from commit bf87d4a4bfaa86e97079754e93fe14595adf07c5) --- usr.sbin/efibootmgr/efibootmgr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/efibootmgr/efibootmgr.c b/usr.sbin/efibootmgr/efibootmgr.c index 8dcf9876486d..be1157b4aa84 100644 --- a/usr.sbin/efibootmgr/efibootmgr.c +++ b/usr.sbin/efibootmgr/efibootmgr.c @@ -784,6 +784,8 @@ print_loadopt_str(uint8_t *data, size_t datalen) */ indent = 1; while (dp < edp) { + if (efidp_size(dp) == 0) + break; efidp_format_device_path(buf, sizeof(buf), dp, (intptr_t)(void *)edp - (intptr_t)(void *)dp); printf("%*s%s\n", indent, "", buf); From nobody Sat Feb 17 15:12:32 2024 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 4TcXNK0b9Zz5BFVx; Sat, 17 Feb 2024 15:12:33 +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 4TcXNJ6fd8z4YDZ; Sat, 17 Feb 2024 15:12:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182752; 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=bIA0F7cMdEV2Xd1mDadkHu5+DrsKxR+Z8Xq8QZk3mUY=; b=hN0EkqgYIk5m2IpxfHFevLhNID0g85wH8WUY2bkemUiPVluyfi/BnaORUdn70QZcMbo+Ue Kz7DbQ0m7e1l7hKdN8uXpL6wy++EFCSEB2iISZKr5V3Jt2BW4IGZ0jgJQn2oFGDd4HvFEZ mwWSXjLhZGcu16afMPVTAoRfP1zDAUTnJKLBPndn4riV7rVOHx1pGlnyRwiXAYZwq3pZpA WZUOY55cwxBrP1QUMlSvxrlSQI+IFLEiDiD5NipAzO8qbXZFt39tuc6PqQ3juQnJOmWOaT Cb3frbstOYqxKWqs6qE1qADxdT4qHOdtO5i6TPjn+35ln2sJuZAVlt15xMHVMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182752; 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=bIA0F7cMdEV2Xd1mDadkHu5+DrsKxR+Z8Xq8QZk3mUY=; b=B7A5vw4GXt0sPIEgBrY7N334lbWyUoI4PPtLYUgLE4JNyFYdoOHyouLCF27qq0uOpLil8U E98Fke55xoaWSSHoLnlbn3nUrTH0qDievWgglS0ZMmCHK3qRB4uZ2qmUaDqsW2k5Xtsm0g zrzL4+DFd4ZqYlakOW8EH6EsEURn9RU/YddGHce1gft8FBB9g1lYRuADrnmYYcLBJMxzGl lDOcO+j1/flg0zTbbxOEGLSjupkjnmDzGWd+/+zT56JvXe8/Rx1cv8nGso8XIRm2pr9q/z C7tEnMREFoeb7kV4maKxWNa2af0fVupec94G1L8Em1Qa3U7sN0tvaCm+RHigIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708182752; a=rsa-sha256; cv=none; b=LxBxBEkfv+t0mJboasR1LUNMGa81b2nR4lvtySyCMnL9lczqZZ8vqmjCQDDXo9N5DDk2OQ EAnr9dV8HtRCUgI2oTYokC20bfN/FdO/Wb8EjrpWwOYLD6FrYVYrW9Xi/AqZh7xFQjdyBd 1iJJpiX+vuT7+dO6A+ve+5bVTNMocVCuyWY0GnCNor7T5RrGb9szVE/TTPoGSWNUOCoTSN BU/BQqOtfbgOvhaK25RLCIJVg/wXPsiSBsBk50E93IEgVmrJzBHNdjUdYsSxR7Ocldog9Y 5ZSpxM0J6fouwcxZ8K6e4VeI/sGBeRbolXjn6tVKmt56xmnz+qs1l4s2yrJ1zA== 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 4TcXNJ5mplz1CG6; Sat, 17 Feb 2024 15:12:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HFCWlI080948; Sat, 17 Feb 2024 15:12:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HFCW0q080945; Sat, 17 Feb 2024 15:12:32 GMT (envelope-from git) Date: Sat, 17 Feb 2024 15:12:32 GMT Message-Id: <202402171512.41HFCW0q080945@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 4cb348eaf6ac - stable/14 - subr_bus: report DEVICE_SUSPEND failures 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4cb348eaf6ac1326e79bf6c6679dbf1e219574ee Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=4cb348eaf6ac1326e79bf6c6679dbf1e219574ee commit 4cb348eaf6ac1326e79bf6c6679dbf1e219574ee Author: Andriy Gapon AuthorDate: 2023-01-03 08:39:32 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 14:18:04 +0000 subr_bus: report DEVICE_SUSPEND failures This greatly aids with diagnosing system suspend failures when they are due to a device driver or hardware. (cherry picked from commit 4d1161f094dd90428847f7e5989767e9957055f4) --- sys/kern/subr_bus.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index d3db7ca5431c..38c646593a85 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -3463,8 +3463,12 @@ bus_generic_suspend_child(device_t dev, device_t child) error = DEVICE_SUSPEND(child); - if (error == 0) + if (error == 0) { child->flags |= DF_SUSPENDED; + } else { + printf("DEVICE_SUSPEND(%s) failed: %d\n", + device_get_nameunit(child), error); + } return (error); } From nobody Sat Feb 17 15:12:33 2024 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 4TcXNN4D5Yz5BFvD; Sat, 17 Feb 2024 15:12:36 +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 4TcXNM6ycjz4YXs; Sat, 17 Feb 2024 15:12:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182756; 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=8GsiafOm4WrRmkI+oZPobVN2ET46ahECSjFpopWwsXo=; b=TTpQKu2j0vwrJX5nY+AsYVuP5RfCIE9m63f0obfZ9w60y65c1dLmFYExGEu7TjVENbEuo8 zySMs1B0X8NlN8rGEZvFWrFP+wvlLicSP9S9UwamZLechBkgQNtcgaXdZlQlNFDExDoX2J utdb7hF1Tkf14tGFxwmhl0RFioGARz+XIYm1G4GF56MAAElbTHOy8f/XKGbntnCTl6WInT 8bT5pueqcxag+NDp9Jt70f6fPhHAHTAflD5DL217TeIrovKUJ62toxnRF5A1CRwlmRIACW vPT/rRCdPxhucQ1osqWod7p12PVUpjATsgIyROf2Rx6CaTLjGAHqIxLRwTKQEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182756; 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=8GsiafOm4WrRmkI+oZPobVN2ET46ahECSjFpopWwsXo=; b=SSFUfaUHPc9DvTXzXmAdVYI0r60abrVGIdxBM2mHqv7F+3S3Bib03V+6JhshYmJyV+lkt8 vBvvCNBHMcTBjjK9loIyNOdlaPSXesn7FE/Cs/3RmoIMX/1BZNXOQ6oH7uXJ48VUZvN3aj 7Vyibt+HL2yYez8sgCe2R29/OSL5QGsjL6MGS0jbgfGZ6MNBWFlWk5Dgoi8a/A0YL8zthz ktR0Ql0+cgJuJKnLYXVm06Ph2tdLmrfyCuecZzo1b5PpEbMV0CE8LOa6hao3rMrmb7J1eO DPmb0OCCiSEx1tTsmJ9XxXeXgacRQrJFMdE0gaYWNLqbZO1cczkjUhirfhgugA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708182756; a=rsa-sha256; cv=none; b=o+ken1haYKmULjrU7kMZG/BmNRUSecQHn3N91hfSx6j1XWwQmzlK/wsXjZc04xFB2Q8PeG drbY3wAqT9Oj7HDbHtgv85WJHhI7Jn8ggH2VbWSDWLCr1r03/EvztSC9Lh6xdaLmQTs1lU TLkivLWQm1du6y55rRSWNVkPE5KFEJL9hVdLsLihlhSqY46/NDAaQRN+j2wCDk9FAog89G mdszcI0Rc7bSN+9zuOh07+uj7d/W61FucQ5t55Qo9D0GmPzROmVmBHTg7tGv6060aBcs5y dOkvjiYwZdu1LMOsnSnevHtevW3PArSuCTqvpIZm2mus/CFWzBxhdXGG2fQLkQ== 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 4TcXNK6t3gz1CD9; Sat, 17 Feb 2024 15:12:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HFCXs5080987; Sat, 17 Feb 2024 15:12:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HFCXsM080984; Sat, 17 Feb 2024 15:12:33 GMT (envelope-from git) Date: Sat, 17 Feb 2024 15:12:33 GMT Message-Id: <202402171512.41HFCXsM080984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 007b84e6c159 - stable/14 - rdmsr_safe/wrmsr_safe: handle pcb_onfault nesting 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 007b84e6c159c5cf0d42923877868afee6c2d523 Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=007b84e6c159c5cf0d42923877868afee6c2d523 commit 007b84e6c159c5cf0d42923877868afee6c2d523 Author: Andriy Gapon AuthorDate: 2024-01-30 06:45:01 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 14:18:20 +0000 rdmsr_safe/wrmsr_safe: handle pcb_onfault nesting rdmsr_safe and wrmsr_safe can be called while pcb_onfault is already set, so the functions are modified to preserve the handler rather than resetting it before returning. One case where that happens is when AMD microcode update routine is executed on a stack where copyin / copyout was already active. Here is a sample panic message from a crash caused by resetting the handler: <118>Updating CPU Microcode... Fatal trap 12: page fault while in kernel mode cpuid = 3; apic id = 03 fault virtual address = 0x11ed0de6000 fault code = supervisor write data, page not present instruction pointer = 0x20:0xffffffff80c2df03 stack pointer = 0x28:0xfffffe01ce4a4c70 frame pointer = 0x28:0xfffffe01ce4a4c70 code segment = base 0x0, limit 0xfffff, type 0x1b = DPL 0, pres 1, long 1, def32 0, gran 1 processor eflags = interrupt enabled, resume, IOPL = 0 current process = 117 (logger) trap number = 12 panic: page fault cpuid = 3 time = 1681462027 KDB: stack backtrace: db_trace_self_wrapper() at 0xffffffff80615deb = db_trace_self_wrapper+0x2b/frame 0xfffffe01ce4a4830 kdb_backtrace() at 0xffffffff80943c77 = kdb_backtrace+0x37/frame 0xfffffe01ce4a48e0 vpanic() at 0xffffffff808f5fe5 = vpanic+0x185/frame 0xfffffe01ce4a4940 panic() at 0xffffffff808f5da3 = panic+0x43/frame 0xfffffe01ce4a49a0 trap_fatal() at 0xffffffff80c31849 = trap_fatal+0x379/frame 0xfffffe01ce4a4a00 trap_pfault() at 0xffffffff80c318b5 = trap_pfault+0x65/frame 0xfffffe01ce4a4a60 trap() at 0xffffffff80c30f5f = trap+0x29f/frame 0xfffffe01ce4a4b80 trap_check() at 0xffffffff80c31c29 = trap_check+0x29/frame 0xfffffe01ce4a4ba0 calltrap() at 0xffffffff80c07fd8 = calltrap+0x8/frame 0xfffffe01ce4a4ba0 --- trap 0xc, rip = 0xffffffff80c2df03, rsp = 0xfffffe01ce4a4c70, rbp = 0xfffffe01ce4a4c70 --- copyout_nosmap_std() at 0xffffffff80c2df03 = copyout_nosmap_std+0x63/frame 0xfffffe01ce4a4c70 uiomove_faultflag() at 0xffffffff8095f0d5 = uiomove_faultflag+0xe5/frame 0xfffffe01ce4a4cb0 uiomove() at 0xffffffff8095efeb = uiomove+0xb/frame 0xfffffe01ce4a4cc0 pipe_read() at 0xffffffff80968860 = pipe_read+0x230/frame 0xfffffe01ce4a4d30 dofileread() at 0xffffffff809653cb = dofileread+0x8b/frame 0xfffffe01ce4a4d80 sys_read() at 0xffffffff80964fa0 = sys_read+0xc0/frame 0xfffffe01ce4a4df0 amd64_syscall() at 0xffffffff80c3221a = amd64_syscall+0x18a/frame 0xfffffe01ce4a4f30 fast_syscall_common() at 0xffffffff80c088eb = fast_syscall_common+0xf8/frame 0xfffffe01ce4a4f30 --- syscall (3, FreeBSD ELF64, read), rip = 0x11ece41cfaa, rsp = 0x11ecbec4908, rbp = 0x11ecbec4920 --- Uptime: 41s And another one: Fatal trap 12: page fault while in kernel mode cpuid = 4; apic id = 04 fault virtual address = 0x800a22000 fault code = supervisor write data, page not present instruction pointer = 0x20:0xffffffff80b2c7ca stack pointer = 0x28:0xfffffe01c55b5480 frame pointer = 0x28:0xfffffe01c55b5480 code segment = base 0x0, limit 0xfffff, type 0x1b = DPL 0, pres 1, long 1, def32 0, gran 1 processor eflags = interrupt enabled, resume, IOPL = 0 current process = 68418 (pfctl) trap number = 12 panic: page fault cpuid = 4 time = 1625184463 KDB: stack backtrace: db_trace_self_wrapper() at 0xffffffff805c1e8b = db_trace_self_wrapper+0x2b/frame 0xfffffe01c55b5040 kdb_backtrace() at 0xffffffff808874b7 = kdb_backtrace+0x37/frame 0xfffffe01c55b50f0 vpanic() at 0xffffffff808449d8 = vpanic+0x188/frame 0xfffffe01c55b5150 panic() at 0xffffffff808445f3 = panic+0x43/frame 0xfffffe01c55b51b0 trap_fatal() at 0xffffffff80b300a5 = trap_fatal+0x375/frame 0xfffffe01c55b5210 trap_pfault() at 0xffffffff80b30180 = trap_pfault+0x80/frame 0xfffffe01c55b5280 trap() at 0xffffffff80b2f729 = trap+0x289/frame 0xfffffe01c55b5390 trap_check() at 0xffffffff80b304d9 = trap_check+0x29/frame 0xfffffe01c55b53b0 calltrap() at 0xffffffff80b0bb28 = calltrap+0x8/frame 0xfffffe01c55b53b0 --- trap 0xc, rip = 0xffffffff80b2c7ca, rsp = 0xfffffe01c55b5480, rbp = 0xfffffe01c55b5480 --- copyout_nosmap_std() at 0xffffffff80b2c7ca = copyout_nosmap_std+0x15a/frame 0xfffffe01c55b5480 pfioctl() at 0xffffffff85539358 = pfioctl+0x4d28/frame 0xfffffe01c55b5940 devfs_ioctl() at 0xffffffff807176cf = devfs_ioctl+0xcf/frame 0xfffffe01c55b59a0 VOP_IOCTL_APV() at 0xffffffff80bb26e2 = VOP_IOCTL_APV+0x92/frame 0xfffffe01c55b59c0 VOP_IOCTL() at 0xffffffff80928014 = VOP_IOCTL+0x34/frame 0xfffffe01c55b5a10 vn_ioctl() at 0xffffffff80923330 = vn_ioctl+0xc0/frame 0xfffffe01c55b5b00 devfs_ioctl_f() at 0xffffffff80717bbe = devfs_ioctl_f+0x1e/frame 0xfffffe01c55b5b20 fo_ioctl() at 0xffffffff808abc6b = fo_ioctl+0xb/frame 0xfffffe01c55b5b30 kern_ioctl() at 0xffffffff808abc01 = kern_ioctl+0x1d1/frame 0xfffffe01c55b5b80 sys_ioctl() at 0xffffffff808ab982 = sys_ioctl+0x132/frame 0xfffffe01c55b5c50 syscallenter() at 0xffffffff80b30cc9 = syscallenter+0x159/frame 0xfffffe01c55b5ca0 amd64_syscall() at 0xffffffff80b309a5 = amd64_syscall+0x15/frame 0xfffffe01c55b5d30 fast_syscall_common() at 0xffffffff80b0c44e = fast_syscall_common+0xf8/frame 0xfffffe01c55b5d30 PR: 276426 Reviewed by: kib, markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43639 (cherry picked from commit 486b265a8fb6b2aad37f2819fa04feacf8184d53) --- sys/amd64/amd64/support.S | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S index 6e541b75cdae..c95696bbe7ef 100644 --- a/sys/amd64/amd64/support.S +++ b/sys/amd64/amd64/support.S @@ -1532,6 +1532,7 @@ ENTRY(rdmsr_safe) /* int rdmsr_safe(u_int msr, uint64_t *data) */ PUSH_FRAME_POINTER movq PCPU(CURPCB),%r8 + movq PCB_ONFAULT(%r8),%r9 movq $msr_onfault,PCB_ONFAULT(%r8) movl %edi,%ecx rdmsr /* Read MSR pointed by %ecx. Returns @@ -1540,8 +1541,8 @@ ENTRY(rdmsr_safe) movl %eax,%eax /* zero-extend %eax -> %rax */ orq %rdx,%rax movq %rax,(%rsi) - xorq %rax,%rax - movq %rax,PCB_ONFAULT(%r8) + movq %r9,PCB_ONFAULT(%r8) + xorl %eax,%eax POP_FRAME_POINTER ret @@ -1553,6 +1554,7 @@ ENTRY(wrmsr_safe) /* int wrmsr_safe(u_int msr, uint64_t data) */ PUSH_FRAME_POINTER movq PCPU(CURPCB),%r8 + movq PCB_ONFAULT(%r8),%r9 movq $msr_onfault,PCB_ONFAULT(%r8) movl %edi,%ecx movl %esi,%eax @@ -1560,8 +1562,8 @@ ENTRY(wrmsr_safe) movl %esi,%edx wrmsr /* Write MSR pointed by %ecx. Accepts hi byte in edx, lo in %eax. */ - xorq %rax,%rax - movq %rax,PCB_ONFAULT(%r8) + movq %r9,PCB_ONFAULT(%r8) + xorl %eax,%eax POP_FRAME_POINTER ret @@ -1570,7 +1572,7 @@ ENTRY(wrmsr_safe) */ ALIGN_TEXT msr_onfault: - movq $0,PCB_ONFAULT(%r8) + movq %r9,PCB_ONFAULT(%r8) movl $EFAULT,%eax POP_FRAME_POINTER ret From nobody Sat Feb 17 15:28:01 2024 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 4TcXk94N4wz5BHlW; Sat, 17 Feb 2024 15:28:01 +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 4TcXk93c5sz4fcx; Sat, 17 Feb 2024 15:28:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708183681; 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=M8Az3tMV/BpUU7R/79Qf+eEt/pdEbadS9r7dNxvWwyg=; b=W8BLqiaUe49DS73QgJ79xk//CzrlOu77WsOZtBsQNFPxbCaIYQOMu2nIzgNszQYZ6/FoBt wC56N0w7q6OchTAXnyfILgZIQHtTsDckOrCI6Pae1ZfTSKmrzpNGcObs+e8Fw1ycJZpHbs s93z+wNs4Zlzys8dZHGstU64ttgBpz/UDcMlxrMnvfiCRnEFJkPCAlvajlNv3Bhk1h918I vowZhXeP9PsSAx6YCwlOdxFlWaKdk8l9K6CB/Q3NtI7ESQOD/OnlzJheJURQc6e84+3O4G eXwzdEEYxmmRzIZHoeS+iQcWaCvw3iiSb/mynKSoFBSB3WWcfVrnXwP/xVNQEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708183681; 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=M8Az3tMV/BpUU7R/79Qf+eEt/pdEbadS9r7dNxvWwyg=; b=opz3BzRDmzGF16ysTJQmYE/4wjCg8INBDl5iLfL+PRlPU1bbOG11MIFPEuPy8Oeqnht27W WZ0YO9tRZwT/rpHCKkS/M1drdR6GXXAnvKTMWBQSxZloeQTbGKvckUoU34xbe7C4Fg9xAR vP2GK/5yd6LvLSV/tR33Zj0OC4RoOuE+ZbFlNxVEFne7ukQaFoNL1JWewgNtrimMDpJk40 D10YcAw0X89ZZAZVqjChKSRvEIvcUzhpNM3FvaxtdDHuFH5+50WJXLQWkvXTSw/kDzRFZC uJqECjkwrGZzQkwfFdBjxtkD8Ak2RD1QhVMUnFVqaxpcbwmMA6rCAwBDIEf3WA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708183681; a=rsa-sha256; cv=none; b=DDnTPODBzzSSUmXGkalxEjKLhLIU5YH8Jm+2n4w5fDUEpPeI5Atq70AavDJWmssZbbKVoa z8TeiyuwhQ0gP0rV63u/sIiPUyx46vO0Mt2VWnu2iys5oUMn8NqGcO6VH+oLYDFA3/1X9U Xdz1kVS6xaoFO/ZGByBK1+ENuFIHgbmSpY8ZrOx6Eg3f052HHlp9fvdf1U5WaAShfwA8Mr adPYs80BXKKNJ7c5vX9ghQ56cmIgjJzVan+M6aEXZf+YiNq11MlJoB8xbe+Thcnld3orOk B3Sqh0eMJ14YofxVYn2P7y3kTf/IeN/7Z0S4TfwItOoB5n/YE0Uso85zY6ArPg== 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 4TcXk92YV9z1ClH; Sat, 17 Feb 2024 15:28:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HFS1Gm098044; Sat, 17 Feb 2024 15:28:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HFS1rx098041; Sat, 17 Feb 2024 15:28:01 GMT (envelope-from git) Date: Sat, 17 Feb 2024 15:28:01 GMT Message-Id: <202402171528.41HFS1rx098041@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: b46dedfa48ef - stable/14 - run acpi_shutdown_final later to give other handlers a chance 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b46dedfa48efd5b448c33b5ea920df05241c04aa Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=b46dedfa48efd5b448c33b5ea920df05241c04aa commit b46dedfa48efd5b448c33b5ea920df05241c04aa Author: Andriy Gapon AuthorDate: 2021-12-20 11:01:56 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 15:14:17 +0000 run acpi_shutdown_final later to give other handlers a chance For example, shutdown_panic wants to produce some output and maybe take some input before a system is actually reset. The change should only make difference for the case of system reset (reboot), poweroff and halt should not be affected. The change makes difference only if hw.acpi.handle_reboot is set. It used to default to zero until r213755 / ac731af5670c7. Also, run shutdown_halt even later, after acpi_shutdown_final. The reason for that is that poweroff is requested by RB_POWEROFF | RB_HALT combination of flags. In my opinion, that command is a bit bipolar, but since we've been doing that forever, then so be it. Because of that flag combination, the order of shutdown_final handlers that check for either flag does matter. Some additional complexity comes from platform-specific shutdown_final handlers that aim to handle multiple reboot options at once. E.g., acpi_shutdown_final handles both poweroff and reboot / reset. As explained in 9cdf326b4f, such a handler must run after shutdown_panic to give it a chance. But as the change revealed, the handler must also run before shutdown_halt, so that the system can actually power off before entering the halt limbo. Previously, shutdown_panic and shutdown_halt had the same priority which appears to be incompatible with handlers that can do both poweroff and reset. The above also applies to power cycle handlers. (cherry picked from commit 9cdf326b4faef97f0d3314b5dd693308ac494d48) (cherry picked from commit e4ab361e53945a6c3e9d68c5e5ffc11de40a35f2) --- sys/dev/acpica/acpi.c | 2 +- sys/kern/kern_shutdown.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 9196c446ae80..7d1fc10afb9e 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -675,7 +675,7 @@ acpi_attach(device_t dev) /* Register our shutdown handler. */ EVENTHANDLER_REGISTER(shutdown_final, acpi_shutdown_final, sc, - SHUTDOWN_PRI_LAST); + SHUTDOWN_PRI_LAST + 150); /* * Register our acpi event handlers. diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index ea86a7e24d06..149a9456173f 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -264,10 +264,10 @@ shutdown_conf(void *unused) EVENTHANDLER_REGISTER(shutdown_final, poweroff_wait, NULL, SHUTDOWN_PRI_FIRST); - EVENTHANDLER_REGISTER(shutdown_final, shutdown_halt, NULL, - SHUTDOWN_PRI_LAST + 100); EVENTHANDLER_REGISTER(shutdown_final, shutdown_panic, NULL, SHUTDOWN_PRI_LAST + 100); + EVENTHANDLER_REGISTER(shutdown_final, shutdown_halt, NULL, + SHUTDOWN_PRI_LAST + 200); } SYSINIT(shutdown_conf, SI_SUB_INTRINSIC, SI_ORDER_ANY, shutdown_conf, NULL); From nobody Sat Feb 17 18:36:02 2024 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 4Tccv70SyGz5BlNw; Sat, 17 Feb 2024 18:36: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 4Tccv66kR3z46NJ; Sat, 17 Feb 2024 18:36:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708194962; 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=9DTvrihq2VFdY9//BxJbir+GKDlSKguDofbMZNqL+jk=; b=tRry6W6PFif76dBgCI3aubYvbxThA055cU44SDyvTJ1ua0KBXT8riHwp532L6ZxGamC7o+ uOOqrs1ZFMQobkKw8pANtYy4GrMuZessfOgrxuQ9jTsqueXi4L5cQZ/b6VD7KfmtuDOAed mwsq4gOR2keks8S2GwQM5s9rBAye5Wou4MidUHPONl7gDxeMK59eLHm2oZjMCWob83JXki oH76yzeNBHmr7KUZrsEjh6XqdH8edmIqoz7vKOPLrXzQKO26UkBH4RZOq/ye6W2221Rc6f 5pTte3AinkUMfjuKGMWeVSCIiCyc9Kc6rTtY6Gm/zH6piegWhQDYM5YIXnZcHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708194962; 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=9DTvrihq2VFdY9//BxJbir+GKDlSKguDofbMZNqL+jk=; b=A47RES7itorHKv2WwgJ0V44SJmF7OX0EWtK2w8KD7ck8b5WNkp/x2ONTg3UfhmVsy08n/1 XotYxr+oYPdXOWjPcEAdGg6wZXzXELyUIvFAEwruI2MReMQUT1HtVieF8JX/H/nCQc0Mjf x8Za192B36fc81rWkTsZZ//vmWlTXI5b91wY5WXnlfERqTFAsPppaRwQ3IznVsaSPG0bUe DKxjlCfCOzRojH/IHW8crg4aKwdIF8X0CwGr1q0kFCcS/1/tm2DrFk9hh3pP8rIUQU8Hcx WuCkBJKPQ0ju8jOxTHh90zoroQagQnaXFuNnFoY+71qbBrUyjVdZY+LOw5UFfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708194962; a=rsa-sha256; cv=none; b=vUB24jF+mZ0gC11NEDGk3TsAPx1O/16Tv1kdYuU4eTpyLbmRgHPW0cR6x1guEabqHCbfw2 TRhg/26Y5xHUNDU287/+MlzEgK06mgDHJLZeekxCjJoQRBe7SZMTWSOnQrCYAy68j7uKXY kp2sNmSUE8OVktEEXBV6g08F5xVLQzxMk6nQ8ApnbxlVn3owxvjBjJmiVIekkWPqYvVsR7 1OvzQuE3YtPZ03sEMnwaNaStykoW3aVSPz23hmbZ0N/0xVC50G9bfaBgnq/MxRwHa/R570 WR0Vc8qaolEhq39nzle8Kczy6FW7ssHxy6aimj57GoYmZZA4QqRN8UjSw83ZJQ== 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 4Tccv65mvxzJGJ; Sat, 17 Feb 2024 18:36:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HIa2KI016675; Sat, 17 Feb 2024 18:36:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HIa2Et016672; Sat, 17 Feb 2024 18:36:02 GMT (envelope-from git) Date: Sat, 17 Feb 2024 18:36:02 GMT Message-Id: <202402171836.41HIa2Et016672@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 394ceefc2f2f - releng/13.3 - graid: MFC: unbreak Promise RAID1 with 4+ providers 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: eugen X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.3 X-Git-Reftype: branch X-Git-Commit: 394ceefc2f2f586f303461428497d3961b89d078 Auto-Submitted: auto-generated The branch releng/13.3 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=394ceefc2f2f586f303461428497d3961b89d078 commit 394ceefc2f2f586f303461428497d3961b89d078 Author: Eugene Grosbein AuthorDate: 2024-02-12 07:24:28 +0000 Commit: Eugene Grosbein CommitDate: 2024-02-17 18:35:20 +0000 graid: MFC: unbreak Promise RAID1 with 4+ providers Fix a problem in graid implementation of Promise RAID1 created with 4+ disks. Such an array generally works fine until reboot only due to a bug in metadata writing code. Before the fix, next taste erronously created RAID1E (kind of RAID10) instead of RAID1, hence graid used wrong offsets for I/O operations. The bug did not affect Promise RAID1 arrays with 2 or 3 disks only. Reviewed by: mav Approved-by: re (cperciva) (cherry picked from commit 81092e92ea5184c4eeedad58044d72cfef72dd24) (cherry picked from commit 77814c95994aab102be0e327de788dc1c00c023d) --- sys/geom/raid/md_promise.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/geom/raid/md_promise.c b/sys/geom/raid/md_promise.c index 1c22c0756dfd..da2ea3d7da4e 100644 --- a/sys/geom/raid/md_promise.c +++ b/sys/geom/raid/md_promise.c @@ -1763,8 +1763,9 @@ g_raid_md_write_promise(struct g_raid_md_object *md, struct g_raid_volume *tvol, meta->total_disks = vol->v_disks_count; meta->stripe_shift = ffs(vol->v_strip_size / 1024); meta->array_width = vol->v_disks_count; - if (vol->v_raid_level == G_RAID_VOLUME_RL_RAID1 || - vol->v_raid_level == G_RAID_VOLUME_RL_RAID1E) + if (vol->v_raid_level == G_RAID_VOLUME_RL_RAID1) + meta->array_width = 1; + else if (vol->v_raid_level == G_RAID_VOLUME_RL_RAID1E) meta->array_width /= 2; meta->array_number = vol->v_global_id; meta->total_sectors = vol->v_mediasize / 512; From nobody Sat Feb 17 19:22:29 2024 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 4Tcdwk01khz53xmY; Sat, 17 Feb 2024 19:22: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 4Tcdwj4Xzxz4Fdt; Sat, 17 Feb 2024 19:22:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197749; 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=+X8nugIZmZyAHMYHDAeSxPftwnUqziRE12FM3aCDd2w=; b=Iaqfo7y++3e8VpZZlZazJMtrXNXeoyL3AtmWTUOJu+zsTB4yFxeyZcqemQfNZQCngbdGfL H6XvYunwjzbDyIaajzjeAlCq/Sy1evomtO7JAfHlR2jYLrQUV6pLsaRm+gNPzBzpBt5ZpX zRYidd+hKe6gOjolj0PbVKNS7XMl0duY8CdbwcuA1sLPc2QQ+WDemAl+fnpdX+cK2gJxwr 5PZ3yjeC6CxYYZ6QZ9mlW/w/+E5JADoMP1eXsOPQnW3VMpH5rclJMZu03LEinq2NrpCAvT jN4V/PHfLpDUtSQssjkgbKRRrD08m61Wa+42h+RAFTpnJ0de3P1r6uRsgVHafQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197749; 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=+X8nugIZmZyAHMYHDAeSxPftwnUqziRE12FM3aCDd2w=; b=OOKSITSm6oX/eiMgJ7XPu8sVeQ6PdJgsmMc4wpCTKvfOiyHXAeYjiu4vRILDhNFjXiKMpp zQszDmy+0/UVEo1W7cWf9uOtML5wCbjZ8efmj/FnyllchpUf5z0REmv5ltITS18KTYsh/k ILMH/B21q2xgWoju6shCQCkypCS3w5gr/pn7mPhJTZJBZh90wNMO7s34O/ztRLPJrI+vWx JOnHGAlziHAnAK6m51HarEFgpbrPlWWqBPx6w+nET8/h9FV1QOmQGRWjCzBx0t5zeiip6j HHwWySS+mGG1PxMkemc5haGv6oQJ+MvNcFG+/qF8c6kx9sCrPZ/LH0oWu/NNTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708197749; a=rsa-sha256; cv=none; b=dV2pkkrIp2c+kCk+aWtQKdwjKsgeY+8nbLg8O/wfF5iNcncGosT9gKHug54mNppU6BMs3W lDwwGb7DVWgrX1FN3P/bMwL7AtXcqpKhLFEIV4n7f9cJVXINz2rjaeBiYBtQr0hOLUF0QC wI/5otuWYwFq+FA8hNO3sqOWl5LulASucU25/uELlKKTQFDRvYX/5/EcK+jS6hTtwHBOjr CKX5oTAz/XTxKlEXcS8og4M304FbVRiQTvA9cJrKkHvQTzvIs7e4nBR2Vy5Khx/YSZDENq QGd0xFrgBkLZoIZliT94GBmqs94WmptrOv3LXOE2pOg999BzXScDP8GwDx78wA== 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 4Tcdwj3dQJzKvT; Sat, 17 Feb 2024 19:22:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HJMTES000252; Sat, 17 Feb 2024 19:22:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HJMTxk000249; Sat, 17 Feb 2024 19:22:29 GMT (envelope-from git) Date: Sat, 17 Feb 2024 19:22:29 GMT Message-Id: <202402171922.41HJMTxk000249@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: ac918f4354e0 - stable/13 - ds1307: restore hints-based configuration on FDT systems 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ac918f4354e0dd6cfcf895d395f4c03918a72eed Auto-Submitted: auto-generated The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=ac918f4354e0dd6cfcf895d395f4c03918a72eed commit ac918f4354e0dd6cfcf895d395f4c03918a72eed Author: Andriy Gapon AuthorDate: 2023-05-02 20:46:39 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 19:22:07 +0000 ds1307: restore hints-based configuration on FDT systems Fall-through to non-FDT probe code if no matching device node is found. While here, fix indentation of the switch statement. Also, make the device description for the hints-based attachment the same as for FDT attachment. Fixes: 2486b446db ds1307: add support for the EPSON RX-8035SA I2C RTC (cherry picked from commit 34694f3da7f9537c34b1878206c65a8cda16c6c0) --- sys/dev/iicbus/ds1307.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/dev/iicbus/ds1307.c b/sys/dev/iicbus/ds1307.c index f7a01e652390..8fe425f40a4a 100644 --- a/sys/dev/iicbus/ds1307.c +++ b/sys/dev/iicbus/ds1307.c @@ -225,10 +225,8 @@ ds1307_probe(device_t dev) return (ENXIO); compat = ofw_bus_search_compatible(dev, ds1307_compat_data); - if (compat->ocd_str == NULL) - return (ENXIO); - - switch(compat->ocd_data) { + if (compat->ocd_str != NULL) { + switch(compat->ocd_data) { case TYPE_DS1307: device_set_desc(dev, "Dallas DS1307"); break; @@ -244,11 +242,12 @@ ds1307_probe(device_t dev) default: device_set_desc(dev, "Unknown DS1307-like device"); break; + } + return (BUS_PROBE_DEFAULT); } - return (BUS_PROBE_DEFAULT); #endif - device_set_desc(dev, "Maxim DS1307 RTC"); + device_set_desc(dev, "Maxim DS1307"); return (BUS_PROBE_NOWILDCARD); } From nobody Sat Feb 17 19:22:30 2024 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 4Tcdwl0QzJz53y3H; Sat, 17 Feb 2024 19:22:31 +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 4Tcdwk5ZWyz4Fc6; Sat, 17 Feb 2024 19:22:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197750; 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=d4kgI43oyF1t3z6qE5f8VWd4yV62hwgRIEFpQlmkqsA=; b=Rp7Jt0DeYPhco+qFmq6WSU7dkdjXK4Ii7pRxZnIKf8vUiHyrKDsawVawnEm+7X+EGYK1n/ D717b2UWgfQCTllM7Qg8yqCTheTdsNYprbWGJiIPdcExlZn8MBfDwEwgO0qdFMu4zptsof b54itI08NXs5uAYJgPF0UbG/GXFRifG/HMMqWkWNDjNe1S1eg22Wb+SyGOSRNMVMNAvTa7 KUQw1/T68aRgvEqxbx0WrOQxE+AA9VkESRJVlaqF2JxTEb9OjZ4MVlvJyPUqqvb3iU/TIU n7EnNkd6BSpZ7hU6qKvIk1uZHzZtZWolGsm3E/gj/vSZ7do+6a1r+Yo1pWPrvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197750; 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=d4kgI43oyF1t3z6qE5f8VWd4yV62hwgRIEFpQlmkqsA=; b=Dms5+E7Db8cNH5ru/lUBSR+ccdICwY+Udd83+3+rwyWtXhVcMhklDL5/P7iPjNCThSy8iC I3IMLWU6L8NdGAxVNuAOTdtq/z4SVOhHSO13hZgcqumjiPcsC7urPUpoiPFFQVH1S5+vTF fzFFRNgFBs7ol8yw8SAvY3RQsLNUBILI52cjZybgY8RJFT6EbQ4OoE8ETaAz6G3hgbLCKj e39b2qXaANP97J5xNvOwJT0NbeH7caR9nl5mCLAf7Mt9zXSOwQ6W1LwxZaZpNhu4duc3b4 PuGCQvORtb1jJwJD6bHr2mi3uRXoDtbKz2UA/CVmaRBNOzmkEO9rH5TBipVX3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708197750; a=rsa-sha256; cv=none; b=t3FM3PsaSzv3XzqdSexKiRtjaA/uTdQ3RFPRvrI/7QWvVQcA07KoICT9BfOE0jd6q4bXwW cZ+LL2Ep81fXuLaqDTa/qrvfKT1gsYlP+cdJwtQ/hWWS3CRyn5ymA8xTW4nYZD7Zpao8F6 5TeHdT3j/9qP0IeJvb6bgHPddi42B/toJ8VM3FOFnb2UKax82FGYh8ZC867vN8KMjjl2NV ZpgwZ/HqbURHGgqJmFipztGzifXoe1eYtBOTC1YLhr7G9jLTJJO7mWiQt6se0/mai2DitO fRplgya4B89TeiFEXV+8ht+HexfToSe5ifJ+UCOykmUzLHampeP3uzQabmv1Bg== 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 4Tcdwk4fmrzKdR; Sat, 17 Feb 2024 19:22:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HJMUMp000298; Sat, 17 Feb 2024 19:22:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HJMUCs000295; Sat, 17 Feb 2024 19:22:30 GMT (envelope-from git) Date: Sat, 17 Feb 2024 19:22:30 GMT Message-Id: <202402171922.41HJMUCs000295@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: bd51dc9408d2 - stable/13 - usbdevs: add Ralink RT7601 aka MT7601 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bd51dc9408d26279c7ab5e016a5806f5448d16a2 Auto-Submitted: auto-generated The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=bd51dc9408d26279c7ab5e016a5806f5448d16a2 commit bd51dc9408d26279c7ab5e016a5806f5448d16a2 Author: Andriy Gapon AuthorDate: 2022-07-10 20:11:56 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 19:22:08 +0000 usbdevs: add Ralink RT7601 aka MT7601 This is a popular USB WiFi chip. Unfortunately, it's not supported by FreeBSD yet. (cherry picked from commit 5b54b6ac8ca1bc0653a3b31e79c1bffd9b227c6e) --- sys/dev/usb/usbdevs | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index a54b0b0956b8..602420b44ce7 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4021,6 +4021,7 @@ product RALINK RT3573 0x3573 RT3573 product RALINK RT5370 0x5370 RT5370 product RALINK RT5372 0x5372 RT5372 product RALINK RT5572 0x5572 RT5572 +product RALINK RT7601 0x7601 RT7601 product RALINK RT8070 0x8070 RT8070 product RALINK RT2570_3 0x9020 RT2500USB Wireless Adapter product RALINK RT2573_2 0x9021 RT2501USB Wireless Adapter From nobody Sat Feb 17 19:22:32 2024 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 4Tcdwn24fxz53y3C; Sat, 17 Feb 2024 19:22:33 +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 4Tcdwn0XcLz4FXh; Sat, 17 Feb 2024 19:22:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197753; 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=aNhM/9Gu1A/YoC8YFoFTSTn+RDyPEqnQPoAm/AYWCFk=; b=tudPX4RlXG8e08ityIkP7iKQgxqqAMkz7NmpRRgstGycQPLreUDTrNVF8O47v6CJ+th+le D3aou95EeBwd8UrDGt8322Qp7efo3/4gG4MeUEFYUIlPqfI83iH831mik1KEyT8a/x8R1G HJLVjlNXam9Emx28nzgt5yShpeO7foskrwGGskaDGkpJraBCZ1W+YUQcVhRJT1Lqy0KwNQ m97bvRCiastdbzdvlhOh/2ZUq6UcWEu3BYfGoAFoc3Licy34YxHbAu7l22NOYuF955bv9t s8NeGtlo1ffVUkpM0Li5MGWguoEcv9PVGyL4cf3vFd8QoQSwSE+G3Gi38tZe+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197753; 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=aNhM/9Gu1A/YoC8YFoFTSTn+RDyPEqnQPoAm/AYWCFk=; b=i6TitXquej7kwW8Ga233B3Q3W/snJyiggFa72vfcnXc66ioDstlYl4Gu+jbglZ6ZIVnuHJ ua5dvFz2UGLs3+owSUAdaHUpW0nkInZZ/bTJLUSPDlmkjD7opeX4OAZlxTLO+gOvz7OJQJ eJaiQ5QbCgZup5Nvox+u57UZGGpowFbBBBo3miWGI+k1FyLjd+sB5IEpUKhNd3K+G5A55f 14uoqFbhd9aTer97qWW5ieKX3GSL+YhtIWpN5WKy5W8DBifcaX3QGD1czVpb1n8UrGRE4V 2HHIHFSuQNNZEEqkt5SRVTQ5VcNsVDy2Jid1+axRB4a4PaJo8gHmCZLYRV3+tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708197753; a=rsa-sha256; cv=none; b=mIMzBXOcRIO3kqz5NKU3VEosh65qJw7DcxkbwLLGfVUVNGdEZ/JPQlQLbVg4lZkC7+7IX2 wSx8B9E9HWo9eFbwT4oJX3OhxtUnG7hFc8NUDl7XLlw+UKi1gXMnNHIMHt6tHDMTOZciRd PgRjAyjnn/VJVK9p4LAHpOJRNeXZur9pLlNeBuK8RRuSFl/yUxp2XkU7TGj1mk4B2ITmeK sE9As+Xy+dsqMBNyRMQcVPK/fKMQ739HbdKQMHlK+pzoAhjuuO4RE7a2FuVTg+uKSjdVQ5 1IQgo06DdvUdVVnbR41cUy+No+H57x5ZbXOLTFzXfCib5eJcamFHyUDR30gQiQ== 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 4Tcdwm6lgwzKvW; Sat, 17 Feb 2024 19:22:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HJMWOx000404; Sat, 17 Feb 2024 19:22:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HJMWPv000401; Sat, 17 Feb 2024 19:22:32 GMT (envelope-from git) Date: Sat, 17 Feb 2024 19:22:32 GMT Message-Id: <202402171922.41HJMWPv000401@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 929db0457513 - stable/13 - gpiopower: trigger low, high and both edges 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 929db0457513b577c4e256f6633dc72f76151c91 Auto-Submitted: auto-generated The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=929db0457513b577c4e256f6633dc72f76151c91 commit 929db0457513b577c4e256f6633dc72f76151c91 Author: Andriy Gapon AuthorDate: 2024-01-28 11:29:41 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 19:22:08 +0000 gpiopower: trigger low, high and both edges Power off or reset may be activated either by low or high signal or by an edge. So, try everything. Also, the driver now supports DTS properties for timings. Finally, the driver does not change the pin configuration during attach. It is assumed that the pin is already in a state that does not trigger the power event (otherwise we wouldn't be running). (cherry picked from commit 320e4beb97618c6964380bfa404a3e96c5de7663) --- sys/dev/gpio/gpiopower.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/sys/dev/gpio/gpiopower.c b/sys/dev/gpio/gpiopower.c index a3dd8b02622f..a60214e2a51e 100644 --- a/sys/dev/gpio/gpiopower.c +++ b/sys/dev/gpio/gpiopower.c @@ -34,6 +34,7 @@ #include #include +#include #include #include @@ -41,6 +42,9 @@ struct gpiopower_softc { gpio_pin_t sc_pin; int sc_rbmask; + int sc_hi_period; + int sc_lo_period; + int sc_timeout; }; static void gpiopower_assert(device_t dev, int howto); @@ -65,6 +69,7 @@ gpiopower_attach(device_t dev) { struct gpiopower_softc *sc; phandle_t node; + uint32_t prop; sc = device_get_softc(dev); @@ -81,9 +86,20 @@ gpiopower_attach(device_t dev) sc->sc_rbmask = RB_HALT | RB_POWEROFF; else sc->sc_rbmask = 0; + + sc->sc_hi_period = 100000; + sc->sc_lo_period = 100000; + sc->sc_timeout = 1000000; + + if ((OF_getprop(node, "active-delay-ms", &prop, sizeof(prop))) > 0) + sc->sc_hi_period = fdt32_to_cpu(prop) * 1000; + if ((OF_getprop(node, "inactive-delay-ms", &prop, sizeof(prop))) > 0) + sc->sc_lo_period = fdt32_to_cpu(prop) * 1000; + if ((OF_getprop(node, "timeout-ms", &prop, sizeof(prop))) > 0) + sc->sc_timeout = fdt32_to_cpu(prop) * 1000; + EVENTHANDLER_REGISTER(shutdown_final, gpiopower_assert, dev, SHUTDOWN_PRI_LAST); - gpio_pin_setflags(sc->sc_pin, GPIO_PIN_OUTPUT); return (0); } @@ -108,10 +124,16 @@ gpiopower_assert(device_t dev, int howto) else return; + gpio_pin_setflags(sc->sc_pin, GPIO_PIN_OUTPUT); + gpio_pin_set_active(sc->sc_pin, true); + DELAY(sc->sc_hi_period); + gpio_pin_set_active(sc->sc_pin, false); + DELAY(sc->sc_lo_period); gpio_pin_set_active(sc->sc_pin, true); + DELAY(sc->sc_timeout); - /* Wait a second for it to trip */ - DELAY(10000000); + device_printf(dev, "%s failed\n", + (howto & RB_POWEROFF) != 0 ? "power off" : "reset"); } static devclass_t gpiopower_devclass; From nobody Sat Feb 17 19:22:31 2024 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 4Tcdwm2Lypz53xrq; Sat, 17 Feb 2024 19:22:32 +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 4Tcdwl6hvnz4FV5; Sat, 17 Feb 2024 19:22:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197752; 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=5OIVGoyNodAP19UqfZ1IaDUneQFsKv0EpHw7xPAAQN8=; b=mwHvYtt7m0Uhg6/+2WFcF5d+aeMAgEi3UWsi2WPN9IvPBgk5XFqrgUstxyoMwV2GfqJ2Ws Y+uOaJmvsuLCh1UW2MQZJ9jxHZ7KW+rGAtRP3Xb+RU+n1WpVI5JxYxvfKEcyiBt/0Mb+JN Bt7mMYxfi3RIzwZz0hWZ7kwmN1jQ+ltyUEIK0jzATyRR76ecf8rPoAwkPMo6AafSOwAz6e fRuBpbZpIpuJ0UiCOOXF7kMcHI2fnoM5fBD0AuFcFXEKNcpXLH5E8f7ci5FHN5oEWV2kOb VphQ5oaVyw2kTH+tQPVyki45QPOb6aHCQCxRNBZlW30U3cJwaFl1RejV8z3PXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197752; 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=5OIVGoyNodAP19UqfZ1IaDUneQFsKv0EpHw7xPAAQN8=; b=RfwZY94dSQe1/sI+Y1wLPXZ5ib+DNZP6RZOdDX44s0LmLVxsSuieAp8KbdIfV4c3Gw43gW 4m3O1ZrCQUE56ccVcQQaYbJ6iqYK/lnrihhrFCVe4ON0C29v8nFE6Q8XTCPqJu95pfEK66 yAyE4GXWp7O4AWlLANKleKb2OW39oAfU6lJvQTh1apxE4zb0WZzbsn/aKefZ388HgeBIFm fXCRh2JdM8fwNV6Fkp4XTtKagR3gzmZ++XkmoeRHYWFSNcAJ4XwD0/TOrVsw35ZRMUNvdn WqeSGJb9vS86kxlBoyii21ygGuhFW4Um0r1hleu3lhji0jJ4eH1+21f8Z2n1EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708197752; a=rsa-sha256; cv=none; b=b6OxMqiHMwNZ3/D+BAPy2JaxOaW2/wUDsHmcrELsfXcOUtli0EZPDqArgsc3R7jlJ2opMv Ryk2n9dpxVGT1VEtbSoAHqcB3xnjOHXcJmGdw6TB8nN7hhU/FKIn2gR1hijxAWYTTtdIno JlyfkRqR62hJmQojYef1iWedqBBZAO1SCXxXuKLQ98/IogZjS1dMhDRZgbv2CnGEDwc2fv QKcpug/YPh6M89xXxNw180IkrPE9PjaRh0yjG9te3idxatGKBkC5Hgg1cyh/wQDnM+/c72 fDJ6GeD1RZwmvAxzEhcGv+LGAmY2lIxUn3lbZaJKwERHiNbXsvPXj8r4pp6qkg== 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 4Tcdwl5gjGzKvV; Sat, 17 Feb 2024 19:22:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HJMVBc000355; Sat, 17 Feb 2024 19:22:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HJMVEp000352; Sat, 17 Feb 2024 19:22:31 GMT (envelope-from git) Date: Sat, 17 Feb 2024 19:22:31 GMT Message-Id: <202402171922.41HJMVEp000352@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: bad04f1ebc3a - stable/13 - add allwinner overlays for enabling additional USB ports 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bad04f1ebc3a3a979535a53ee109ede94b636aa9 Auto-Submitted: auto-generated The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=bad04f1ebc3a3a979535a53ee109ede94b636aa9 commit bad04f1ebc3a3a979535a53ee109ede94b636aa9 Author: Andriy Gapon AuthorDate: 2022-07-10 20:09:23 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 19:22:08 +0000 add allwinner overlays for enabling additional USB ports For instance, on NanoPi NEO two additional ports are available via a GPIO header. (cherry picked from commit 197944948e6229f625306f38403737ed723e544e) --- sys/dts/arm/overlays/sun8i-h3-usb1.dtso | 14 ++++++++++++++ sys/dts/arm/overlays/sun8i-h3-usb2.dtso | 14 ++++++++++++++ sys/modules/dtb/allwinner/Makefile | 4 +++- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/sys/dts/arm/overlays/sun8i-h3-usb1.dtso b/sys/dts/arm/overlays/sun8i-h3-usb1.dtso new file mode 100644 index 000000000000..247faa370a14 --- /dev/null +++ b/sys/dts/arm/overlays/sun8i-h3-usb1.dtso @@ -0,0 +1,14 @@ +/dts-v1/; +/plugin/; + +/ { + compatible = "allwinner,sun8i-h3"; +}; + +&{/soc/usb@1c1b000} { + status = "okay"; +}; + +&{/soc/usb@1c1b400} { + status = "okay"; +}; diff --git a/sys/dts/arm/overlays/sun8i-h3-usb2.dtso b/sys/dts/arm/overlays/sun8i-h3-usb2.dtso new file mode 100644 index 000000000000..02533289e3dc --- /dev/null +++ b/sys/dts/arm/overlays/sun8i-h3-usb2.dtso @@ -0,0 +1,14 @@ +/dts-v1/; +/plugin/; + +/ { + compatible = "allwinner,sun8i-h3"; +}; + +&{/soc/usb@1c1c000} { + status = "okay"; +}; + +&{/soc/usb@1c1c400} { + status = "okay"; +}; diff --git a/sys/modules/dtb/allwinner/Makefile b/sys/modules/dtb/allwinner/Makefile index 517c1028d12b..c4a48addef14 100644 --- a/sys/modules/dtb/allwinner/Makefile +++ b/sys/modules/dtb/allwinner/Makefile @@ -29,7 +29,9 @@ DTSO= sun8i-a83t-sid.dtso \ sun8i-h3-mmc0-disable.dtso \ sun8i-h3-mmc1-disable.dtso \ sun8i-h3-mmc2-disable.dtso \ - sun8i-h3-spi0.dtso + sun8i-h3-spi0.dtso \ + sun8i-h3-usb1.dtso \ + sun8i-h3-usb2.dtso LINKS= \ ${DTBDIR}/sun4i-a10-cubieboard.dtb ${DTBDIR}/cubieboard.dtb \ From nobody Sat Feb 17 19:22:33 2024 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 4Tcdwp5r6Pz53xg3; Sat, 17 Feb 2024 19:22:34 +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 4Tcdwp1NsJz4FZb; Sat, 17 Feb 2024 19:22:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197754; 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=uzLMpoqaYCP+RpRNr3K8fTk7fzj6O3d3mL0VR2wCS3U=; b=toZwQk2uYrpramCFS5TpKUZgRgEaS6jDbYVzcUpzAW34jSEUPnRiIH1TSvHTEJs1T7BJCN 4yEUdGmtW/z6dZ/McePigbPD4+NlLML0qlanPEk60nzRn0El6KHIPzhz8kq2bZSuvhDneL RVDZd5eY0IAdSWWO8ezUUdLepUa6blMcrACJIOnWE1zzVHJhDR2XkiexVn8hoslUUh90Lp eWaSiCWeMRqVi+q8woEyLUaKKp5hioWVuslARPtWyPtcLJNafCkpl2GcqMrgLdXiccF+t+ CwexvpTP1qQBwx85hb0emP+SaYvTzJ2c7D0J7T8I8w9wK06rKhkH4CK/1/ZOfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197754; 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=uzLMpoqaYCP+RpRNr3K8fTk7fzj6O3d3mL0VR2wCS3U=; b=KLpS/dFzutRUsmWEYxh4iqG4VnZCrbjvgV1h2dSRT7GD+xNf0mX4eskiFamX1xI4qPnush DdGf7/kInEtbI7Mbp1RP4LORiJpu/WByuRAjuZOynKONtjXjIVchjVbBvjkjnKpqLvlGio bN0phS0Ncd+nwcV9BjnQNeBBvJNg0N4aRpTU5S+4HvyM/scgYaNC6zFksfMfPzd8fNLWCc hBqBy4KmJ2nWJTOq6aoSe/rEnt0//q7CLJ4AfnvLvGGEYL1uTcmf37dhh3oLh5leC5UN1f yrWY2E40ihuIjGedrz5zcyFJ1TbM3tbGHotEQIzEgAzqsea0clUqh6WVBdQtKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708197754; a=rsa-sha256; cv=none; b=wod+vJyRlvlk8dkK2ylyjmlz6kR2RxJw14qgdBjKRWx4754UdMxLdLu23ByZhEB6icIwH+ RgDebBAmVDwpi1fSlLslJktEv+oReWuxir2ImEot+FOL/mSdMQRNFbeJkzlPYJznbNkxV9 ff3vce6IeIUEOx5fcAroQZq0RAhN0ucir2XuhGrxFjXBPcqSehANKveBhkT7l0QM35j9Lx SC5RgnNDVmPQLiH5uI060UNidmOQSKiMZgGdUlr4lG4jdLknJLmKLUS5JAnP6vD0tndWQI T1jyFf6Lt9jL7/6ZcuW98JxhurCMichqwia7zWDJA/S2CLZxDRU1uQQiSQtWtg== 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 4Tcdwp0Vx6zKdS; Sat, 17 Feb 2024 19:22:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HJMXNS000443; Sat, 17 Feb 2024 19:22:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HJMXHx000440; Sat, 17 Feb 2024 19:22:33 GMT (envelope-from git) Date: Sat, 17 Feb 2024 19:22:33 GMT Message-Id: <202402171922.41HJMXHx000440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: b44d933e2617 - stable/13 - dwmmc: fix a typo 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b44d933e26170f92c797dd3daab3eab16589acc0 Auto-Submitted: auto-generated The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=b44d933e26170f92c797dd3daab3eab16589acc0 commit b44d933e26170f92c797dd3daab3eab16589acc0 Author: Andriy Gapon AuthorDate: 2021-09-24 16:32:39 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 19:22:08 +0000 dwmmc: fix a typo (cherry picked from commit ea7f45d3d8d5d41a9cded5765dea43ed215a663b) --- sys/dev/mmc/host/dwmmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mmc/host/dwmmc.c b/sys/dev/mmc/host/dwmmc.c index 5e8ae3b39508..f41c15eacd14 100644 --- a/sys/dev/mmc/host/dwmmc.c +++ b/sys/dev/mmc/host/dwmmc.c @@ -878,7 +878,7 @@ dwmmc_update_ios(device_t brdev, device_t reqdev) sc = device_get_softc(brdev); ios = &sc->host.ios; - dprintf("Setting up clk %u bus_width %d, timming: %d\n", + dprintf("Setting up clk %u bus_width %d, timing: %d\n", ios->clock, ios->bus_width, ios->timing); switch (ios->power_mode) { From nobody Sat Feb 17 19:22:35 2024 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 4Tcdwq53Dnz53y3S; Sat, 17 Feb 2024 19:22:35 +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 4Tcdwq2Rq8z4Fns; Sat, 17 Feb 2024 19:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197755; 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=TOPMUn9Coq/sGrtNVbZIZ7a7NwSQw6Yh+33IGPwdiv8=; b=J+0pc5s33i7fjTGBk3bfF0g/jGNwaP6lRPdvl3lwmOpT+PIs/KQNuVYfPP6U5G++fwgJL7 JA+uzsoQehz0W0cijiTDoEUty/ANcK0GkWvjGyqMVf7XbrTwe5OSWXkHO6EmWYRLZo+UPQ mdJnLS7mvtcNVNvPORiMvOINTIPN/5YdOBrsEbMXwAvBphnM+ctq6mZDNeQH5rWQ2QC88R +6+s4jdK8LZ6uaSxTsczdhZsPVa+9PM/i1juDDeANuovevGVNSppKcgpYvNDkzMUipfEI8 8Etv4jD05wF489mo8UpndIyyoTHkjGd3nKidvdSec3uKP0I1ZliswdbxIzYLIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197755; 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=TOPMUn9Coq/sGrtNVbZIZ7a7NwSQw6Yh+33IGPwdiv8=; b=nG448IKeWX6xNrLuvtqU8TNRd6iIppBEanMzznETC9AbwIWEjeC/2EUYvoToNE068svYlG k7tThxn8FpcARdZlvQ5bJZfsqYixEDRmCVbM1bPM05jtCqbWQ+Kbqv9D+MBC7/uPltOKhl aGzdfefWtZiYlRzqvSkWwqP0A1b0lz4LiGiy9NZYcWze0tIF4JqopJLGM/BW/cAiRpL+Kn Cl0Gcp5BEaVEgESNc/mkzuYOIVMwxt4es7LTVrUJs0kQ7qAHY4dWKMoYl+5C4HAxthsrjK o8Wp7NFyXRyoxgsog7+9h0ggTapjiCYXdnXIP35F0CpuOsevNUqQEtNurJocnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708197755; a=rsa-sha256; cv=none; b=ihEj6IJ72Pceity+I37hqZadaGQEuFBNmYIUsd/bWxqxN8M4VJbyeLC5K+j9RdhDGnJRVh zTt0BAFn3iNPFRpEcnmsTPrtU8KBrGffiodGqkNxO7jHQ3XSXFTkYsS/ejSKWNPSi17HMs uQqgh4HZdjtaY7V5qBS0rf4F7xcrbaE/65k5jFW30OtkWj1ZzvSjZyWzlElAGB0WHbD9zG W2FIUDe3sV1Th9vSw3c80dKCYEfV0Y1knYqhhQB7zj3rVv2i1PYhPwC/nj1Ig90IfyyhVc MwVDNH0BhZXkRZi2IZjI2JKvGBw0a4VoMUNFdV9KSfsTXRgHuLtWxTQDgherXQ== 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 4Tcdwq1YGgzLHw; Sat, 17 Feb 2024 19:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HJMZm7000489; Sat, 17 Feb 2024 19:22:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HJMZLd000486; Sat, 17 Feb 2024 19:22:35 GMT (envelope-from git) Date: Sat, 17 Feb 2024 19:22:35 GMT Message-Id: <202402171922.41HJMZLd000486@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: a4e1bf22796a - stable/13 - mmc_fdt_parse: remove redundant bootverbose check 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a4e1bf22796a070f3fbf43d387277f056e59bedc Auto-Submitted: auto-generated The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=a4e1bf22796a070f3fbf43d387277f056e59bedc commit a4e1bf22796a070f3fbf43d387277f056e59bedc Author: Andriy Gapon AuthorDate: 2021-09-24 16:26:06 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 19:22:08 +0000 mmc_fdt_parse: remove redundant bootverbose check (cherry picked from commit 43ca38eb59ff194fb6d8ad589e74147d94717bf4) --- sys/dev/mmc/mmc_fdt_helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mmc/mmc_fdt_helpers.c b/sys/dev/mmc/mmc_fdt_helpers.c index d53216e19da3..809b59c28167 100644 --- a/sys/dev/mmc/mmc_fdt_helpers.c +++ b/sys/dev/mmc/mmc_fdt_helpers.c @@ -67,7 +67,7 @@ mmc_fdt_parse(device_t dev, phandle_t node, struct mmc_helper *helper, device_printf(dev, "vmmc-supply regulator found\n"); } if (regulator_get_by_ofw_property(dev, 0, "vqmmc-supply", - &helper->vqmmc_supply) == 0 && bootverbose) { + &helper->vqmmc_supply) == 0) { if (bootverbose) device_printf(dev, "vqmmc-supply regulator found\n"); } From nobody Sat Feb 17 19:22:36 2024 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 4Tcdwr5Z8Bz53y5s; Sat, 17 Feb 2024 19:22:36 +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 4Tcdwr3Nrkz4Fgc; Sat, 17 Feb 2024 19:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197756; 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=07IeVfJxvGHvmwZ24yhEP3A2vZju4MI7sxt5NF9C1C8=; b=sSzRKcsSNxZ5FN0ZiXbwoIfUgBntoQzayV2SRy9LSTHEv5qScz9TKGJDmi4RJYtDzUM3wR z1YLy+X0MwTWE3xtWpOtGc5DJInDfpRa7DHPwz9W4w//gZVZ2bLfO5CszRlGczMl0WoBEs CsCz15Y4ob78k7SO22w+rm8hZLwkhdSPJ80w+LNmi6azDXXHlGOS4UO2X8jXL6rxjH47Db vFBEJ4lG3p9sH9RUydL3nW2vP2QBhSCXz7tXVaoFMqd3q27PkLUHkao11y0U7qQsw1utw/ GjYPNZxhYVjdDAS1pnl36l+kwt7AtkFQpPiakps2rEiYCqp5LlItZRR69JuGcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197756; 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=07IeVfJxvGHvmwZ24yhEP3A2vZju4MI7sxt5NF9C1C8=; b=L+8+QfI3CppE4w2RxwVfjqMK19qF9G6+1UdLnY8Rgd0pNmn6dLaz05NlCB3UzX60BifDR/ oefKLzHsEhLMqcqSIfu8SKiHO4uHqid/0boWtLOCfXo2KQpyRYolnI97tVdKNZso7naxKC ftb7FGaW9bB+Fcy+iIUjYbFS6YNdOiBOMfz3hM+6WUFgdm0OFMdlcM4z9H5UNHPsawjFZ5 I1AGB3X5TmjVDsYtY/ayKoJmYriCl+qEAYFrfaefH0E3GNCOv1DqYVhPCXV+NLVg1qbFVI PDorTlv3e0alGPXrZ8J5cFhClWTDVMIlLHhd+ty7SN7U32JkG9QKRKl0cThSag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708197756; a=rsa-sha256; cv=none; b=dYSiX47PxLAvkeKIUhm63EFjYtRZeLrcM0/CAkD946hnapQOUNn1Y+W7bjT32vWcku2gJm /akbTcgP/1O4mFDeJBuj55hfMd1qaXXoJFUO/pIuhI9LbngViwSvhIOw8aJCwozCaVGQTG H78WT4vCFeQpVoUN3vs8dR3uz9wL7ArBIJzLnh7+2yQSPGXYkq0Ril1rJpW/hNNGAHTjqv 5skJG2bKAwxqe4pOgDFn2VuugJyJt3fKrauL1so3VKr9goLLLEPA5c324CwSyhjRX7UCEg 2BeRY/vnWBBdCODDwy6ZsesEDCaO/BTK30UQgdQHbPiuBD908VFwAwwkGjdGBw== 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 4Tcdwr2VWvzKLf; Sat, 17 Feb 2024 19:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HJMax9000536; Sat, 17 Feb 2024 19:22:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HJMaQc000533; Sat, 17 Feb 2024 19:22:36 GMT (envelope-from git) Date: Sat, 17 Feb 2024 19:22:36 GMT Message-Id: <202402171922.41HJMaQc000533@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 392953c490da - stable/13 - fix signature of ipmi_shutdown_event 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 392953c490da99739feeb51e8917325ba30b802a Auto-Submitted: auto-generated The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=392953c490da99739feeb51e8917325ba30b802a commit 392953c490da99739feeb51e8917325ba30b802a Author: Andriy Gapon AuthorDate: 2023-01-03 17:22:21 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 19:22:08 +0000 fix signature of ipmi_shutdown_event The function had a signature of watchdog_fn while in fact it is used as shutdown_fn. (cherry picked from commit 90dc7889825d13290955d0eb7e1fb4388c0a0135) --- sys/dev/ipmi/ipmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ipmi/ipmi.c b/sys/dev/ipmi/ipmi.c index eaf58425fa3c..7fef4d5ad103 100644 --- a/sys/dev/ipmi/ipmi.c +++ b/sys/dev/ipmi/ipmi.c @@ -728,7 +728,7 @@ ipmi_wd_event(void *arg, unsigned int cmd, int *error) } static void -ipmi_shutdown_event(void *arg, unsigned int cmd, int *error) +ipmi_shutdown_event(void *arg, int howto) { struct ipmi_softc *sc = arg; From nobody Sat Feb 17 19:22:37 2024 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 4Tcdwt13t3z53xd1; Sat, 17 Feb 2024 19:22:38 +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 4Tcdws4Cnmz4Ftn; Sat, 17 Feb 2024 19:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197757; 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=MM8scwRe86QvGy8h1qf7EoM+fAAWIJqGnaFUN4fFQB8=; b=EZywAPf3NkpOQEUJxPUc5hTk0F5/z1EzJ6p0Qp0hGTLQZH/xtzuePsPG/n6I7pN99NZBVD +KGW52NNxC7hr7UevJcC7GzAV6EVXy5c+TyXk4FoJQPNyDbTWl9gmFfXOLjfPBXJZdSk+l Y6yGGCG2EOIk/rTI987wiJA00I5X+se2/e5cflNT12YQsGBy5XEXWvuIvtcJcRxPU9+iLw D9p6hi3wm0JksnIETlmmOQtIjvrf45KtGAAEymQulNdEQJmtt3sqDFUG4WG1sVFOpkd4+z Csb2ADLhCRNR2pBjDVwPBzB0XUK9baiOaiTmqTZ4YC/C3S3HOi08lqLU29qGGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197757; 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=MM8scwRe86QvGy8h1qf7EoM+fAAWIJqGnaFUN4fFQB8=; b=mgIz4dHHvN519V5QtHmt+FzpzOo7/+0NKTSisoYqEv0Ax/2FI+xzsBPytunU6R53UIg/8z H2Enz/t4Ae9FUANpCA834wp3XqiAQijdAkOuqkTmNEpoVNcTsgrkozivgVRPxgZheuwpr9 O1awkn6rVRmU9aT6RpREWA2K+hyBr5sm/NvC/DQz8iftYVXzjLvvnhP8aok8AMCetzFny7 KHQ7jV0gehjgS63hpbs+MHChFJtlfsOVeerC0tHn+LbfGiSKWMI+2y2SHR7H1gAxQHyQgv gU9GF7+sQMh6hbDOxAujH2yrjr03zDA8GYx0aCfk4WYyvTjRREalyefhfzV5eQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708197757; a=rsa-sha256; cv=none; b=rdco/L939/bgUWUNidwVEiVSNMZb4KN86RBqV2/0kK06EaDqGIt0+cvFBA1E0wUc2qN2vG ZAER7Mv8jzRLXaFpJpkCkfq6uGZinN8xnHXx/ct6BkuY4dBK8akYCfDG8gROEYyMvQmTgS 1ipuI+tgLGTa3Cz2bI3SvYQawKkSvk26+y85XKTeWiMq1piCRMeJX41OeC0opg63JrvGt5 e/il6/mP5QwuEHddHaTO/iiAF7IvGI/9dtadfzFoDTHVxguQQsK6mZrmhmQPFAoxuQfbv8 OtlOstI9Y8/LvJIRYAgTp1McfJ9YOrCZFrJkCVQRGoc5fvNZEVukldQfvylZOw== 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 4Tcdws3K1JzLHx; Sat, 17 Feb 2024 19:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HJMbGQ000597; Sat, 17 Feb 2024 19:22:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HJMbXv000594; Sat, 17 Feb 2024 19:22:37 GMT (envelope-from git) Date: Sat, 17 Feb 2024 19:22:37 GMT Message-Id: <202402171922.41HJMbXv000594@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 9ca7451d86dc - stable/13 - change ipmi watchdog to awlays stop when system is halted 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9ca7451d86dcf8fb072491028e3b0fb50b2299c5 Auto-Submitted: auto-generated The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=9ca7451d86dcf8fb072491028e3b0fb50b2299c5 commit 9ca7451d86dcf8fb072491028e3b0fb50b2299c5 Author: Andriy Gapon AuthorDate: 2023-01-03 17:26:45 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 19:22:08 +0000 change ipmi watchdog to awlays stop when system is halted That is, wd_shutdown_countdown value is ignored when halting. A halted system should remain halted for as long as needed until a power cycle, so the watchdog should not reset the system. (cherry picked from commit 8fdb26160160c4507eb2f644a982a3e05984cdf6) --- sys/dev/ipmi/ipmi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/dev/ipmi/ipmi.c b/sys/dev/ipmi/ipmi.c index 7fef4d5ad103..ff2a31859485 100644 --- a/sys/dev/ipmi/ipmi.c +++ b/sys/dev/ipmi/ipmi.c @@ -741,6 +741,10 @@ ipmi_shutdown_event(void *arg, int howto) * Zero value in wd_shutdown_countdown will disable watchdog; * Negative value in wd_shutdown_countdown will keep existing state; * + * System halt is a special case of shutdown where wd_shutdown_countdown + * is ignored and watchdog is disabled to ensure that the system remains + * halted as requested. + * * Revert to using a power cycle to ensure that the watchdog will * do something useful here. Having the watchdog send an NMI * instead is useless during shutdown, and might be ignored if an @@ -748,7 +752,7 @@ ipmi_shutdown_event(void *arg, int howto) */ wd_in_shutdown = true; - if (wd_shutdown_countdown == 0) { + if (wd_shutdown_countdown == 0 || (howto & RB_HALT) != 0) { /* disable watchdog */ ipmi_set_watchdog(sc, 0); sc->ipmi_watchdog_active = 0; From nobody Sat Feb 17 19:22:39 2024 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 4Tcdww0JyKz53y3W; Sat, 17 Feb 2024 19:22:40 +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 4Tcdwv5zr5z4FvP; Sat, 17 Feb 2024 19:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197759; 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=pLxTNj7YOWC03MfZgg+k+ylYE+dkL1qLO6dqh6K+eek=; b=uTAulCXHQh98STru2Aul6adexshneBwPcLzizR0w1hMRbwTqteOFCa1tX7f/gvbvIbSddM D2L5W8UZpCSjjYBbHpZU/kqyMIdSyUXtMijn1wYTkS4atI4VdpmEldnwjWPUwufoPcjbbw u1ZWJQFZnPQ6meV9DDlIkX6XoTy5unfl6du0hkQ17oP3ehdvY3Xz3ne8wJmPBY7NdzAhBL mkewQD+LaylALaNScPWWet3nHl9NuNOGYBEfuAJuQIPx5tLTGGeDJle/7yLKK1I/dnEXKy uDL36KgurNs0uJQbBM7VaxjE4Q84EV2gSjI05jsnkIfNAVaGg7d54sK/x8wB9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197759; 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=pLxTNj7YOWC03MfZgg+k+ylYE+dkL1qLO6dqh6K+eek=; b=noM51fjI3UmUKuVks/ZyOD84qBEt17BxEzFvs+kpjcJuR3jff50/ykoF9uWnOoc5eNAUjc w8sR/vwzlxlI/DjmICSuOO6SyLH4al9XyAGkRHKffthv4X85SIfOA9uRwv6jYBTawUQP0/ uwaPZIFrSZ8Razzn2zm6gW7v27DuN/VY9kA03y25VdMn1m/6nAlmVh/nmVnVq8AdJGOUlA kro/xm0A960XAhmjECeZNvOjdynWhqcST1GNhYR9hS+aCZuN+MK+Z084FRYLEMthhk4/dg PdVZLH+jd6cqG/Gp1aWm/DcN/wsacogG6sJfC1CI+NVuP4l2GQJQ+ZiSCfDqNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708197759; a=rsa-sha256; cv=none; b=pgVj4FkkalU3LHS667IHILga3QGKtImgHUQ9XDI/9SUjjAEKtVDjQFZvwUdxZ5MabAcRzv S7OVWEOjHM+AkcVK3rA7dOO9achh7bg/6wxwVzaiVVOahRZjqMVdp3dftHq0OJHtPqYHB0 OGHigsqcnE7bhsduSPpJH0UEYDcc2mLHijOkxxhm1i5V2rasL6jpRB05Gr/0osY8+wEga6 q7wza2xVuZUwNeplSpTzZbJqVVhxP7+FlRSqwpJl/c70svZJfun7NB6eHzj3HPE+c/NmAp 4CWnAqDU/xqXtwkI4LfxC7SJdDEHjBJKEG/Y8oLjNRW0zJcwLyucl7PU6J2xSQ== 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 4Tcdwv54wwzKgX; Sat, 17 Feb 2024 19:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HJMdaP000704; Sat, 17 Feb 2024 19:22:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HJMdSJ000701; Sat, 17 Feb 2024 19:22:39 GMT (envelope-from git) Date: Sat, 17 Feb 2024 19:22:39 GMT Message-Id: <202402171922.41HJMdSJ000701@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: f0ed49921c28 - stable/13 - dtrace: make 'ring' and 'fill' policies imply 'noswitch' flag 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f0ed49921c2891733b7ee65679a8dcba5398e3b6 Auto-Submitted: auto-generated The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=f0ed49921c2891733b7ee65679a8dcba5398e3b6 commit f0ed49921c2891733b7ee65679a8dcba5398e3b6 Author: Andriy Gapon AuthorDate: 2021-12-24 09:38:38 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 19:22:08 +0000 dtrace: make 'ring' and 'fill' policies imply 'noswitch' flag This should disable allocation of the second per-CPU principal buffer which is never used. This will also enable additional asserts for buffers that are never switched. (cherry picked from commit e92491d95ff3500e140eafa614e88ca84ffb0d26) --- sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c index 6ae0322ebb0f..17d9536b2428 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c +++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c @@ -12055,7 +12055,6 @@ dtrace_buffer_switch(dtrace_buffer_t *buf) hrtime_t now; ASSERT(!(buf->dtb_flags & DTRACEBUF_NOSWITCH)); - ASSERT(!(buf->dtb_flags & DTRACEBUF_RING)); cookie = dtrace_interrupt_disable(); now = dtrace_gethrtime(); @@ -14863,10 +14862,10 @@ dtrace_state_buffer(dtrace_state_t *state, dtrace_buffer_t *buf, int which) if (which == DTRACEOPT_BUFSIZE) { if (opt[DTRACEOPT_BUFPOLICY] == DTRACEOPT_BUFPOLICY_RING) - flags |= DTRACEBUF_RING; + flags |= DTRACEBUF_RING | DTRACEBUF_NOSWITCH; if (opt[DTRACEOPT_BUFPOLICY] == DTRACEOPT_BUFPOLICY_FILL) - flags |= DTRACEBUF_FILL; + flags |= DTRACEBUF_FILL | DTRACEBUF_NOSWITCH; if (state != dtrace_anon.dta_state || state->dts_activity != DTRACE_ACTIVITY_ACTIVE) From nobody Sat Feb 17 19:22:38 2024 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 4Tcdwv1Zqtz53y5y; Sat, 17 Feb 2024 19:22:39 +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 4Tcdwt6Gt2z4Frl; Sat, 17 Feb 2024 19:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197758; 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=Qv97pJQFwgVPQFwnF3ZgkgHVsJb9R7APwmmDyuepJuI=; b=bjHFkJawXmBNN2YOMrXsLDlk0PU1WCigmBvQavtZ2+46va3VhfNdqFbbLumTw104cFEO0N G7fHkoWBoAzedvCu/tWFIfwUB/3VlvaViA/3785oyC+6MW2MjTHzgIdURVQMnO/3tDYLwL rkP7j3kILcYG9oxLaZOCCKGhDwZh9/ATRc/A11aY+tRHGovX3HJRo7WCasix63HoRdXVal Wnh+2PxL5bGVcbSV8mWHEN+y+MFY+HgkoYDHarMvWXPrC1FXK+qPXcgs07c7kfxWahDb4/ IwqRqy2Aki9MQHRp6VI5nJtfi9Tc+IOjT8p6XsycUT4V+Eb2EbwK0zXVYaQklw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197758; 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=Qv97pJQFwgVPQFwnF3ZgkgHVsJb9R7APwmmDyuepJuI=; b=BxYR+yGG06jcZoOunL7TzuLNo7gbyud4BwXSvaNJZtbtBDGEE7dfMN23Sd14n8CaLDZsIl 0wfi75SVOOiT+B/kgHfE0/2OLAOhQq6QA3AKzzrtjiMLChsOLydYjljZDwgqtd0U0uytBh PAEl3ZbznJCi7gnoupPm+vVxw3ajpNXjUipwrYRiEyB/0YRVMLJyoHroM/zoVoKBJVSDzZ G/S8KaSPI7qBxhrwbgqnPHH1Y3X8MFp1eh3i/MypqVpdhjuXY0exsotPecyypojsG8P2rZ i9oNjrU354t9sUUgTRoj2vxAm6Wz4oyjHpA2A0K+21QpJStEE0wt+H/b1PiGMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708197758; a=rsa-sha256; cv=none; b=Q9Os09bferHwlm7Sj5AOAStpDVo66q6UFx9qJ30uJb7nu2g7NmseukVh+nuwkXjGJECyyZ jSFNOw5V/Z9hqVMM/n0WoakaGtdt2T/MHPvxD1Qi4qMD63evPdWgs2NO46YmG97VPn4FHH HU0CURFhTeqWJlu9RXtjes+QqhpwAB+DbZeCRVqdxOtkOxADXi6jeMjVKCXv/b20OT4W2l 549mjLJvNve3yzxSOeA/w0z6wl1dRU5XUz242JwAKKDTpTnWxFysBosEQSi2xBnS6NCbW4 a8ZBTlrIlK7Ige3OsNBywF6wB4XcPmGxjGTuwTxkAEkylrFqMiLqRos0VOgKtg== 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 4Tcdwt4L3rzLHy; Sat, 17 Feb 2024 19:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HJMco2000650; Sat, 17 Feb 2024 19:22:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HJMcBT000647; Sat, 17 Feb 2024 19:22:38 GMT (envelope-from git) Date: Sat, 17 Feb 2024 19:22:38 GMT Message-Id: <202402171922.41HJMcBT000647@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: faa59e9ab402 - stable/13 - ichsmb: fix block read operation 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: faa59e9ab402b12f3c3d3386175a178e45308b22 Auto-Submitted: auto-generated The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=faa59e9ab402b12f3c3d3386175a178e45308b22 commit faa59e9ab402b12f3c3d3386175a178e45308b22 Author: Andriy Gapon AuthorDate: 2022-09-13 21:26:35 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 19:22:08 +0000 ichsmb: fix block read operation First of all and unlike I2C, it's not the master that dictates how many bytes to read in block read operation. It's the device that informs the master how many bytes it's sending back. Thus, for ichsmb_bread() the count parameter is purely an output parameter. The code has been changed to reflect that. The sanity checking of the response length is now done once it (the first byte of the response) is received. While here, handling of ICH_HST_STA_FAILED status bit has been added. Plus some code style improvements and some new code comments in the vicinity of the changed code. (cherry picked from commit cbf7c81b608bb9311e50df9481447dc843083a0e) --- sys/dev/ichsmb/ichsmb.c | 61 ++++++++++++++++++++++++++++++++------------- sys/dev/ichsmb/ichsmb_var.h | 5 ++-- 2 files changed, 46 insertions(+), 20 deletions(-) diff --git a/sys/dev/ichsmb/ichsmb.c b/sys/dev/ichsmb/ichsmb.c index 30c408a92c59..9d99838ef2ad 100644 --- a/sys/dev/ichsmb/ichsmb.c +++ b/sys/dev/ichsmb/ichsmb.c @@ -389,8 +389,8 @@ ichsmb_bwrite(device_t dev, u_char slave, char cmd, u_char count, char *buf) return (SMB_EINVAL); bcopy(buf, sc->block_data, count); sc->block_count = count; - sc->block_index = 1; - sc->block_write = 1; + sc->block_index = 1; /* buf[0] is written here */ + sc->block_write = true; mtx_lock(&sc->mutex); sc->ich_cmd = ICH_HST_CNT_SMB_CMD_BLOCK; @@ -413,26 +413,23 @@ ichsmb_bread(device_t dev, u_char slave, char cmd, u_char *count, char *buf) const sc_p sc = device_get_softc(dev); int smb_error; - DBG("slave=0x%02x cmd=0x%02x count=%d\n", slave, (u_char)cmd, count); + DBG("slave=0x%02x cmd=0x%02x\n", slave, (u_char)cmd); KASSERT(sc->ich_cmd == -1, ("%s: ich_cmd=%d\n", __func__ , sc->ich_cmd)); - if (*count < 1 || *count > 32) - return (SMB_EINVAL); bzero(sc->block_data, sizeof(sc->block_data)); sc->block_count = 0; sc->block_index = 0; - sc->block_write = 0; + sc->block_write = false; mtx_lock(&sc->mutex); sc->ich_cmd = ICH_HST_CNT_SMB_CMD_BLOCK; bus_write_1(sc->io_res, ICH_XMIT_SLVA, slave | ICH_XMIT_SLVA_READ); bus_write_1(sc->io_res, ICH_HST_CMD, cmd); - bus_write_1(sc->io_res, ICH_D0, *count); /* XXX? */ bus_write_1(sc->io_res, ICH_HST_CNT, ICH_HST_CNT_START | ICH_HST_CNT_INTREN | sc->ich_cmd); if ((smb_error = ichsmb_wait(sc)) == SMB_ENOERR) { - bcopy(sc->block_data, buf, min(sc->block_count, *count)); + bcopy(sc->block_data, buf, sc->block_count); *count = sc->block_count; } mtx_unlock(&sc->mutex); @@ -514,16 +511,24 @@ ichsmb_device_intr(void *cookie) /* Check for unexpected interrupt */ ok_bits = ICH_HST_STA_SMBALERT_STS; - cmd_index = sc->ich_cmd >> 2; + + if (sc->killed) { + sc->killed = 0; + ok_bits |= ICH_HST_STA_FAILED; + bus_write_1(sc->io_res, ICH_HST_CNT, + ICH_HST_CNT_INTREN); + } + if (sc->ich_cmd != -1) { + cmd_index = sc->ich_cmd >> 2; KASSERT(cmd_index < sizeof(ichsmb_state_irqs), ("%s: ich_cmd=%d", device_get_nameunit(dev), sc->ich_cmd)); ok_bits |= ichsmb_state_irqs[cmd_index]; } if ((status & ~ok_bits) != 0) { - device_printf(dev, "irq 0x%02x during %d\n", status, - cmd_index); + device_printf(dev, "irq 0x%02x during 0x%02x\n", status, + sc->ich_cmd); bus_write_1(sc->io_res, ICH_HST_STA, (status & ~ok_bits)); continue; @@ -541,6 +546,12 @@ ichsmb_device_intr(void *cookie) } } + /* Check for killed / aborted command */ + if (status & ICH_HST_STA_FAILED) { + sc->smb_error = SMB_EABORT; + goto finished; + } + /* Check for bus error */ if (status & ICH_HST_STA_BUS_ERR) { sc->smb_error = SMB_ECOLLI; /* XXX SMB_EBUSERR? */ @@ -569,6 +580,18 @@ ichsmb_device_intr(void *cookie) if (sc->block_index == 0) { sc->block_count = bus_read_1( sc->io_res, ICH_D0); + if (sc->block_count < 1 || + sc->block_count > 32) { + device_printf(dev, "block read " + "wrong length: %d\n", + sc->block_count); + bus_write_1(sc->io_res, + ICH_HST_CNT, + ICH_HST_CNT_KILL | + ICH_HST_CNT_INTREN); + sc->block_count = 0; + sc->killed = true; + } } /* Get next byte, if any */ @@ -579,15 +602,17 @@ ichsmb_device_intr(void *cookie) bus_read_1(sc->io_res, ICH_BLOCK_DB); - /* Set "LAST_BYTE" bit before reading - the last byte of block data */ - if (sc->block_index - >= sc->block_count - 1) { + /* + * Set "LAST_BYTE" bit before reading + * the last byte of block data + */ + if (sc->block_index == + sc->block_count - 1) { bus_write_1(sc->io_res, ICH_HST_CNT, - ICH_HST_CNT_LAST_BYTE - | ICH_HST_CNT_INTREN - | sc->ich_cmd); + ICH_HST_CNT_LAST_BYTE | + ICH_HST_CNT_INTREN | + sc->ich_cmd); } } } diff --git a/sys/dev/ichsmb/ichsmb_var.h b/sys/dev/ichsmb/ichsmb_var.h index abef219465e6..7fb14804d3c4 100644 --- a/sys/dev/ichsmb/ichsmb_var.h +++ b/sys/dev/ichsmb/ichsmb_var.h @@ -58,8 +58,9 @@ struct ichsmb_softc { int smb_error; /* result of smb command */ int block_count; /* count for block read/write */ int block_index; /* index for block read/write */ - u_char block_write; /* 0=read, 1=write */ - u_char block_data[32]; /* block read/write data */ + bool block_write; /* block write or block read */ + uint8_t block_data[32]; /* block read/write data */ + bool killed; /* killed current transfer */ struct mtx mutex; /* device mutex */ }; typedef struct ichsmb_softc *sc_p; From nobody Sat Feb 17 19:22:40 2024 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 4Tcdwx40DLz53xd4; Sat, 17 Feb 2024 19:22:41 +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 4Tcdwx05BGz4G0m; Sat, 17 Feb 2024 19:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197761; 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=lYdHOyo98a0XKRhq0jZ9q9o/8lrAM9m00h08BjSIyPk=; b=l669xKjC9I4OXNTO4fbAWf4/r1xXzEKh4lYyYwhxtcxS6PmN9NHp2W0EIhIkq2uE3rS3oC wPYTJiWdE3miiYiAYpgWxuGLBGZt1WtTa7k7gvg2iuT3cbU24eqeXhp6RiQUGFrksbyqfd dq685Q5LpOhqY2LQc60xnuwm18vECJp4x6CI+7TylVOTrqIwcZmG6qOQS+RWyHY6mIJS+c nDJZZHXNoVxCsatiefiY2Xl8yWTyl16NvlHMEgMY3wOsDcSOdBBuUZUUYnyM+7I3Xb9cPM yP07PN0S5P8xZFCutC6pQiAjFuxOvkBxaEnM4csWcdRZBIXU7XaGDa5wM5wj6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197761; 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=lYdHOyo98a0XKRhq0jZ9q9o/8lrAM9m00h08BjSIyPk=; b=WE7LydeAf/9Hww/CT5s7LqNGHA1f/Q2zKhOsegRl1/CtgrrrVi4rihhkDzHOHCPiDX3yCb rJwZkjvm13us5xxUOSyLJL/XACQCaG4jIY7i5quDm/8UkzHbG5vzxNz810e5b+NSu8CH81 +0sE2MKrXf5LQgWIbLpeqslkJkKHoObdNflytJpD5tajuI3F63pAlEGTUhWi69DbpyVvfT Y3B7owYWR0SwO6BqV7PrEZ1yIsCidzi/5otVH5s/6/YV85/bapGYuFMwuymP4RzfE1xJrs x2JveshjR0cz5ttiHFQJ3+IffwrcBrMnVG9OFwidBfnQ6tkpb8esmbfjDmpkOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708197761; a=rsa-sha256; cv=none; b=KdAjv96KrAQ7mD+bZDE5va0wUtYn/16Qd0C5dYlQIwSy+Z22g0Iwe8al0z1RgHqbhcO/Me AmmRu+SDB4t5U3LwDvkGcVumV5IWAcap5lFlhX3+s/E57swRr59/PQb6TBmecZ2HIhu321 Pitb6sbryRoM5ErPeQrsTtI3wfBSRNOXSk1+ZKJya48iOxT82InIkHxk1nlBelXiuI6J4T rZRxT/KCZJ8zwc2FUPbVv8h8ZErcjWN8MEZA7UIuAlDVubI0kCg5crjWcHRYCgUpADwkwV fhf950chv7vSCZKQP1bfpBwIQ8eXSRfe3+mtYTbWA/CUi6l30JdgrqquDFKR4w== 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 4Tcdww6KKjzKgY; Sat, 17 Feb 2024 19:22:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HJMeKD000751; Sat, 17 Feb 2024 19:22:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HJMesl000748; Sat, 17 Feb 2024 19:22:40 GMT (envelope-from git) Date: Sat, 17 Feb 2024 19:22:40 GMT Message-Id: <202402171922.41HJMesl000748@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 4df1b9cc2bff - stable/13 - hdaa_pcmchannel_setup: do not advertise AC3 8+0 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4df1b9cc2bff6098f29ab8af4f12e7bdec3ee9be Auto-Submitted: auto-generated The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=4df1b9cc2bff6098f29ab8af4f12e7bdec3ee9be commit 4df1b9cc2bff6098f29ab8af4f12e7bdec3ee9be Author: Andriy Gapon AuthorDate: 2024-01-28 13:18:02 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 19:22:08 +0000 hdaa_pcmchannel_setup: do not advertise AC3 8+0 The rest of the sound system supports 7+1 maximum and is not aware of 8+0. I believe that these messages are caused by 8+0: kernel: feeder_init(0xfffff801f935d680) on feeder_matrix returned 22 kernel: pcm0: feeder_build_matrix(): can't add feeder_matrix (cherry picked from commit c053a56c0f5df6db5223316831142e1d8afff64f) --- sys/dev/sound/pci/hda/hdaa.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c index 6d5e27b88b1f..20297f069d26 100644 --- a/sys/dev/sound/pci/hda/hdaa.c +++ b/sys/dev/sound/pci/hda/hdaa.c @@ -5428,7 +5428,6 @@ hdaa_pcmchannel_setup(struct hdaa_chan *ch) if (HDA_PARAM_SUPP_STREAM_FORMATS_AC3(fmtcap)) { ch->fmtlist[i++] = SND_FORMAT(AFMT_AC3, 2, 0); if (channels >= 8) { - ch->fmtlist[i++] = SND_FORMAT(AFMT_AC3, 8, 0); ch->fmtlist[i++] = SND_FORMAT(AFMT_AC3, 8, 1); } } From nobody Sat Feb 17 19:22:41 2024 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 4Tcdwy3Q1Yz53xg9; Sat, 17 Feb 2024 19:22:42 +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 4Tcdwy1J0zz4Fsd; Sat, 17 Feb 2024 19:22:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197762; 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=XZdvPa+P0qKHphEx6j7017L1eIdvLQbcb8sWIOgF7d4=; b=w1lFuDqFJeO+cGPB5AQTuhZGk6s38mi1uMtnOpwQoiwvk5fO2Daop1t7q/xwcWjrjt5rAx X2Ifuv6ez1UjAmcm8xItZt4bBCFYrKNWEXESblp1WPNO0cmL3D2Fz/ssj97Y6EeL1eCatZ bCog6+yVvK7Mys0a4Xh/PXorEBG6czrg1iDgDXTsKLR/dNBouVu12jqg7/D0pgZ0jjGG4S 5kAyoi+k25WtjwTnQsFsFH6BD2eGw1IgzGKimlO6k3fKzTYRQgZ6sGJqcDIdJ0VLtmn66C JWKC9K2INP0GDrivPdmT7hGxVwjaiFGN299PzcCAx7uwFAav4Ydwve8YsLZoQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197762; 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=XZdvPa+P0qKHphEx6j7017L1eIdvLQbcb8sWIOgF7d4=; b=AT6d839UdshNyDyB4antARlcLoEsS04/nmvLpCpoEnHTkofn153mAQo+Cp+ATuBVnAlzYN UI0+QuTjrNe4zBI9Dz/bYXAxAW+Edtk09NgyIDf5BIdasmt3pteGLQky7pgQEtA+VokArf wuZ92Ip4cBDA9rY9xIXsfhUT3S95kqvHgRIQwT5V0URiTLKZbb+aTVPZiw96e/98StPvTo q3KWa2TEX61hAkVwC2rf5QkgotsK/5uuaTbh6xylyKEiSUYKZ4+nvzG0dpcWFaDQCIj+c8 3EkN0J8RJp3fpsVQqIxd/beaP1iO+stX5cl8QveZUVI49ANxDhcylvfAzwk8oA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708197762; a=rsa-sha256; cv=none; b=uswjk6yE29hpXSzu5dH8gliZQON6EyflJuSSmI/mFI/N6tcGKs/tS38hnjZKRqjmXeyHvI 1TaNoOuTxJdeENTdDo4nabQS+D8iuJ9kyhi3qSDXH+3i73hUSrv912nfgZ5TAlbtLCfTVI o0qC9QHs4fiqAeiP3k1ZC+r60NxaYrz8koob10uS1t6ZuKiG9qs4W/gmVQkC4Jvr+q03U4 isf88nQJk12eaDyeAbw5llGIR7EYM5dq58p+88j0ggYPh/pXwM9ymdiaTIUT/MQ5bVJwyv zVJeOgJANwEsUK7cMrbL4JWkj5mM6J+pFt9ndljfzSpYwbboWWfS/6Bs9EUIIg== 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 4Tcdwx75ZVzKdT; Sat, 17 Feb 2024 19:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HJMfBH000799; Sat, 17 Feb 2024 19:22:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HJMf6v000796; Sat, 17 Feb 2024 19:22:41 GMT (envelope-from git) Date: Sat, 17 Feb 2024 19:22:41 GMT Message-Id: <202402171922.41HJMf6v000796@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 1b92999e67b6 - stable/13 - efibootmgr: fix potential endless loop with -v 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1b92999e67b6cbfa75a9def2a33464080ba33a05 Auto-Submitted: auto-generated The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=1b92999e67b6cbfa75a9def2a33464080ba33a05 commit 1b92999e67b6cbfa75a9def2a33464080ba33a05 Author: Andriy Gapon AuthorDate: 2022-10-25 21:10:39 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 19:22:08 +0000 efibootmgr: fix potential endless loop with -v I observed the problem on a system with fairly old and, apparently, buggy EFI implementation. A list of boot devices had an invalid trailing entry. efidp_size() for that entry returned zero, which means that the code got stuck looping on that entry. (cherry picked from commit bf87d4a4bfaa86e97079754e93fe14595adf07c5) --- usr.sbin/efibootmgr/efibootmgr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/efibootmgr/efibootmgr.c b/usr.sbin/efibootmgr/efibootmgr.c index 8dcf9876486d..be1157b4aa84 100644 --- a/usr.sbin/efibootmgr/efibootmgr.c +++ b/usr.sbin/efibootmgr/efibootmgr.c @@ -784,6 +784,8 @@ print_loadopt_str(uint8_t *data, size_t datalen) */ indent = 1; while (dp < edp) { + if (efidp_size(dp) == 0) + break; efidp_format_device_path(buf, sizeof(buf), dp, (intptr_t)(void *)edp - (intptr_t)(void *)dp); printf("%*s%s\n", indent, "", buf); From nobody Sat Feb 17 19:22:43 2024 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 4Tcdwz4XjJz53xgF; Sat, 17 Feb 2024 19:22:43 +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 4Tcdwz26LLz4G3g; Sat, 17 Feb 2024 19:22:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197763; 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=6UNvMRc4c6XslDBGTDvUirNs4lonWMvMGJJ+03uFPtY=; b=TWtBdzItJQEx+uMq/fchSPRjaqoS2KlHYLI0pnZ5Lv/L518SayF5l0uRvs2GO36ViB680e 8dBE2ouKqiBEc+BTVOtyfC4AnRmcEUjh6rS3yaSlP50EOcmCasjAwITldauzRqG2qErbZY RJXLAjA2BWHRbTHh0nJ2xcRW243ZKl4oextUbTKwJLxcy0Ye7P/aunEQy1asFuv/O3ccT9 O2CPSFrEwccTCCbUPH6Kj9AfUks5ykk02iDSC+FSzxTlRyW12jcPtpPbJB7XdJUYuglGW5 0/6nwYggP2rCFTcfaI79I+f+/z6JvxavyUgtFirrePAfmGSpkleeCmFDlkoejg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197763; 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=6UNvMRc4c6XslDBGTDvUirNs4lonWMvMGJJ+03uFPtY=; b=uVeksto+PfCbzl5vxXqXVur5ZflpOoy2+T6lV6ZKZNwRthRiKGXgGPv8RDTBxaUli7QPNq zJW9Ym8VzC+ZAmOqGVTZPqONm2mgiQYWpwB6WmwEHPkcmueb4ihhF+wRcLcjmzFqbCFrzj dFiDe9Pl4vtUArZ2nEgjOCARRsW6hyGtB63Zl9vK2wNBfdskGyJlyu3H8YBvPU5YgDox0w aWVAw82DEPbYEC+/DTJRj7SVz7UI7/TgkUURI70cHvgJfGzmNNvMdNGIttLEQmkpRYoPkp qb5eL5UG1KnxJcZLJf0CF4wVNoiVpNQNQuW5rGdA6T0eHrGf2ggCXAbx3J4S4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708197763; a=rsa-sha256; cv=none; b=fEeIT5Z/wvgxAzlopgS1nPVp27zyzpM/5hqrfPHcUMGuRcDgHejv3716txwK0wICgo9di6 DR7higqImqPcIPTrGj6SQHRmIpIClWa7X1IGWcqdsEBNDs3XlwL9coepK3kGS8Y/nVUNs1 fVxmKhPfXZHGcw8wAeZ5EQZzXBvc3R6cxPXL3uVWrrVYxWBIGeqVOAh5kQUq/ugkt4Tm+u y1ac/d2BpP+QaDBg5hL7oq+WN4u7lCyW7Dn0b6KiJt3pK6zCZMgcjAIqnoasXI7y3gxuLf zoSj8egloceYDZmqRmqeatVKSNBnoOS7sqvMjjGJtE//iYQsC59XOJ0VKxaXWw== 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 4Tcdwz1DLSzLJ1; Sat, 17 Feb 2024 19:22:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HJMhXK000843; Sat, 17 Feb 2024 19:22:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HJMhfu000840; Sat, 17 Feb 2024 19:22:43 GMT (envelope-from git) Date: Sat, 17 Feb 2024 19:22:43 GMT Message-Id: <202402171922.41HJMhfu000840@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: a669851b3516 - stable/13 - subr_bus: report DEVICE_SUSPEND failures 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a669851b35163a849ebcbae0c9c8048f86efde10 Auto-Submitted: auto-generated The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=a669851b35163a849ebcbae0c9c8048f86efde10 commit a669851b35163a849ebcbae0c9c8048f86efde10 Author: Andriy Gapon AuthorDate: 2023-01-03 08:39:32 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 19:22:08 +0000 subr_bus: report DEVICE_SUSPEND failures This greatly aids with diagnosing system suspend failures when they are due to a device driver or hardware. (cherry picked from commit 4d1161f094dd90428847f7e5989767e9957055f4) --- sys/kern/subr_bus.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 8abf7fa83750..d34bcc3cca58 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -3881,8 +3881,12 @@ bus_generic_suspend_child(device_t dev, device_t child) error = DEVICE_SUSPEND(child); - if (error == 0) + if (error == 0) { child->flags |= DF_SUSPENDED; + } else { + printf("DEVICE_SUSPEND(%s) failed: %d\n", + device_get_nameunit(child), error); + } return (error); } From nobody Sat Feb 17 19:22:44 2024 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 4Tcdx06XLZz53xdB; Sat, 17 Feb 2024 19:22:44 +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 4Tcdx03CWxz4Fmk; Sat, 17 Feb 2024 19:22:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197764; 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=oZ8wANPOa7un1fg5KI3bD/XSFMXt8IZjMrk06MmQ8Q8=; b=QYoiCNY/3XyZuz/q/xlS+CtxT52TMg52HBX5vRN/VVO9qtRAgMHGVIFFsQEveYHNSMdh5J 51d5dYxQVKRVk5DzCqqTGY8RLH5mXZqlrubP5ab1nopVSJYCshxZSxcSpskNLK6HRKAPWr SKuB+JNxfnmSQ+y14KCrM491t85+eqhdRmqWyaCYAzDSvBiVR+5CyuofhmGC7Pdq+fKvOt 5ntPTy0WA98yc8/esdbYMySt/7UuBIqaU1qUPtrhHGbeU/gI7pc5gPlXkLIhcyU8Y64jwP xqARmuuw1nQQqb8k68sLMpDowK7jk5nwGiwofKoLZqmS75RrWrviuTVysh7kdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197764; 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=oZ8wANPOa7un1fg5KI3bD/XSFMXt8IZjMrk06MmQ8Q8=; b=BcEWHx8pph0K1v5OuM+d05i5akruXLyBnxSaWN53bFI+IfolZ6lJw84I/TJpohb0Db7dHO sDUskb1hKYQ6R7peeE015QjwJI3Pceo/b9TlVLHtIh+cFsSIHSOWeypqr2RWghrZW1On7w IGZXpNbwWPKxy7nHsKvKgCQYcRuVLgh7w0Y03ln3NU2OpIDulZBGTyTUwSxOi40C0ojBbg 2aTWkBJpqXYWenj4QxdsMZ3HwbyI4wsjqB05eiQENgxfYxMD+jP40ijR0GVQ6yX4/HgRBu 6JJ05hQNy+2YvllhYcvF4hUlFHeoJfhhwTqH94o45SyfqyXm8WvcetGYX+yNYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708197764; a=rsa-sha256; cv=none; b=b7czsSShAHndFLVJP/VQbyxpmQ6arUfXHZ4D+i4bAbsGphwoVi08gzqGFK+741PkbhzOS9 3fA8dPSZlaYgvkCPxrxYDVv7n2PEp+FkX7NDe7t/Xsrn6DMiXnYuJCFwGyfmk/psdKYsaZ 90kH58RTHNyNgkRwZ2sIJK3qjTsZnWqSUCBJJ54R61W1KJhbi+P9XxcayM1x+iasXH6pVE /clxnYcYctwk7i2RweySeCH7qWbwJJ/NSq9kjNIsRxwBrXxiSZZmI6hvnPXv3TXPP7YDF6 Gp2K75FbGekR7colm5G1B9fuXBYiuuXNAAu43q22d7CnGgKVa8sHfiSTmWz0dQ== 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 4Tcdx02KVszKvX; Sat, 17 Feb 2024 19:22:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HJMiS8000883; Sat, 17 Feb 2024 19:22:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HJMist000880; Sat, 17 Feb 2024 19:22:44 GMT (envelope-from git) Date: Sat, 17 Feb 2024 19:22:44 GMT Message-Id: <202402171922.41HJMist000880@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 5d24ae53b622 - stable/13 - rdmsr_safe/wrmsr_safe: handle pcb_onfault nesting 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5d24ae53b622507410d6befc5e3b8a7911991175 Auto-Submitted: auto-generated The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=5d24ae53b622507410d6befc5e3b8a7911991175 commit 5d24ae53b622507410d6befc5e3b8a7911991175 Author: Andriy Gapon AuthorDate: 2024-01-30 06:45:01 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 19:22:09 +0000 rdmsr_safe/wrmsr_safe: handle pcb_onfault nesting rdmsr_safe and wrmsr_safe can be called while pcb_onfault is already set, so the functions are modified to preserve the handler rather than resetting it before returning. One case where that happens is when AMD microcode update routine is executed on a stack where copyin / copyout was already active. Here is a sample panic message from a crash caused by resetting the handler: <118>Updating CPU Microcode... Fatal trap 12: page fault while in kernel mode cpuid = 3; apic id = 03 fault virtual address = 0x11ed0de6000 fault code = supervisor write data, page not present instruction pointer = 0x20:0xffffffff80c2df03 stack pointer = 0x28:0xfffffe01ce4a4c70 frame pointer = 0x28:0xfffffe01ce4a4c70 code segment = base 0x0, limit 0xfffff, type 0x1b = DPL 0, pres 1, long 1, def32 0, gran 1 processor eflags = interrupt enabled, resume, IOPL = 0 current process = 117 (logger) trap number = 12 panic: page fault cpuid = 3 time = 1681462027 KDB: stack backtrace: db_trace_self_wrapper() at 0xffffffff80615deb = db_trace_self_wrapper+0x2b/frame 0xfffffe01ce4a4830 kdb_backtrace() at 0xffffffff80943c77 = kdb_backtrace+0x37/frame 0xfffffe01ce4a48e0 vpanic() at 0xffffffff808f5fe5 = vpanic+0x185/frame 0xfffffe01ce4a4940 panic() at 0xffffffff808f5da3 = panic+0x43/frame 0xfffffe01ce4a49a0 trap_fatal() at 0xffffffff80c31849 = trap_fatal+0x379/frame 0xfffffe01ce4a4a00 trap_pfault() at 0xffffffff80c318b5 = trap_pfault+0x65/frame 0xfffffe01ce4a4a60 trap() at 0xffffffff80c30f5f = trap+0x29f/frame 0xfffffe01ce4a4b80 trap_check() at 0xffffffff80c31c29 = trap_check+0x29/frame 0xfffffe01ce4a4ba0 calltrap() at 0xffffffff80c07fd8 = calltrap+0x8/frame 0xfffffe01ce4a4ba0 --- trap 0xc, rip = 0xffffffff80c2df03, rsp = 0xfffffe01ce4a4c70, rbp = 0xfffffe01ce4a4c70 --- copyout_nosmap_std() at 0xffffffff80c2df03 = copyout_nosmap_std+0x63/frame 0xfffffe01ce4a4c70 uiomove_faultflag() at 0xffffffff8095f0d5 = uiomove_faultflag+0xe5/frame 0xfffffe01ce4a4cb0 uiomove() at 0xffffffff8095efeb = uiomove+0xb/frame 0xfffffe01ce4a4cc0 pipe_read() at 0xffffffff80968860 = pipe_read+0x230/frame 0xfffffe01ce4a4d30 dofileread() at 0xffffffff809653cb = dofileread+0x8b/frame 0xfffffe01ce4a4d80 sys_read() at 0xffffffff80964fa0 = sys_read+0xc0/frame 0xfffffe01ce4a4df0 amd64_syscall() at 0xffffffff80c3221a = amd64_syscall+0x18a/frame 0xfffffe01ce4a4f30 fast_syscall_common() at 0xffffffff80c088eb = fast_syscall_common+0xf8/frame 0xfffffe01ce4a4f30 --- syscall (3, FreeBSD ELF64, read), rip = 0x11ece41cfaa, rsp = 0x11ecbec4908, rbp = 0x11ecbec4920 --- Uptime: 41s And another one: Fatal trap 12: page fault while in kernel mode cpuid = 4; apic id = 04 fault virtual address = 0x800a22000 fault code = supervisor write data, page not present instruction pointer = 0x20:0xffffffff80b2c7ca stack pointer = 0x28:0xfffffe01c55b5480 frame pointer = 0x28:0xfffffe01c55b5480 code segment = base 0x0, limit 0xfffff, type 0x1b = DPL 0, pres 1, long 1, def32 0, gran 1 processor eflags = interrupt enabled, resume, IOPL = 0 current process = 68418 (pfctl) trap number = 12 panic: page fault cpuid = 4 time = 1625184463 KDB: stack backtrace: db_trace_self_wrapper() at 0xffffffff805c1e8b = db_trace_self_wrapper+0x2b/frame 0xfffffe01c55b5040 kdb_backtrace() at 0xffffffff808874b7 = kdb_backtrace+0x37/frame 0xfffffe01c55b50f0 vpanic() at 0xffffffff808449d8 = vpanic+0x188/frame 0xfffffe01c55b5150 panic() at 0xffffffff808445f3 = panic+0x43/frame 0xfffffe01c55b51b0 trap_fatal() at 0xffffffff80b300a5 = trap_fatal+0x375/frame 0xfffffe01c55b5210 trap_pfault() at 0xffffffff80b30180 = trap_pfault+0x80/frame 0xfffffe01c55b5280 trap() at 0xffffffff80b2f729 = trap+0x289/frame 0xfffffe01c55b5390 trap_check() at 0xffffffff80b304d9 = trap_check+0x29/frame 0xfffffe01c55b53b0 calltrap() at 0xffffffff80b0bb28 = calltrap+0x8/frame 0xfffffe01c55b53b0 --- trap 0xc, rip = 0xffffffff80b2c7ca, rsp = 0xfffffe01c55b5480, rbp = 0xfffffe01c55b5480 --- copyout_nosmap_std() at 0xffffffff80b2c7ca = copyout_nosmap_std+0x15a/frame 0xfffffe01c55b5480 pfioctl() at 0xffffffff85539358 = pfioctl+0x4d28/frame 0xfffffe01c55b5940 devfs_ioctl() at 0xffffffff807176cf = devfs_ioctl+0xcf/frame 0xfffffe01c55b59a0 VOP_IOCTL_APV() at 0xffffffff80bb26e2 = VOP_IOCTL_APV+0x92/frame 0xfffffe01c55b59c0 VOP_IOCTL() at 0xffffffff80928014 = VOP_IOCTL+0x34/frame 0xfffffe01c55b5a10 vn_ioctl() at 0xffffffff80923330 = vn_ioctl+0xc0/frame 0xfffffe01c55b5b00 devfs_ioctl_f() at 0xffffffff80717bbe = devfs_ioctl_f+0x1e/frame 0xfffffe01c55b5b20 fo_ioctl() at 0xffffffff808abc6b = fo_ioctl+0xb/frame 0xfffffe01c55b5b30 kern_ioctl() at 0xffffffff808abc01 = kern_ioctl+0x1d1/frame 0xfffffe01c55b5b80 sys_ioctl() at 0xffffffff808ab982 = sys_ioctl+0x132/frame 0xfffffe01c55b5c50 syscallenter() at 0xffffffff80b30cc9 = syscallenter+0x159/frame 0xfffffe01c55b5ca0 amd64_syscall() at 0xffffffff80b309a5 = amd64_syscall+0x15/frame 0xfffffe01c55b5d30 fast_syscall_common() at 0xffffffff80b0c44e = fast_syscall_common+0xf8/frame 0xfffffe01c55b5d30 PR: 276426 Reviewed by: kib, markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43639 (cherry picked from commit 486b265a8fb6b2aad37f2819fa04feacf8184d53) --- sys/amd64/amd64/support.S | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S index 936065a78879..dd269138c23f 100644 --- a/sys/amd64/amd64/support.S +++ b/sys/amd64/amd64/support.S @@ -1533,6 +1533,7 @@ ENTRY(rdmsr_safe) /* int rdmsr_safe(u_int msr, uint64_t *data) */ PUSH_FRAME_POINTER movq PCPU(CURPCB),%r8 + movq PCB_ONFAULT(%r8),%r9 movq $msr_onfault,PCB_ONFAULT(%r8) movl %edi,%ecx rdmsr /* Read MSR pointed by %ecx. Returns @@ -1541,8 +1542,8 @@ ENTRY(rdmsr_safe) movl %eax,%eax /* zero-extend %eax -> %rax */ orq %rdx,%rax movq %rax,(%rsi) - xorq %rax,%rax - movq %rax,PCB_ONFAULT(%r8) + movq %r9,PCB_ONFAULT(%r8) + xorl %eax,%eax POP_FRAME_POINTER ret @@ -1554,6 +1555,7 @@ ENTRY(wrmsr_safe) /* int wrmsr_safe(u_int msr, uint64_t data) */ PUSH_FRAME_POINTER movq PCPU(CURPCB),%r8 + movq PCB_ONFAULT(%r8),%r9 movq $msr_onfault,PCB_ONFAULT(%r8) movl %edi,%ecx movl %esi,%eax @@ -1561,8 +1563,8 @@ ENTRY(wrmsr_safe) movl %esi,%edx wrmsr /* Write MSR pointed by %ecx. Accepts hi byte in edx, lo in %eax. */ - xorq %rax,%rax - movq %rax,PCB_ONFAULT(%r8) + movq %r9,PCB_ONFAULT(%r8) + xorl %eax,%eax POP_FRAME_POINTER ret @@ -1571,7 +1573,7 @@ ENTRY(wrmsr_safe) */ ALIGN_TEXT msr_onfault: - movq $0,PCB_ONFAULT(%r8) + movq %r9,PCB_ONFAULT(%r8) movl $EFAULT,%eax POP_FRAME_POINTER ret From nobody Sat Feb 17 19:58:48 2024 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 4Tcfkc2nPPz544Gb; Sat, 17 Feb 2024 19:58:48 +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 4Tcfkc1phFz4Mkt; Sat, 17 Feb 2024 19:58:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708199928; 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=VsmMwZHEhvotY2c/eWnv4omqrQq5RzvzO2DJmP5OOrw=; b=ic+Xc5XGa3h9GKcMyZE1IkXFbPWcouZmq1mlqTdmT9DczZMmLOEPVPrqe0C7dZQZ7vD1Q2 O2H1GIOgzI7+dcLQV5Yicn/whTlVe8wY47YbGa2xjC570fyXbZP8tFjf/G2Xw+Ln3XBONp apHg2NJg0urC/Vh9TwjlVlvXFeNSDn/rfIkGHvRLshp4bL1QgZ0r+x0MzJ7MAN4P4MqF4k 3s2hWKvtr4dIGiQ4MLa9fQG6IeHfSXNasJs0zYHSRHdMw9XSlpUuH315SF5I5u6bfDWmtR UtQxg2MIjZ+O0xX5bgiuFYWe+3Txlk8HfB1mCXYva0PVqVSKmYvvdZiFnT5lMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708199928; 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=VsmMwZHEhvotY2c/eWnv4omqrQq5RzvzO2DJmP5OOrw=; b=lzCtwwcfW1wulQvJqDpslkbN0D0FBb5ZM40Be9VkMmXzOiAPntxVAq6xRWf4MGAZ8lXQL4 QYK4MdCO4CrjRrTA2+xRlU1Q+y8syHajI1YPduSAQjum2dqdSdSeDjXEBllapfXKSacksl pImgTk1Ui+gLJQ0vnMdW3ZiBJJagq6J+tMb6Rl41xn0DQLmras3uiL2ZaOpXM03xNj40MZ 06rEKEYHhdvcMmEE4TnBrgqA3fLnX/X8dweKokOM+TohyxUWPXyrPfkaMpTJ6jnCSb/nZl CBdS+0COLvT8av70Ld/AZfXHezlHxgTra2EGT33MfRfyXa0AtDXieq9PHmWigg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708199928; a=rsa-sha256; cv=none; b=CBsJsKEo1v9h5DXGP4JsrqOfJTRbA7HaYUiSUGxMpTB/b4tiDxRp2JTRm3+IsWL0nlH/2m KB8XyxhFHW88OsZhjgfhMjKhBQDaHGGw1XGo2u7vO7275rnTil18DT7k3jgS1zsVTf7FNc dk9xUXeYVNKCbruSzv6yhtEbZpbdt1rN0VpbSZCC07JFzBBzdwJHXtfwbos97zupJScAht llQ8iBhbbu8dU9oUuPRV9+b/zD02oqqNGpfP/WOTUfq4YPln7YNZntcy7XgbVLQChafjdy c4RQngNpRT8JFZU5+WiTPcCKnvSWdBPJcbZoFrXrq65wTtLedZOvrqb3/MStvQ== 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 4Tcfkc0sndzM5G; Sat, 17 Feb 2024 19:58:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HJwmmM051442; Sat, 17 Feb 2024 19:58:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HJwmGw051438; Sat, 17 Feb 2024 19:58:48 GMT (envelope-from git) Date: Sat, 17 Feb 2024 19:58:48 GMT Message-Id: <202402171958.41HJwmGw051438@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 854db1db3f81 - stable/13 - run acpi_shutdown_final later to give other handlers a chance 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 854db1db3f81f5b840e7f238f627bc584224b311 Auto-Submitted: auto-generated The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=854db1db3f81f5b840e7f238f627bc584224b311 commit 854db1db3f81f5b840e7f238f627bc584224b311 Author: Andriy Gapon AuthorDate: 2021-12-20 11:01:56 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 19:58:10 +0000 run acpi_shutdown_final later to give other handlers a chance For example, shutdown_panic wants to produce some output and maybe take some input before a system is actually reset. The change should only make difference for the case of system reset (reboot), poweroff and halt should not be affected. The change makes difference only if hw.acpi.handle_reboot is set. It used to default to zero until r213755 / ac731af5670c7. Also, run shutdown_halt even later, after acpi_shutdown_final. The reason for that is that poweroff is requested by RB_POWEROFF | RB_HALT combination of flags. In my opinion, that command is a bit bipolar, but since we've been doing that forever, then so be it. Because of that flag combination, the order of shutdown_final handlers that check for either flag does matter. Some additional complexity comes from platform-specific shutdown_final handlers that aim to handle multiple reboot options at once. E.g., acpi_shutdown_final handles both poweroff and reboot / reset. As explained in 9cdf326b4f, such a handler must run after shutdown_panic to give it a chance. But as the change revealed, the handler must also run before shutdown_halt, so that the system can actually power off before entering the halt limbo. Previously, shutdown_panic and shutdown_halt had the same priority which appears to be incompatible with handlers that can do both poweroff and reset. The above also applies to power cycle handlers. (cherry picked from commit 9cdf326b4faef97f0d3314b5dd693308ac494d48) (cherry picked from commit e4ab361e53945a6c3e9d68c5e5ffc11de40a35f2) --- sys/dev/acpica/acpi.c | 2 +- sys/kern/kern_shutdown.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index fbb3c2bc7c1c..cd390ada512c 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -673,7 +673,7 @@ acpi_attach(device_t dev) /* Register our shutdown handler. */ EVENTHANDLER_REGISTER(shutdown_final, acpi_shutdown_final, sc, - SHUTDOWN_PRI_LAST); + SHUTDOWN_PRI_LAST + 150); /* * Register our acpi event handlers. diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index 4e582d8c8bfa..4e168df25301 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -259,10 +259,10 @@ shutdown_conf(void *unused) EVENTHANDLER_REGISTER(shutdown_final, poweroff_wait, NULL, SHUTDOWN_PRI_FIRST); - EVENTHANDLER_REGISTER(shutdown_final, shutdown_halt, NULL, - SHUTDOWN_PRI_LAST + 100); EVENTHANDLER_REGISTER(shutdown_final, shutdown_panic, NULL, SHUTDOWN_PRI_LAST + 100); + EVENTHANDLER_REGISTER(shutdown_final, shutdown_halt, NULL, + SHUTDOWN_PRI_LAST + 200); } SYSINIT(shutdown_conf, SI_SUB_INTRINSIC, SI_ORDER_ANY, shutdown_conf, NULL); From nobody Sat Feb 17 20:30:46 2024 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 4TcgRV4XTHz59ZrY; Sat, 17 Feb 2024 20:30:46 +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 4TcgRV45y8z4RQK; Sat, 17 Feb 2024 20:30:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708201846; 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=7DgsvbSTrq/LSAXNDHXkjzFrP2EREj6jPy0EsINZrL0=; b=Fv7oX61J8bI7e5cbVmWqfQAD3xPelT6kdjeb83SVVHIoza0KLI6cz/1Bz4oSKb9YDAv3Pl hdz2uz2NNjCRevYVKrYeDZt/nrq9zS2VQNvrkkqwqdNsakaGo1ojfFDQgFwGwR8x4C03uY SKaYt2tO3723xtcOQk1vqgWDwXCRx5aQRrf2qi8wHRxvDu+iNlF6qjJC3tmsyVXQzw8SFZ jbMqTkNSQZ34ZHKWV0B0/Qj4WtDYxX+xtEUfHJrOqgoALdGXQqGy8Admi6b8EPCGVuyHd4 Pn58jIYvQ91dJtRd9W47N31okIoVMT2GVYk5wjEjboOkYQVTkGpgcvgarIBnpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708201846; 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=7DgsvbSTrq/LSAXNDHXkjzFrP2EREj6jPy0EsINZrL0=; b=jgbpAOi6u8OtM+cYj9DB+7PEPuSSUQrjGREmxFG5Xgkvh7uvobdXDl8JufrTcf3pmc1e2Q cZScKHwEHanpzG1O1p637QF52kZNmWDdUA79GYlPH9F0tptW6NGvNzdEW8Z28IvhhBjTFj uM04vdKMcf/i+yQB/WJaehykh82cVcrTHMUwUo9AXZ3sHImLKlZex71yR+hkFAI+on8bJk yq4abC2AXCobjvQyvR5m1s2Vbg8UzTe8EvgMISNVg77iZl0OZ0qJ++/LcjU+7HwWwLe1gf miWWrmRapxjCJNSugZkYmL+GCR4zZ0O0qE6qijZG4jkco5Lr3C6+njLPDPS9sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708201846; a=rsa-sha256; cv=none; b=gKmCshl93WrnoVFWZxL4UA73oOYqAjuB51NdDwECRq7xmNl7V65XykEeaKSon9KHlxLPQh yU7iB3G/IzFqetGB3bTfX/b21QrVMDsiH3NLXNE5hppLLeJW/+oUrVFKQo3e0i3i1pX1rp Z4Cm0tBqxWM8zcvvVRT2pwSA0Z4nZRME1QVHdtVE63+Vz3eKwpWdy7ykyOGlTJZPqEJPua D5ct158jAH6shICsnkGTL4DdD+tRu7PxQX6RAe4g9XKpIvVEHNFzATP/846v1xklbS+wE9 LG3LpsLiVBYReTNoBFlf/YpQ1tZULOUovr0w6i3njnX33ay+E6cjzxSL06XQqw== 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 4TcgRV39WhzM4k; Sat, 17 Feb 2024 20:30:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HKUk8j013281; Sat, 17 Feb 2024 20:30:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HKUkDS013278; Sat, 17 Feb 2024 20:30:46 GMT (envelope-from git) Date: Sat, 17 Feb 2024 20:30:46 GMT Message-Id: <202402172030.41HKUkDS013278@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: adac86cd7be0 - stable/14 - if_eqos: Fix a typo in a kernel error message 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: adac86cd7be0347e8337ec32d81043e544c0a72b Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=adac86cd7be0347e8337ec32d81043e544c0a72b commit adac86cd7be0347e8337ec32d81043e544c0a72b Author: Gordon Bergling AuthorDate: 2024-01-28 15:42:12 +0000 Commit: Gordon Bergling CommitDate: 2024-02-17 20:30:23 +0000 if_eqos: Fix a typo in a kernel error message - s/errer/error/ (cherry picked from commit 551921a757758353af51cd0283e9e4bcee9a84d2) --- sys/dev/eqos/if_eqos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/eqos/if_eqos.c b/sys/dev/eqos/if_eqos.c index d969c019a9a5..3ee406f26def 100644 --- a/sys/dev/eqos/if_eqos.c +++ b/sys/dev/eqos/if_eqos.c @@ -687,7 +687,7 @@ eqos_rxintr(struct eqos_softc *sc) break; if (rdes3 & (EQOS_RDES3_OE | EQOS_RDES3_RE)) - printf("Receive errer rdes3=%08x\n", rdes3); + printf("Receive error rdes3=%08x\n", rdes3); bus_dmamap_sync(sc->rx.buf_tag, sc->rx.buf_map[sc->rx.head].map, BUS_DMASYNC_POSTREAD); From nobody Sat Feb 17 21:32:27 2024 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 4Tchpg6Lnmz59kwK; Sat, 17 Feb 2024 21:32:27 +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 4Tchpg5wLJz4g87; Sat, 17 Feb 2024 21:32:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205547; 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=ZSoQnVjL/BAr8yrsCAXq2dIE1XQpI6mE2el1n6avOlY=; b=Atotfb6nVm6ro2cFUP7sNZF6TomC3SVEpeiTlFnExadRKr1FLA9pgyRst72j4ulIOXb1Xf I50weBSH0Vvng9zMipQ4SHtKyJmqo6cgm81yAcP8kxlhSSTsuYuzn17eBAg4zalZtkFzmd UjPMGt4Szy6TTwIZDPoh70VS1ITAFdU8QHUzKfmD9t7lZNK4F3bwc8mJ2A9ZTPFVVw0jez aX2bD8QcPxG+t99BWFpJsDdiDBc8CV0wSGODw0a0ytKoIs6wWuMn+3KrBNTC2GGLioQCqw dfBhZxx7bRrZ+gVC4N0z3EBrW5kBm0TVnmG4UQ8vvSpYr5SRpVw0+m/XFmVjdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205547; 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=ZSoQnVjL/BAr8yrsCAXq2dIE1XQpI6mE2el1n6avOlY=; b=m3jWZpLJMvQ5xoZUNLYOKpViAgZDSH3uME6jOxZ6zIqmAq5zZhZxntIaH2UPNp9119fW3d wLIQjLH42HfRrsR8iHUNfsMxh4hk0sDF5E9AWNcDI/+PKpiA9uT6a+PD8UAykREliw0gm0 vT6G7QwpyNjefS8qPsbaVTgPDNjT0Qf8omMRLIk2QnLSPaG/kRKp1rT2B3tjX6c5XROrk5 H6LS2/0kcyLtSPzq+GRNkDIjNZfttYLQJQvkKL+rHIOmUczNet7rjsTL7W1J6Y64jyu5uv eoRpeMIpiOh0sUdemKRCzPPetde4rtS9+qX9PbSWMCR2SbAFJdLTtPgyrktvJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708205547; a=rsa-sha256; cv=none; b=NYvUyv3sDOYDnr5y83U1DO8SdGDhXRbPdAqcERNQQpJxPV56SZu2remAFGDZ0N5rvA1FXx HdsTGFdqgf0KKc8u8JEQaIFxhdGbLhgasPW2RSiTJzXxwF9m6Dkwpw7aS5uKdt/3ryWGlq nb76R39FWDPyB1RW8+4VAqJZgoexcoYX6crd1XBIEW5nB4rKsEt6lctDcT8JFPfoIFYLLE VeNI5bLwckjYcUZqzWmJZLT9V+71iBdtxSSy5aO6mO2gBSMd25fyghTJbFV0PNVbCMyH9I BtV8Sxx2+4mGsiiP/LdWHDia1KAZcXJhbcPna7eLZ1TkkSKZhIoB//+LDuiD0w== 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 4Tchpg4z2jzPM8; Sat, 17 Feb 2024 21:32:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HLWREs019443; Sat, 17 Feb 2024 21:32:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HLWRsS019440; Sat, 17 Feb 2024 21:32:27 GMT (envelope-from git) Date: Sat, 17 Feb 2024 21:32:27 GMT Message-Id: <202402172132.41HLWRsS019440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: bb01efa6f87a - stable/14 - linuxkpi: Fix uses of `pmap_change_attr()` 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bb01efa6f87a8588f0190fe778f2376736c93acc Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=bb01efa6f87a8588f0190fe778f2376736c93acc commit bb01efa6f87a8588f0190fe778f2376736c93acc Author: Jean-Sébastien Pédron AuthorDate: 2023-08-16 20:32:42 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-02-17 20:58:34 +0000 linuxkpi: Fix uses of `pmap_change_attr()` [Why] This function takes an offset and a length as argument, not a physical address and a number of pages. This misuse caused the `set_memory_*()` and `arch_io_reserve_memtype_wc()` functions to return EINVAL. Another problem was the fact that they returned errors as a positive integer, whereas Linux uses negative integers. [How] Physical addresses and number of pages are converted to offset+length in the `set_memory_*()` functions. `arch_io_reserve_memtype_wc()` now calls `pmap_change_attr()` directly instead of using `set_memory_wc()`. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D42053 (cherry picked from commit 1e99b2ee90956f275c3668e92a408400f2dada1c) --- .../linuxkpi/common/include/asm/set_memory.h | 24 +++++++++++++++++++--- sys/compat/linuxkpi/common/include/linux/io.h | 15 ++++++++++++-- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/asm/set_memory.h b/sys/compat/linuxkpi/common/include/asm/set_memory.h index ae50148f0314..69f659001c60 100644 --- a/sys/compat/linuxkpi/common/include/asm/set_memory.h +++ b/sys/compat/linuxkpi/common/include/asm/set_memory.h @@ -34,14 +34,26 @@ static inline int set_memory_uc(unsigned long addr, int numpages) { - return (pmap_change_attr(addr, numpages, VM_MEMATTR_UNCACHEABLE)); + vm_offset_t va; + vm_size_t len; + + va = PHYS_TO_DMAP(addr); + len = numpages << PAGE_SHIFT; + + return (-pmap_change_attr(va, len, VM_MEMATTR_UNCACHEABLE)); } static inline int set_memory_wc(unsigned long addr, int numpages) { #ifdef VM_MEMATTR_WRITE_COMBINING - return (pmap_change_attr(addr, numpages, VM_MEMATTR_WRITE_COMBINING)); + vm_offset_t va; + vm_size_t len; + + va = PHYS_TO_DMAP(addr); + len = numpages << PAGE_SHIFT; + + return (-pmap_change_attr(va, len, VM_MEMATTR_WRITE_COMBINING)); #else return (set_memory_uc(addr, numpages)); #endif @@ -50,7 +62,13 @@ set_memory_wc(unsigned long addr, int numpages) static inline int set_memory_wb(unsigned long addr, int numpages) { - return (pmap_change_attr(addr, numpages, VM_MEMATTR_WRITE_BACK)); + vm_offset_t va; + vm_size_t len; + + va = PHYS_TO_DMAP(addr); + len = numpages << PAGE_SHIFT; + + return (-pmap_change_attr(va, len, VM_MEMATTR_WRITE_BACK)); } static inline int diff --git a/sys/compat/linuxkpi/common/include/linux/io.h b/sys/compat/linuxkpi/common/include/linux/io.h index ee46d354a5ae..2345967898e6 100644 --- a/sys/compat/linuxkpi/common/include/linux/io.h +++ b/sys/compat/linuxkpi/common/include/linux/io.h @@ -532,14 +532,25 @@ void lkpi_arch_phys_wc_del(int); static inline int arch_io_reserve_memtype_wc(resource_size_t start, resource_size_t size) { + vm_offset_t va; - return (set_memory_wc(start, size >> PAGE_SHIFT)); + va = PHYS_TO_DMAP(start); + +#ifdef VM_MEMATTR_WRITE_COMBINING + return (-pmap_change_attr(va, size, VM_MEMATTR_WRITE_COMBINING)); +#else + return (-pmap_change_attr(va, size, VM_MEMATTR_UNCACHEABLE)); +#endif } static inline void arch_io_free_memtype_wc(resource_size_t start, resource_size_t size) { - set_memory_wb(start, size >> PAGE_SHIFT); + vm_offset_t va; + + va = PHYS_TO_DMAP(start); + + pmap_change_attr(va, size, VM_MEMATTR_WRITE_BACK); } #endif From nobody Sat Feb 17 21:32:28 2024 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 4Tchpj1Lz9z59kcj; Sat, 17 Feb 2024 21:32:29 +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 4Tchph6lXKz4gK6; Sat, 17 Feb 2024 21:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205549; 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=II6awvwuD6OTco1iXJ3QKXfCprPJqoSpFAZyRXHTA+4=; b=ndAMxkv6uRdXOmfCYjpIVV00aY29Px3wsWmmXOX7N4ImLI9qzWtAS5qi8SXUuLS9Y0Takf u2z6wCWRfNOmyFUQChANxjaETZ6WxiwOd2/XKb65cUyD5TuRZNhFyF+I5iWjwoD2trs0dW OdVfeAqBDsOaITpKio3MYrCRsGw2WGt6xRlpOE0yrkXUysvpYYZdU7cb9IVg2DK7wRjF7t aYU7byZnahzyBYpzQ22Xu7ZdeMTbzZrqviT1NS5FDcL20KHjdkgdQ3/VhMlhooBvAWNxr3 dX6OM9ck2bN5pMgusI5yzzd626u/g6yzo+ASwh/7b3y4ujrE5Oq5sbDobWT9CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205548; 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=II6awvwuD6OTco1iXJ3QKXfCprPJqoSpFAZyRXHTA+4=; b=uiH9eR6MxmFuPYL5OiNu96TbP4bL3kP3ZSor37n0jSua9x5JxDlg+NUcmw0YoFptGNbn7S Tmcefcg/om663nyWtZkw8KGIJMFHvYzTzmWWqF+HpeTOHRXCdZzyNVAFPIx6m7cSoUrAji NyhNj/zzEHtxc9EF0q0mGJH1IbZmlSPosg9ubPox7XGMNnx3jJ1XX2aqrM3URou5E2r6hT 8Jf5e1Fb92OW+7ZA3tQ22bQe1Nqh8RolLWk26jxwyfRjWcYMlNcOy99F4vl/A/WcEWoWVq 7p0Sgu2NFeABXDQDcYnIqOreJXm7H3GR+9P6NkWehQpu0ApoT99rtxd+UGCYbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708205548; a=rsa-sha256; cv=none; b=CepPEWxccQhUctMAkbvbwTmdoiN9kq8FAMI3VgGY/j/goUU78dllLVoRc96n9bJeFYXjn/ UVchyJ0gCVb57azps/C8b3ptP3LaX0Mzf7zsDyMYnwlTuBeqTKWsiw6WXJ4azE2hjCC4n1 YWjBr4ttNtDmqEoZiQRcAn032DZVbmNkkBjq1dhDjAmUK9A+jY9/ZwUi6V1oOPtN69gqup jlpnanLG/cjwEzNve2OA5l/BXJkAkaPDZKdqZ5E7eQXVSO4y+HPfeeXA3u5AcuINEgceha udEO7S1CvYeonnXOr2mCHntostqe0RmIXQjHu1N8w52UPAm0SVZR+fWz2kqHEQ== 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 4Tchph5s2FzPb8; Sat, 17 Feb 2024 21:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HLWSNg019488; Sat, 17 Feb 2024 21:32:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HLWSLQ019485; Sat, 17 Feb 2024 21:32:28 GMT (envelope-from git) Date: Sat, 17 Feb 2024 21:32:28 GMT Message-Id: <202402172132.41HLWSLQ019485@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 608b14876011 - stable/14 - vt(4): Skip vt_flush() for nested panics 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 608b1487601177817c27d9dbeec920cdb3a85fb7 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=608b1487601177817c27d9dbeec920cdb3a85fb7 commit 608b1487601177817c27d9dbeec920cdb3a85fb7 Author: Jean-Sébastien Pédron AuthorDate: 2023-11-24 17:30:33 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-02-17 20:58:34 +0000 vt(4): Skip vt_flush() for nested panics [Why] If there is a problem with DRM drivers or in their integration with vt(4) and displaying something on the console triggers a panic, there is a high chance that displaying that panic will trigger another one, recursively. [How] If vt_flush() is called and it detects is is called resursively from another panic, it return immediately, doing nothing, to avoid the risk of triggering another panic. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D42056 (cherry picked from commit 049e3fba04e82f840cc43080edade0ed415fee72) --- sys/dev/vt/vt_core.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index c97cb80ca3f1..406472a8fbf6 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -274,6 +274,8 @@ SYSINIT(vt_update_static, SI_SUB_KMEM, SI_ORDER_ANY, vt_update_static, SYSINIT(vt_early_cons, SI_SUB_INT_CONFIG_HOOKS, SI_ORDER_ANY, vt_upgrade, &vt_consdev); +static bool inside_vt_flush = false; + /* Initialize locks/mem depended members. */ static void vt_update_static(void *dummy) @@ -1344,6 +1346,9 @@ vt_flush(struct vt_device *vd) int cursor_was_shown, cursor_moved; #endif + if (inside_vt_flush && KERNEL_PANICKED()) + return (0); + vw = vd->vd_curwindow; if (vw == NULL) return (0); @@ -1357,6 +1362,8 @@ vt_flush(struct vt_device *vd) vtbuf_lock(&vw->vw_buf); + inside_vt_flush = true; + #ifndef SC_NO_CUTPASTE cursor_was_shown = vd->vd_mshown; cursor_moved = (vd->vd_mx != vd->vd_mx_drawn || @@ -1414,10 +1421,12 @@ vt_flush(struct vt_device *vd) if (tarea.tr_begin.tp_col < tarea.tr_end.tp_col) { vd->vd_driver->vd_bitblt_text(vd, vw, &tarea); + inside_vt_flush = false; vtbuf_unlock(&vw->vw_buf); return (1); } + inside_vt_flush = false; vtbuf_unlock(&vw->vw_buf); return (0); } @@ -1444,6 +1453,9 @@ vtterm_pre_input(struct terminal *tm) { struct vt_window *vw = tm->tm_softc; + if (inside_vt_flush && KERNEL_PANICKED()) + return; + vtbuf_lock(&vw->vw_buf); } @@ -1452,6 +1464,9 @@ vtterm_post_input(struct terminal *tm) { struct vt_window *vw = tm->tm_softc; + if (inside_vt_flush && KERNEL_PANICKED()) + return; + vtbuf_unlock(&vw->vw_buf); vt_resume_flush_timer(vw, 0); } From nobody Sat Feb 17 21:32:29 2024 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 4Tchpk3rHBz59lBV; Sat, 17 Feb 2024 21:32: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 4Tchpk0jBnz4gbJ; Sat, 17 Feb 2024 21:32:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205550; 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=j017KCGGDo4vwnu8dq7CQyvDGK5glM6tvoASvTqTUkI=; b=pc+MzzRh9LIs6gV3bRQnebMqYb0Kr76jLfmZg2abqJcE05QfMKtU5svrv+LrEg6lUExj1i sX1wU2N9TrER+Fvr61Z5+cEF64CbHP3av8LCtYIkbHO511JQykvnjkQoJk7UaeLc6QcC2y QLWiLZNqrhp4XyG/1dRemrFBDVzHGRNrEyVOJO7ZPYqVch+U4234yY1obdH4yKlu+vU3NF 3e68XpT85nm5JGqXcouPsH/jQI3wta1XWTb7k6qR3YRq/y2aWQEmuxUubNH0Ue07TzbRpf +8AUaQWvEnruEY44Q69YmQQFxZYhMdbiQD9/lw1U1aIXvtp7/JXIv1soSs6avQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205550; 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=j017KCGGDo4vwnu8dq7CQyvDGK5glM6tvoASvTqTUkI=; b=b9yfxqSgdMK6wjZrJ9QtlXOeqRlZkdxaoboMiBOKTwRQkUYQvFWBluX0BQz80JMKCZ2N0j PhZMijIx3CxjqcaGYSiNIKGHBYjnCww5cpUETaw0Ie7IBAcnlvS540qyPzoDru+Ka8iD/z dL9R44bquZ7WIMkcEL2LGe2miDse+SQguPQf7AtNU4O6Ml9e3WUY/skaY+moifkSR3hoH9 xK7deDOMz+kq0KlX3P7vw/a+ApRo2STuT5FJdq75ti+Ya3xkX81hfqk515PiS0UVAxbzbQ udJltS47ww3ANzq8buwbfW7Zu/9bjbG/9lxen7/+SF5h4GQ5Ur/1MLe7wbfkyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708205550; a=rsa-sha256; cv=none; b=inLHQJQ5BS3S+Ks1Sby5t3QhmgONGc4MzNMoGgEk5ZOD/iZTdMAT4jwaWhg78eyHXltCdj sy9WSORahyxDRIPc+9ziDdDTJHfL5kz3CqggHdJoykcrIhbvBkb20Q9PVqax6C6R7gvWfg Q5T7voSQAF5xYC8xbNI12Jv0KSGaZxvs+LCjiyRg9nGZ6U6Lleqn46alCrPkzuE3XtWtnA jxMtDnk976zSUku5fa4gK939v3fGIrJWXzVzsszQaT4Q6haAOKKv3F7O6gRGfUK05jlzNr /o40Slc/2Rc2tGkOCUKS7nFqUJ3586LV8L6QBXXQVXvHUUIPHHXOXr0kSWaz+g== 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 4Tchpj6sVTzPb9; Sat, 17 Feb 2024 21:32:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HLWTZp019533; Sat, 17 Feb 2024 21:32:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HLWTNY019530; Sat, 17 Feb 2024 21:32:29 GMT (envelope-from git) Date: Sat, 17 Feb 2024 21:32:29 GMT Message-Id: <202402172132.41HLWTNY019530@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 95007bfd64c6 - stable/14 - vt(4): Skip vt_window_switch() for nested panics 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 95007bfd64c63f217c97210cd4cdf2d729f2f696 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=95007bfd64c63f217c97210cd4cdf2d729f2f696 commit 95007bfd64c63f217c97210cd4cdf2d729f2f696 Author: Jean-Sébastien Pédron AuthorDate: 2023-11-24 17:30:33 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-02-17 20:58:34 +0000 vt(4): Skip vt_window_switch() for nested panics [Why] The same protection was added to vt_flush() in the previous commit. We want the same one in vt_window_switch(): if e.g. the DRM driver panics while handling a call to vt_window_switch(), we don't want to recursively call vt_window_switch() again and trigger another panic. Reviewed by: imp, manu Approved by: imp, manu Differential Revision: https://reviews.freebsd.org/D42750 (cherry picked from commit 24d6f256f825e5d7f8ca6b5d16499f13614f9cdd) --- sys/dev/vt/vt_core.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index 406472a8fbf6..6d44c81181a3 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -275,6 +275,7 @@ SYSINIT(vt_early_cons, SI_SUB_INT_CONFIG_HOOKS, SI_ORDER_ANY, vt_upgrade, &vt_consdev); static bool inside_vt_flush = false; +static bool inside_vt_window_switch = false; /* Initialize locks/mem depended members. */ static void @@ -564,6 +565,11 @@ vt_window_switch(struct vt_window *vw) struct vt_window *curvw = vd->vd_curwindow; keyboard_t *kbd; + if (inside_vt_window_switch && KERNEL_PANICKED()) + return (0); + + inside_vt_window_switch = true; + if (kdb_active) { /* * When grabbing the console for the debugger, avoid @@ -575,13 +581,16 @@ vt_window_switch(struct vt_window *vw) */ if (curvw == vw) return (0); - if (!(vw->vw_flags & (VWF_OPENED|VWF_CONSOLE))) + if (!(vw->vw_flags & (VWF_OPENED|VWF_CONSOLE))) { + inside_vt_window_switch = false; return (EINVAL); + } vd->vd_curwindow = vw; vd->vd_flags |= VDF_INVALID; if (vd->vd_driver->vd_postswitch) vd->vd_driver->vd_postswitch(vd); + inside_vt_window_switch = false; return (0); } @@ -595,10 +604,12 @@ vt_window_switch(struct vt_window *vw) if ((kdb_active || KERNEL_PANICKED()) && vd->vd_driver->vd_postswitch) vd->vd_driver->vd_postswitch(vd); + inside_vt_window_switch = false; VT_UNLOCK(vd); return (0); } if (!(vw->vw_flags & (VWF_OPENED|VWF_CONSOLE))) { + inside_vt_window_switch = false; VT_UNLOCK(vd); return (EINVAL); } @@ -627,6 +638,7 @@ vt_window_switch(struct vt_window *vw) mtx_unlock(&Giant); DPRINTF(10, "%s(ttyv%d) done\n", __func__, vw->vw_number); + inside_vt_window_switch = false; return (0); } From nobody Sat Feb 17 21:32:30 2024 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 4Tchpl3MJRz59kyx; Sat, 17 Feb 2024 21:32:31 +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 4Tchpl1WnRz4gV3; Sat, 17 Feb 2024 21:32:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205551; 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=cS6MWyH6ZQVXMtW8bmhSTnOgmkRSGmMi/OKgr+UunF4=; b=RkQj64V26KXrZlDoCOU7lQv2da7VeImhDImweIz7Mtm0+OjfPcqyQvD/lguvyYizRqWa7L jmGcAW17NJzmhPmpDoLxaYnxH83wp7xO85GSCsC/NxLY7wE/u41R/Z2trlVNABRTh9xmKw WAQeCXZFDAQ2zsTBflZ6ZXaoSgftI7rOSlQbIG/Hj6E819VkfVszFqXz/m2jFMoO3lYLI6 fgRn6Od73bZhPZyzQ/UjNJiYns+BSzJoQZT2gb/H8LL7N6LrSWl1vnkR+BQw5XVgQtsJTd TZ1odx+qGGQp2OeXz2RMYOyhmer9Wg9Brd0lLaJTFUQADlpZ9A+NXqLgogc0Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205551; 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=cS6MWyH6ZQVXMtW8bmhSTnOgmkRSGmMi/OKgr+UunF4=; b=Ro76UuCWqvqBCwT4mB3cN/f5mOYcYMmN3d/a8Ix4JK1UaGjcpC/dNlGai4bazZoAAnETnf SZrqdKcDL4wfYIUvK0mGhJoQiQb+gxMJNq70Hk8x0I13DfNzK39ytzvrrvFOLwUYSOwATf aezQPgzTNMnKHJK1SdIav7YvbAZ91sx28VXxpHHj3xFsVryR5P7b7hAyWJbOUy3tDg77fD u9jx5YPoq+WPVp6bYYxYiVHS4ydkBsuy4AthKCnK66FfvxveP68Tx+bIKr6tGE+aK3yWW7 QxDF+ByXkzyQf9qVi88ZNoOEkZtotmS2yuy8eP8WVXI+1/CURCKjj+ZHTBj8dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708205551; a=rsa-sha256; cv=none; b=MdcAufJ8mTDpAKNIwpNKzYkkFvtvVTYoRA33tW2VItTQ0BpfY/6HlH4nxeJVxZcHixrLq0 V9bS8hPA7cVPpmt4FzcA9JJn1FQ6mnbAac3EqqZtjdJJGbZYP//Cr/3mM2g4bMlGOixkBP 5qA78tFMOQzWP8ByevVH221zEDnDwRZhU+QDmPnVnWahQ8MbQ5R6vPXlKmswwwfh2vQNKv Ff2LKUpuSm72HOFUGwxIF+U4HKFrP4gj/ZU/vwQxtGhakDQrgwK82kJIqCUGD0N8Qyoie3 Llz0flnoBMbIsdbr9zqN+OckN2V+8E3SrXHmxT1BiJ1LrPT2/8Kv68LCqG94/Q== 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 4Tchpl0X8WzP9M; Sat, 17 Feb 2024 21:32:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HLWUQC019597; Sat, 17 Feb 2024 21:32:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HLWUDq019594; Sat, 17 Feb 2024 21:32:30 GMT (envelope-from git) Date: Sat, 17 Feb 2024 21:32:30 GMT Message-Id: <202402172132.41HLWUDq019594@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 6b9da4e86ed9 - stable/14 - vt(4): New bitblt_text variant making a copy before unlocking vt_buf 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6b9da4e86ed961f297040bb9a5355e6c941f161b Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=6b9da4e86ed961f297040bb9a5355e6c941f161b commit 6b9da4e86ed961f297040bb9a5355e6c941f161b Author: Jean-Sébastien Pédron AuthorDate: 2023-11-24 17:30:34 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-02-17 20:58:34 +0000 vt(4): New bitblt_text variant making a copy before unlocking vt_buf [Why] In the DRM drivers and the integration with vt(4), we need to execute DRM code outside of the vtbuf_lock. The reason is that this DRM code acquires locks which can't be acquired when vtbuf_lock, an MTX_SPIN mutex, is already held. [How] A vt(4) backend can now set the `vd_bitblt_after_vtbuf_unlock` flag to true if it wants to be called outside of vt_buf_lock. In this case, vt(4) uses an internal version of bitblt_text that uses the `vd_drawn` arrays, plus a new `vd_pos_to_flush` array, to track characters to draw/refresh. This internal version then uses the backend's bitblt_bmp callback to draw the characters after vt_buf has been unlocked. Drawing borders and CPU logos is also deferred after the vt_buf lock is released for the same reason. We introduce another lock (a default mutex), only used when the `vd_bitblt_after_vtbuf_unlock` flag is set, to replace part the role of the vt_buf lock and manage concurrent calls to vt_flush(). The `SC_NO_CONSDRAWN` define is dropped because we now always need the `vd_drawn` arrays. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D42057 (cherry picked from commit 162a2b858854656ddd6b75d290be8a640ba8f324) --- sys/dev/vt/vt.h | 19 ++++++ sys/dev/vt/vt_core.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 185 insertions(+), 14 deletions(-) diff --git a/sys/dev/vt/vt.h b/sys/dev/vt/vt.h index a21ecea999ec..56a28c0420c7 100644 --- a/sys/dev/vt/vt.h +++ b/sys/dev/vt/vt.h @@ -165,6 +165,9 @@ struct vt_device { term_char_t *vd_drawn; /* (?) Most recent char drawn. */ term_color_t *vd_drawnfg; /* (?) Most recent fg color drawn. */ term_color_t *vd_drawnbg; /* (?) Most recent bg color drawn. */ + + struct mtx vd_flush_lock; /* (?) vt_flush() lock. */ + bool *vd_pos_to_flush;/* (?) Positions to flush. */ }; #define VD_PASTEBUF(vd) ((vd)->vd_pastebuf.vpb_buf) @@ -175,6 +178,14 @@ struct vt_device { #define VT_UNLOCK(vd) mtx_unlock(&(vd)->vd_lock) #define VT_LOCK_ASSERT(vd, what) mtx_assert(&(vd)->vd_lock, what) +#define VT_FLUSH_LOCK(vd) \ + if ((vd)->vd_driver->vd_bitblt_after_vtbuf_unlock) \ + mtx_lock(&(vd)->vd_flush_lock) + +#define VT_FLUSH_UNLOCK(vd) \ + if ((vd)->vd_driver->vd_bitblt_after_vtbuf_unlock) \ + mtx_unlock(&(vd)->vd_flush_lock) + void vt_resume(struct vt_device *vd); void vt_resume_flush_timer(struct vt_window *vw, int ms); void vt_suspend(struct vt_device *vd); @@ -376,6 +387,14 @@ struct vt_driver { #define VD_PRIORITY_DUMB 10 #define VD_PRIORITY_GENERIC 100 #define VD_PRIORITY_SPECIFIC 1000 + + /* + * Should vd_bitblt_text() be called after unlocking vtbuf? If true, + * characters are copied before vd_bitblt_bmp() is called. + * + * This is only valid when the default bitblt_text callback is used. + */ + bool vd_bitblt_after_vtbuf_unlock; }; /* diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index 6d44c81181a3..3e4db9a1ba30 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -202,11 +202,10 @@ SET_DECLARE(vt_drv_set, struct vt_driver); static struct terminal vt_consterm; static struct vt_window vt_conswindow; -#ifndef SC_NO_CONSDRAWN static term_char_t vt_consdrawn[PIXEL_HEIGHT(VT_FB_MAX_HEIGHT) * PIXEL_WIDTH(VT_FB_MAX_WIDTH)]; static term_color_t vt_consdrawnfg[PIXEL_HEIGHT(VT_FB_MAX_HEIGHT) * PIXEL_WIDTH(VT_FB_MAX_WIDTH)]; static term_color_t vt_consdrawnbg[PIXEL_HEIGHT(VT_FB_MAX_HEIGHT) * PIXEL_WIDTH(VT_FB_MAX_WIDTH)]; -#endif +static bool vt_cons_pos_to_flush[PIXEL_HEIGHT(VT_FB_MAX_HEIGHT) * PIXEL_WIDTH(VT_FB_MAX_WIDTH)]; struct vt_device vt_consdev = { .vd_driver = NULL, .vd_softc = NULL, @@ -228,11 +227,11 @@ struct vt_device vt_consdev = { .vd_mcursor_bg = TC_BLACK, #endif -#ifndef SC_NO_CONSDRAWN .vd_drawn = vt_consdrawn, .vd_drawnfg = vt_consdrawnfg, .vd_drawnbg = vt_consdrawnbg, -#endif + + .vd_pos_to_flush = vt_cons_pos_to_flush, }; static term_char_t vt_constextbuf[(_VTDEFW) * (VBF_DEFAULT_HISTORY_SIZE)]; static term_char_t *vt_constextbufrows[VBF_DEFAULT_HISTORY_SIZE]; @@ -292,6 +291,7 @@ vt_update_static(void *dummy) printf("VT: init without driver.\n"); mtx_init(&main_vd->vd_lock, "vtdev", NULL, MTX_DEF); + mtx_init(&main_vd->vd_flush_lock, "vtdev flush", NULL, MTX_DEF); cv_init(&main_vd->vd_winswitch, "vtwswt"); } @@ -1348,6 +1348,122 @@ vt_set_border(struct vt_device *vd, const term_rect_t *area, vd->vd_height - 1, 1, c); } +static void +vt_flush_to_buffer(struct vt_device *vd, + const struct vt_window *vw, const term_rect_t *area) +{ + unsigned int col, row; + term_char_t c; + term_color_t fg, bg; + size_t z; + + for (row = area->tr_begin.tp_row; row < area->tr_end.tp_row; ++row) { + for (col = area->tr_begin.tp_col; col < area->tr_end.tp_col; + ++col) { + z = row * PIXEL_WIDTH(VT_FB_MAX_WIDTH) + col; + if (z >= PIXEL_HEIGHT(VT_FB_MAX_HEIGHT) * + PIXEL_WIDTH(VT_FB_MAX_WIDTH)) + continue; + + c = VTBUF_GET_FIELD(&vw->vw_buf, row, col); + vt_determine_colors(c, + VTBUF_ISCURSOR(&vw->vw_buf, row, col), &fg, &bg); + + if (vd->vd_drawn && (vd->vd_drawn[z] == c) && + vd->vd_drawnfg && (vd->vd_drawnfg[z] == fg) && + vd->vd_drawnbg && (vd->vd_drawnbg[z] == bg)) { + vd->vd_pos_to_flush[z] = false; + continue; + } + + vd->vd_pos_to_flush[z] = true; + + if (vd->vd_drawn) + vd->vd_drawn[z] = c; + if (vd->vd_drawnfg) + vd->vd_drawnfg[z] = fg; + if (vd->vd_drawnbg) + vd->vd_drawnbg[z] = bg; + } + } +} + +static void +vt_bitblt_buffer(struct vt_device *vd, const struct vt_window *vw, + const term_rect_t *area) +{ + unsigned int col, row, x, y; + struct vt_font *vf; + term_char_t c; + term_color_t fg, bg; + const uint8_t *pattern; + size_t z; + + vf = vw->vw_font; + + for (row = area->tr_begin.tp_row; row < area->tr_end.tp_row; ++row) { + for (col = area->tr_begin.tp_col; col < area->tr_end.tp_col; + ++col) { + x = col * vf->vf_width + + vw->vw_draw_area.tr_begin.tp_col; + y = row * vf->vf_height + + vw->vw_draw_area.tr_begin.tp_row; + + z = row * PIXEL_WIDTH(VT_FB_MAX_WIDTH) + col; + if (z >= PIXEL_HEIGHT(VT_FB_MAX_HEIGHT) * + PIXEL_WIDTH(VT_FB_MAX_WIDTH)) + continue; + if (!vd->vd_pos_to_flush[z]) + continue; + + c = vd->vd_drawn[z]; + fg = vd->vd_drawnfg[z]; + bg = vd->vd_drawnbg[z]; + + pattern = vtfont_lookup(vf, c); + vd->vd_driver->vd_bitblt_bmp(vd, vw, + pattern, NULL, vf->vf_width, vf->vf_height, + x, y, fg, bg); + } + } + +#ifndef SC_NO_CUTPASTE + if (!vd->vd_mshown) + return; + + term_rect_t drawn_area; + + drawn_area.tr_begin.tp_col = area->tr_begin.tp_col * vf->vf_width; + drawn_area.tr_begin.tp_row = area->tr_begin.tp_row * vf->vf_height; + drawn_area.tr_end.tp_col = area->tr_end.tp_col * vf->vf_width; + drawn_area.tr_end.tp_row = area->tr_end.tp_row * vf->vf_height; + + if (vt_is_cursor_in_area(vd, &drawn_area)) { + vd->vd_driver->vd_bitblt_bmp(vd, vw, + vd->vd_mcursor->map, vd->vd_mcursor->mask, + vd->vd_mcursor->width, vd->vd_mcursor->height, + vd->vd_mx_drawn + vw->vw_draw_area.tr_begin.tp_col, + vd->vd_my_drawn + vw->vw_draw_area.tr_begin.tp_row, + vd->vd_mcursor_fg, vd->vd_mcursor_bg); + } +#endif +} + +static void +vt_draw_decorations(struct vt_device *vd) +{ + struct vt_window *vw; + const teken_attr_t *a; + + vw = vd->vd_curwindow; + + a = teken_get_curattr(&vw->vw_terminal->tm_emulator); + vt_set_border(vd, &vw->vw_draw_area, a->ta_bgcolor); + + if (vt_draw_logo_cpus) + vtterm_draw_cpu_logos(vd); +} + static int vt_flush(struct vt_device *vd) { @@ -1357,6 +1473,7 @@ vt_flush(struct vt_device *vd) #ifndef SC_NO_CUTPASTE int cursor_was_shown, cursor_moved; #endif + bool needs_refresh; if (inside_vt_flush && KERNEL_PANICKED()) return (0); @@ -1372,8 +1489,9 @@ vt_flush(struct vt_device *vd) if (((vd->vd_flags & VDF_TEXTMODE) == 0) && (vf == NULL)) return (0); - vtbuf_lock(&vw->vw_buf); + VT_FLUSH_LOCK(vd); + vtbuf_lock(&vw->vw_buf); inside_vt_flush = true; #ifndef SC_NO_CUTPASTE @@ -1417,29 +1535,63 @@ vt_flush(struct vt_device *vd) vtbuf_undirty(&vw->vw_buf, &tarea); /* Force a full redraw when the screen contents might be invalid. */ + needs_refresh = false; if (vd->vd_flags & (VDF_INVALID | VDF_SUSPENDED)) { - const teken_attr_t *a; - + needs_refresh = true; vd->vd_flags &= ~VDF_INVALID; - a = teken_get_curattr(&vw->vw_terminal->tm_emulator); - vt_set_border(vd, &vw->vw_draw_area, a->ta_bgcolor); vt_termrect(vd, vf, &tarea); if (vd->vd_driver->vd_invalidate_text) vd->vd_driver->vd_invalidate_text(vd, &tarea); - if (vt_draw_logo_cpus) - vtterm_draw_cpu_logos(vd); } if (tarea.tr_begin.tp_col < tarea.tr_end.tp_col) { - vd->vd_driver->vd_bitblt_text(vd, vw, &tarea); - inside_vt_flush = false; - vtbuf_unlock(&vw->vw_buf); + if (vd->vd_driver->vd_bitblt_after_vtbuf_unlock) { + /* + * When `vd_bitblt_after_vtbuf_unlock` is set to true, + * we first remember the characters to redraw. They are + * already copied to the `vd_drawn` arrays. + * + * We then unlock vt_buf and proceed with the actual + * drawing using the backend driver. + */ + vt_flush_to_buffer(vd, vw, &tarea); + vtbuf_unlock(&vw->vw_buf); + vt_bitblt_buffer(vd, vw, &tarea); + + if (needs_refresh) + vt_draw_decorations(vd); + + /* + * We can reset `inside_vt_flush` after unlocking vtbuf + * here because we also hold vt_flush_lock in this code + * path. + */ + inside_vt_flush = false; + } else { + /* + * When `vd_bitblt_after_vtbuf_unlock` is false, we use + * the backend's `vd_bitblt_text` callback directly. + */ + vd->vd_driver->vd_bitblt_text(vd, vw, &tarea); + + if (needs_refresh) + vt_draw_decorations(vd); + + inside_vt_flush = false; + vtbuf_unlock(&vw->vw_buf); + } + + VT_FLUSH_UNLOCK(vd); + return (1); } inside_vt_flush = false; vtbuf_unlock(&vw->vw_buf); + + VT_FLUSH_UNLOCK(vd); + return (0); } From nobody Sat Feb 17 21:32:32 2024 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 4Tchpm4rbRz59lBb; Sat, 17 Feb 2024 21:32:32 +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 4Tchpm1zlvz4gdq; Sat, 17 Feb 2024 21:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205552; 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=rYH01wfQRqxyOEwxW3tRyJW9qX5rHKx1ySfuvAyhdpo=; b=xI9atyTIdjm9R9WILyfrOk0nMaV7jOwigUxP4rZZP8Ap2BN06B4POG1Pdtc3zH2nmEXaYf a6h6nKDrZdaUl8UDeCJ4PX59OBdRkVCeeMn+JuFr9dlv1bt2REH73vypA9uR2DedeV15Uq 7Hs9lm+YHw76femGRd50uozA6RonIPgrlL9/eNVWNzHPFn69EmZsx4B/UGZ3JWbueMG474 UjKuXZwbXTMddhPdH7EW92Qq+uXHJP+fF4gAfTEU4UPJWcbD7pr5nlQSPTVADTeaHKe7wf m2C2qa6XtsjzQ0ZhbCswwiY+Em2WG3zeUtKX/Er/3fZVPvQkpc+lfNnViWwC1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205552; 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=rYH01wfQRqxyOEwxW3tRyJW9qX5rHKx1ySfuvAyhdpo=; b=TasiR8xicTD1mBE/tKFmP9z+6Pfc876rvctD6oeFIVJibuD04g/8frjPZtTZ7CLyPPe0Kv zju8H/v9MkrcuGFEJolU5b95T7QfY2z3VxIchP9w25frEDotU5VYn3bODiuu1LpzAByxVy pvg4kYobolsdCqnIOlSC5onbCx6QS2RpBKoeYsYmd5CjWAuSmoRBCBhNBgW65daneXaN0J pihrMahrlR+yRJUsFxV/H+oJHs2uYS+V5kqEDCRkUfrwL859OVfWflvBSIn7tbzvNWxbne TXiQ76ExP7jueepqNztB72GHIAN1/XdLJ6WLDheU8sDthHnz9vhdV+hAZrLbYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708205552; a=rsa-sha256; cv=none; b=wWhXAey0Sjylwh53jOZOTKGdcG/oIXE4jKABlVT859+yL6zf9Ztb+9RVCcujmyg9CXoLPW RoTZLmwyuoueoPqzgPi5orgqgZ/TZpkrZB0xe5Qlp7H9IVCYlMC40UuKlUHdeLNmtmagkE oKSU6P6BeqWNWGDSLoN3CH98a42aEjXtIJW/yNh57M4Ld2lc+hRURjbuBmdWbdnIvW8iLO xLGaGFb3a5vH/GUF0sZYkLYYbSbK2y8/QJQT2O39GaW/JJyqhSapjEt+NY6MsNvifcb028 1n6gtYRZhdxmqurOvxZDqZO8QAsL5VpcnPMAYGCoOl8yGYrlnnixUWXRHRekxg== 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 4Tchpm159GzPJg; Sat, 17 Feb 2024 21:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HLWWv2019651; Sat, 17 Feb 2024 21:32:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HLWWY1019648; Sat, 17 Feb 2024 21:32:32 GMT (envelope-from git) Date: Sat, 17 Feb 2024 21:32:32 GMT Message-Id: <202402172132.41HLWWY1019648@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 2567cf1925bd - stable/14 - vt(4): Call vd_postswitch callback regardless of the current window 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2567cf1925bdcde0230bddb8ed5ca75056d4afa7 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=2567cf1925bdcde0230bddb8ed5ca75056d4afa7 commit 2567cf1925bdcde0230bddb8ed5ca75056d4afa7 Author: Jean-Sébastien Pédron AuthorDate: 2023-11-24 17:30:34 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-02-17 20:58:34 +0000 vt(4): Call vd_postswitch callback regardless of the current window [Why] We want the same behavior at the backend level, regardless if we need to switch the current window or not. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D42751 (cherry picked from commit 16b13bd3fd63be56653296ba54956f5526918445) --- sys/dev/vt/vt_core.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index 3e4db9a1ba30..bfd99665be4a 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -579,8 +579,6 @@ vt_window_switch(struct vt_window *vw) * debugger entry/exit to be equivalent to * successfully try-locking here. */ - if (curvw == vw) - return (0); if (!(vw->vw_flags & (VWF_OPENED|VWF_CONSOLE))) { inside_vt_window_switch = false; return (EINVAL); From nobody Sat Feb 17 21:32:33 2024 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 4Tchpn5n2Rz59kcr; Sat, 17 Feb 2024 21:32:33 +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 4Tchpn4DYxz4ghg; Sat, 17 Feb 2024 21:32:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205553; 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=MzH0gT0tnqqOEGgE45bhS44Qa+P/oEEfKAmU8a4tHBY=; b=fq2XyuXCONOciCnRtrsPvWI+398pHmXINpZit/1x6dfqkRvJyLqBnlnbNvkPyARj1YJEHT Zlrzeb44sYmPRNv7ImRFLG6pVfZJ5BzZE/Oc6w3gV0TbODs3sCll97Zy/V9DBmwINF9hk4 sexHP/EcOD7oNW1jw1nPFWdXvBtygVlbvCJ3am6Tj0nI48ZV7DMjxVdFXxWjlmPgrJ4Ce9 cz8J2v2ZGHhdsZM1nIR61yyvWed8EFUt9Q2+5TMCfL2+xh6MZNevtz+4nvLrO8K7QzZB9H nKEhSSaiqPMRZXSHY6E26bVKdqmdFmfioaiC5NEc0mEsNVHHR/4Gq0E5/UTaiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205553; 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=MzH0gT0tnqqOEGgE45bhS44Qa+P/oEEfKAmU8a4tHBY=; b=cljFq4t6s6epUL1WrZ0hT1UARhHfqdCP73t0CwCuW6JZn10rP3C/w8jDt6R9bJ/oFl3VOA QHKDPZTi1WSJPBE24SsFkQPvoFVpNbg/8kAAX3yDcubOXM/JBuoO8/v7242y5sdUtBHXk7 DZyX+boIBGxW81zsX4grdq/y6ZHH0Wkjer/AOTilZ0wovGCWR4/qg2JnvgC7o6oOKdYpmB lBkhk7wP72ga0NGwPyfxLdqjoPKBuAxzXzfB51ldex7ycTybFHBQX3baG9Qssw9ki/+1OU siO4DZMf0nf92b6BckS3eBtgzeq0GchBPxJ5RnIVCBwjJlAVIaz4NLb5ABx2vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708205553; a=rsa-sha256; cv=none; b=gDD2GICNLCgZdfP+0JRmUcJcj4NC8jyHxl71NEgHZiicgNSwxQfXWT6PJOrNYM1uaCi0eH 3Bl0Ie2NnGm5U/SvEq6oiCIOGCBEqcgGYq1ck/TnMsyGyIb/qzpqa4aTwewaFbne83cR0/ Ck40H+jhXB9oRz9l9qL1CJtEx2rbqnCiP4DbRFTpLQ1gJlNdaL9AC2FnulITheuKndq2L3 4IY2/bPbRCD1JCiPvkxAA1KAQNN6LcByBGQNjDIdl4Y0w/KglMYP8UM7uVBXTv3pKU3kE5 zwjQDWPMoOfscpZIEOWg7dpnunstkzuFW4akVzAi9fLuyy1E4joUjpbZ0RwI+g== 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 4Tchpn2MB4zPbC; Sat, 17 Feb 2024 21:32:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HLWXnq019696; Sat, 17 Feb 2024 21:32:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HLWXTr019693; Sat, 17 Feb 2024 21:32:33 GMT (envelope-from git) Date: Sat, 17 Feb 2024 21:32:33 GMT Message-Id: <202402172132.41HLWXTr019693@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: fc00c0377974 - stable/14 - vt(4): Always call vt_window_switch() in vtterm_cnungrab() 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fc00c037797457c4bf7e06c207297bf06cc92f33 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=fc00c037797457c4bf7e06c207297bf06cc92f33 commit fc00c037797457c4bf7e06c207297bf06cc92f33 Author: Jean-Sébastien Pédron AuthorDate: 2023-11-24 17:30:35 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-02-17 20:58:34 +0000 vt(4): Always call vt_window_switch() in vtterm_cnungrab() [Why] This ensures that vtterm_cnungrab() is the mirror of vtterm_cngrab(). And the latter always call vt_window_switch() and thus the backend's vd_postswitch(). This makes sure that whatever the backend did during vtterm_cngrab(), it can undo it during vtterm_cnungrab(). Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D42752 (cherry picked from commit f18b3ce0b7be0b24a743ec59077ca8e7929a353c) --- sys/dev/vt/vt_core.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index bfd99665be4a..4a1031f1aa69 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -2046,7 +2046,7 @@ static void vtterm_cnungrab(struct terminal *tm) { struct vt_device *vd; - struct vt_window *vw; + struct vt_window *vw, *grabwindow; vw = tm->tm_softc; vd = vw->vw_device; @@ -2055,10 +2055,19 @@ vtterm_cnungrab(struct terminal *tm) if (vtterm_cnungrab_noswitch(vd, vw) != 0) return; - if (!cold && vd->vd_grabwindow != vw) - vt_window_switch(vd->vd_grabwindow); - + /* + * We set `vd_grabwindow` to NULL before calling vt_window_switch() + * because it allows the underlying vt(4) backend to distinguish a + * "grab" from an "ungrab" of the console. + * + * This is used by `vt_drmfb` in drm-kmod to call either + * fb_debug_enter() or fb_debug_leave() appropriately. + */ + grabwindow = vd->vd_grabwindow; vd->vd_grabwindow = NULL; + + if (!cold) + vt_window_switch(grabwindow); } static void From nobody Sat Feb 17 21:32:34 2024 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 4Tchpp5q2pz59knf; Sat, 17 Feb 2024 21:32:34 +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 4Tchpp4JhCz4gFM; Sat, 17 Feb 2024 21:32:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205554; 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=HP5mXuES5hm69BC8SuM3C4ahaBhSschnL0F1NbKAT8A=; b=X/QcbopqyJ0TC1rGes3GBPhqFkq8CfEYiNq8KiAGgoYdtb+J2W6pPAk4HyTO0vPUH017YR xuNpeFOCpqAmjo7oyO1GKy4mm0eWOHQdRM7dZBw1tnI+PT4RnM+0nlWOawimjxuK2QJJAP FQ6UNBayOMeSOwG9SP/S3bGf6RL+3oa3Cn9iR8QmhXsWvOA7YLB9GNuWCgpH1f+OeXPG+0 bgXfN8C+DGvBO5u+7XWRMbn6RVlJEJ6sTcNFEZ/FSlQPq8sKzwEpTgZDDTQygZF/HDWKn2 15/Dz8N92cABNifUPFNGFE0RJEKqF6jcVkI40zMA/kURf+rt0iftUfMNscHarA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205554; 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=HP5mXuES5hm69BC8SuM3C4ahaBhSschnL0F1NbKAT8A=; b=nRgXksQWg+ZTn7pMc8m461oV05EDXIAyAqx5JPyjVYfGF/cyebZ9aac6eM7rxVaF/mfGDs VIsqaJHP2jmDXSrrpzeDGVerkcE3c7uCaFGlEilAcS3y7f2d1XL2qfphdmBazaqTwNb9Vi bzjdPmYoAB/ssMLPoAUtdTN3/P9q0iOjKbdpKSTa0IzARoQij2Hbs/nUp6dlPEeOzkmUJp 23iFdgLfo8QyOBtVYVIyNYJwi0OGII7hsLrmWIgZMFp3bhvhg/AXmAZQTQJfd0AvaUpGZw cyzX6Dd97fTPqFSrMr58RVzLM0isf33q5uiHQIwypQRxD7/BfuIf/tHih7fhww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708205554; a=rsa-sha256; cv=none; b=QPW2Tv+UH3T38VbwI0hx5q6r/8LwJl68qgBr4kPKjFRX9P4pR5X1G4jhxVxPv3fgnOAObD Qri8u/d4Bg4rVDC8M6FNc9UrZrZhov2tKE7V2dS27U0g49SrQFiFAhBPe8iJ/D7aF8K3Px 2XBvYZmhMhkJJCVCbP4RBPKCMuqdbrQMG2FAsLUG+w+y4MGTcpQFb7uGGxbi2XHVznJ1qN V6i7e8gSS05GM8Og3eDToyUUfV3xQ44zLt+CCwvdczfPUevGAMaejbQyNdFbXa/biRiTv2 RENoWXbK8fCI1sqSQ7bsnHUW2E9BP8UkkpZMrzrMWHf5niz4miLh/qOKwER3Ng== 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 4Tchpp3QbGzPZR; Sat, 17 Feb 2024 21:32:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HLWYOx019747; Sat, 17 Feb 2024 21:32:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HLWYAB019744; Sat, 17 Feb 2024 21:32:34 GMT (envelope-from git) Date: Sat, 17 Feb 2024 21:32:34 GMT Message-Id: <202402172132.41HLWYAB019744@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: a06b366322fe - stable/14 - vt(4): Call post-switch callback after replacing the backend 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a06b366322fe22b211c16c2b0977fac313dce4e7 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=a06b366322fe22b211c16c2b0977fac313dce4e7 commit a06b366322fe22b211c16c2b0977fac313dce4e7 Author: Jean-Sébastien Pédron AuthorDate: 2023-11-29 18:34:48 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-02-17 20:58:35 +0000 vt(4): Call post-switch callback after replacing the backend [Why] For instance, it gives a chance to the new backend to refresh the screen. This is needed by the vt_drmfb backend and `drm_fb_helper`. This change was lost when I posted changes to reviews.freebsd.org and it broken the amdgpu driver... Thanks to manu@ for reporting the problem and wulf@ to find out the missing change! Tested by: manu Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D42834 (cherry picked from commit 40c20fc29cad4d38d9a565e9c7ba78612097308e) --- sys/dev/vt/vt_core.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index 4a1031f1aa69..797af56e5e1d 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -3284,6 +3284,13 @@ vt_replace_backend(const struct vt_driver *drv, void *softc) /* Update windows sizes and initialize last items. */ vt_upgrade(vd); + /* + * Give a chance to the new backend to run the post-switch code, for + * instance to refresh the screen. + */ + if (vd->vd_driver->vd_postswitch) + vd->vd_driver->vd_postswitch(vd); + #ifdef DEV_SPLASH if (vd->vd_flags & VDF_SPLASH) vtterm_splash(vd); From nobody Sat Feb 17 21:32:35 2024 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 4Tchpr1Rznz59klb; Sat, 17 Feb 2024 21:32:36 +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 4Tchpq5W45z4gfj; Sat, 17 Feb 2024 21:32:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205555; 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=z3IZoRfibo+kHor5hhUN66vkmKS5F8MbXc0CIG2bSlQ=; b=CzR3QKh0qsf3+jc5JImsxuL6JhnKO7tjmpP3PbbIAS0PKYIZDJCkWRgrKzukeFFqGyg5UQ PYN45Y4qlJh634xE9ii5h/cyk8Gzmn5acm5Zxexg+GRFevoFl4QRNfX0Jw52UdfKNayOuA +iog2xL5pMBwrOtceZtfGLZGo0dTs+iqqph5HLPL0JydcxRJHOAYv/NsmlAt0DcSrWMrwE wNot/+gYxapjapTdKSHuTdrvRfggHabe0h7SmBiGz2K/5Hm1sqWZJ5q1lCUBqIEzaroW9V yOOGQ+YOuI3kmkTew65edIyMTfyOv0fTDp7ribgujgLt05gzlpRsi6iTICy44Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205555; 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=z3IZoRfibo+kHor5hhUN66vkmKS5F8MbXc0CIG2bSlQ=; b=ljoUmvwHVS/RoQnZjY9fyS12q/4vsRidexIA/ZE7+2tMZf5sTmz+/WR84grW2su1intqR4 Bag9jSugM+gdAA1ofk48mP58VgGFlwwwPU5740HLtfjkvVsWoDZdwMPQG9VeNaP8Kwj+1S jKuSK6J3o/16V6pfDQanBNQ5CMXDGlbtCJTcTsDr9DxFzFNVGOYMfTx02LyiU/2sgm6DmR zGFLW4upTU0uqMidXoI9FI+1klZO5wpQeacea0f6HSaFJZQM40EQWYfQsnEwBsIdMrEWy6 Tt5S7AoCVqxLkwV2JDO+jYpavK+vw5/SaiQTSbxxxB41T3iruZhL65dex3rDvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708205555; a=rsa-sha256; cv=none; b=QhDxt+/0OCBW5WA8gPcgKG4qeIIR8QtJG1Xiox9Fq5AMIwrZlXxnCMgpUmrPBVREXiBi8W I+62NI3RBYQzdO5qjcpqrSuI1h0e/UT6MXoKKCmmUJ4D3TQPX+diMCpVsm3z3fpYPpCQnV FEP/uG33oj0UBna7XVtrxKE+THeZqdYacjNoY9+wyQVvzgpXYL8xODLS74X08OydNH72nu S6hPS/IVqWHx2wAhxRThvqvrBDfTLSibn3ei006KJbx7uANV2P+G+k7kvt7tr3TKxaVbG0 nw5bAkErPlHxtG4FAzs7sqhS3xLhqKB8PDG5sGRl1DbrqoZvVHuWjPNXv+EPbA== 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 4Tchpq4YQXzPJh; Sat, 17 Feb 2024 21:32:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HLWZ7B019795; Sat, 17 Feb 2024 21:32:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HLWZrF019792; Sat, 17 Feb 2024 21:32:35 GMT (envelope-from git) Date: Sat, 17 Feb 2024 21:32:35 GMT Message-Id: <202402172132.41HLWZrF019792@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: f07f18ec2c9a - stable/14 - linuxkpi: Include from and 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f07f18ec2c9abb3fabfe9f6f1ccbdfc25475167b Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=f07f18ec2c9abb3fabfe9f6f1ccbdfc25475167b commit f07f18ec2c9abb3fabfe9f6f1ccbdfc25475167b Author: Jean-Sébastien Pédron AuthorDate: 2023-11-29 18:38:54 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-02-17 20:58:35 +0000 linuxkpi: Include from and [Why] Some files in DRM rely on this indirect include to use `struct rb_*`. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D42835 (cherry picked from commit b292c995cfa88cc73d5d77b6b94ae1b78296793f) --- sys/compat/linuxkpi/common/include/linux/hrtimer.h | 1 + sys/compat/linuxkpi/common/include/linux/mm_types.h | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/hrtimer.h b/sys/compat/linuxkpi/common/include/linux/hrtimer.h index 38fc3ce4dc6a..88f9487d0b85 100644 --- a/sys/compat/linuxkpi/common/include/linux/hrtimer.h +++ b/sys/compat/linuxkpi/common/include/linux/hrtimer.h @@ -30,6 +30,7 @@ #include #include +#include #include enum hrtimer_mode { diff --git a/sys/compat/linuxkpi/common/include/linux/mm_types.h b/sys/compat/linuxkpi/common/include/linux/mm_types.h index 446231bd691f..c08e2511725b 100644 --- a/sys/compat/linuxkpi/common/include/linux/mm_types.h +++ b/sys/compat/linuxkpi/common/include/linux/mm_types.h @@ -29,6 +29,7 @@ #include #include +#include #include #include From nobody Sat Feb 17 21:32:36 2024 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 4Tchps18QBz59kwQ; Sat, 17 Feb 2024 21:32:37 +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 4Tchpr6Rj7z4gjK; Sat, 17 Feb 2024 21:32:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205556; 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=JvcPeoAzQ3u/ATPnjoDlG0/qdtvEHQXrzQ/PKG7KQUY=; b=QPt6X81g7w1X5m+s9hLA3CbuZEPvb5vQhIeQxTIv9TUscQlrs/RKuHoqJHXglVNHDuABBk On8ErYjcOaLaT9E8Y8dX6fLMaACACUU54g923HyRE9W/wTQkYzg/+uKV6GtpxBUSOUKILG +fVvfChGbcKwdqt0RI15o7wTEgkpDWDj+UQfuEqT025ngDbMM6eTNqE8xfH2TMZNgxvbYt 3LMg+Av+a8gG8Hnlc2ith6H2fZqD7X5aPKGBgViBY+g/Gdx8AlLgWaPD+vKGqZsjcO9kSG ZVo8RLaFUqafXVHltJMu8onOMb7Zk3lkIvxJ3DtjNCBcz3+p3I8gCdzPndUU2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205556; 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=JvcPeoAzQ3u/ATPnjoDlG0/qdtvEHQXrzQ/PKG7KQUY=; b=dHz7mE5lQiZDLCfQwyrafhERY7WrtYspMuF2m8xIEr/81+0Dpkmdq4izjKbgJUVqvO9gyJ cLDWw6R2bw1+LG3SCcjRbh2xnUKQ+p5Ipsi9kvLBMiH0y+eXGV0FR6W1gjN4n5xFohSpoj epEfSANCqsJ5zgCHvliQNY1+mh34EOBtvi8svRQ3BZAqA3YGvzT45m+BjeeovwtaaR3m92 hjmDduKRAMEdCyXdXaA4MmwBWr0tPV8jO8MTk1nINzw7o7/6Yr1+yjhzeD4Kz9ZOyk1oe0 A6BUMJdteIOo0tz0Ow0qKNyF1BGHrhh+f7qA2xoyvy6kBqryGeZCjbZu7dTiEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708205556; a=rsa-sha256; cv=none; b=cEg9GQb7LdB4WAe5iuN7aCpleZ6Eocd3GCv+bvbKsSktO0b2z3HtJBVyGPICyoToOYnV1H Hxq6L8KIJwgp/l4aizxC2wCqspg4mSIC1hSDlZ27gd8lhUEs0lv0HtI8Dln8k/6w9HipzB qrlNnjRPnztJ3R8lHwhRd/GIlu5Eox3BegYFv3Gd+ND4jYvtyJaVQ4+zEC1hA2OKVkVhQj 0JGHjF/UnwXajEYpsBCNu+gV3IhobwQaAdn0gfD5oUJHdHlOEnPxSkT9Bns3CKoKRwkpwi heF5uppWiwErqiUYn2+uZh6upQtF8Ve2i/+lZkF6Ic+s68RJDR/SJjDy9rMVwA== 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 4Tchpr5RcWzP9N; Sat, 17 Feb 2024 21:32:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HLWaov019847; Sat, 17 Feb 2024 21:32:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HLWaMb019844; Sat, 17 Feb 2024 21:32:36 GMT (envelope-from git) Date: Sat, 17 Feb 2024 21:32:36 GMT Message-Id: <202402172132.41HLWaMb019844@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 586c0e9676cf - stable/14 - linuxkpi: Include from 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 586c0e9676cf3036f8b6d3e4272f25fe52850555 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=586c0e9676cf3036f8b6d3e4272f25fe52850555 commit 586c0e9676cf3036f8b6d3e4272f25fe52850555 Author: Jean-Sébastien Pédron AuthorDate: 2023-12-04 22:02:02 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-02-17 20:58:35 +0000 linuxkpi: Include from [Why] We need this for the `bool` type. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D43016 (cherry picked from commit 50a56453dadbd05eb1c43addaf2773a1ef417445) --- sys/compat/linuxkpi/common/include/linux/cc_platform.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/cc_platform.h b/sys/compat/linuxkpi/common/include/linux/cc_platform.h index 727dbc98dab2..01c0de17f7d2 100644 --- a/sys/compat/linuxkpi/common/include/linux/cc_platform.h +++ b/sys/compat/linuxkpi/common/include/linux/cc_platform.h @@ -3,6 +3,9 @@ #ifndef _LINUXKPI_LINUX_CC_PLATFORM_H_ #define _LINUXKPI_LINUX_CC_PLATFORM_H_ +#include +#include + enum cc_attr { CC_ATTR_MEM_ENCRYPT, }; From nobody Sat Feb 17 21:32:37 2024 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 4Tchpt2lLjz59l05; Sat, 17 Feb 2024 21:32:38 +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 4Tchpt04fMz4gr4; Sat, 17 Feb 2024 21:32:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205558; 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=LURjz6jNUOIqwReGTTHfUj8HNP6w51t/rZSEWmXKS/Q=; b=cBzA89z94mzqIPzoWexaprM7M1s7dsbaGpi5baa4//V8VkEuyFT9t1GlT1SumjlyWWw53b 9LW9Q+d3b3DF+i9fQGzgrBE0M6tApQaJpL2T+pg59sd4xMKfkz1qczm+zL2kOMDwKlW7rq Ygu6Jp01eUOb8sqffCUmkB1YM75skfBxVQKNziLyE0hx6+SOSa95XbNvql+wGgOia9plua 2/PJIVYES9NC3+fkJU3eiX3x55VmGlioAQxJvapQiw3LKl81+doPXrRSMexu60pf9f5QI7 7kkNL0hnVt4B4UfBXGRcQaURawcMZqpdJsoVQGw99LBL9PH7U/EOwRo9xz5Vpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205558; 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=LURjz6jNUOIqwReGTTHfUj8HNP6w51t/rZSEWmXKS/Q=; b=JwBMtYZYTnh474zR6mfXsEdkXEAPtLVvlYaxLVFQ8aNIhsalRly/Ujaf/GNJfpN+GshOlD lmkBQ4s1T+hMQwZ9HCQntvJbFat4z9dTnKJnUiXMdAOPS3HgiqArE0yjjAteGkYutE0pC1 1t/WNMhFWj9pEFnd/3/DqDwrljEMKkkjCkaeckhSXOerVksMxCxcVVtVhwIiilMdlY6kwx M1VHBVuDaJYQ+fqDAv4uumAEF6yj4ZO6jk7J5RjlLpe5LaJ5HMC+wQvCi9OMhKUDPKf+kT 5pazJAAYXp6piFx4R8DPM5XVEdWxgy4JadLIdrcPZOYyqx+SC41uLdlvziY4Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708205558; a=rsa-sha256; cv=none; b=HjpNEs/bycXj8WkTHwSnOOCFRFHJuuYxJzwfvYnmEPF7i1igPaGjg8sY/yBmheI0LsSFIh TpXnlTb5RBqEDbIn0Bj+ZeR9INwTDEpyXMtbcIwKFDZ0vESyLGf0YMv/qvwoufcsL3pCuX 6bPz67aIRbRludy3YbA/GrBN7F7ctrT8jAkVtwTd/sscd7/0Ncs/t0+jpKkXcLwfLQKc0C WgG+QCySJu9X2jmrO6k7HUaAK2zeD1vd4ClwSK/afNL9RmqSpDZHvEAgvcrvE0ayWHx51y XX0o2/Q50v/4/jOwHdxHdeOZ8TnoPu4aUJQA/Lrrhsio6o5BYwcgGnfN6ZzREw== 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 4Tchps61YKzP85; Sat, 17 Feb 2024 21:32:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HLWbv0019901; Sat, 17 Feb 2024 21:32:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HLWbaR019898; Sat, 17 Feb 2024 21:32:37 GMT (envelope-from git) Date: Sat, 17 Feb 2024 21:32:37 GMT Message-Id: <202402172132.41HLWbaR019898@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 843107faca66 - stable/14 - linuxkpi: Move `invalidate_mapping_pages()` to 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 843107faca6620565b2625e629e72884210172c6 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=843107faca6620565b2625e629e72884210172c6 commit 843107faca6620565b2625e629e72884210172c6 Author: Jean-Sébastien Pédron AuthorDate: 2023-12-08 17:07:00 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-02-17 20:58:35 +0000 linuxkpi: Move `invalidate_mapping_pages()` to [Why] This is consistent with Linux. [How] The definition is moved from to and the latter is included from the former. This is how it is done on Linux. Prototypes are also expanded with argument names. I got a build failure in the DRM 5.18 drivers because the compiler considered that the `pgoff_t` argument was there twice. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D43018 (cherry picked from commit 4e0d3f7b3c3295e51ded2bab39f36842f405b4eb) --- sys/compat/linuxkpi/common/include/linux/pagemap.h | 6 ++++++ sys/compat/linuxkpi/common/include/linux/shmem_fs.h | 15 ++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pagemap.h b/sys/compat/linuxkpi/common/include/linux/pagemap.h index aa2e2a4e3950..7244b61257dc 100644 --- a/sys/compat/linuxkpi/common/include/linux/pagemap.h +++ b/sys/compat/linuxkpi/common/include/linux/pagemap.h @@ -33,6 +33,12 @@ #include #include +#define invalidate_mapping_pages(...) \ + linux_invalidate_mapping_pages(__VA_ARGS__) + +unsigned long linux_invalidate_mapping_pages(vm_object_t obj, pgoff_t start, + pgoff_t end); + static inline void release_pages(struct page **pages, int nr) { diff --git a/sys/compat/linuxkpi/common/include/linux/shmem_fs.h b/sys/compat/linuxkpi/common/include/linux/shmem_fs.h index eb31c5ad827a..d373cfa1d611 100644 --- a/sys/compat/linuxkpi/common/include/linux/shmem_fs.h +++ b/sys/compat/linuxkpi/common/include/linux/shmem_fs.h @@ -29,14 +29,15 @@ #ifndef _LINUXKPI_LINUX_SHMEM_FS_H_ #define _LINUXKPI_LINUX_SHMEM_FS_H_ -/* Shared memory support */ -unsigned long linux_invalidate_mapping_pages(vm_object_t, pgoff_t, pgoff_t); -struct page *linux_shmem_read_mapping_page_gfp(vm_object_t, int, gfp_t); -struct linux_file *linux_shmem_file_setup(const char *, loff_t, unsigned long); -void linux_shmem_truncate_range(vm_object_t, loff_t, loff_t); +#include -#define invalidate_mapping_pages(...) \ - linux_invalidate_mapping_pages(__VA_ARGS__) +/* Shared memory support */ +struct page *linux_shmem_read_mapping_page_gfp(vm_object_t obj, int pindex, + gfp_t gfp); +struct linux_file *linux_shmem_file_setup(const char *name, loff_t size, + unsigned long flags); +void linux_shmem_truncate_range(vm_object_t obj, loff_t lstart, + loff_t lend); #define shmem_read_mapping_page(...) \ linux_shmem_read_mapping_page_gfp(__VA_ARGS__, 0) From nobody Sat Feb 17 21:32:38 2024 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 4Tchpv3NZ2z59knx; Sat, 17 Feb 2024 21:32:39 +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 4Tchpv0vgJz4glg; Sat, 17 Feb 2024 21:32:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205559; 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=G5tw1k30XpKcj+rfkJuhorzvDU6geBdjTQKdvqT6pJk=; b=Rw1HZ9PQvObJmk9B82t+7aPGnKgPdNvbtd9u3j29liAbbk8U/2/0djcauc7mFjGwKrVetd XTHWHmYYbEtxfH5mGWkWpdPTFknBI6PHHQErJa2wymkX8PSxNmNnR5HCmvgjIqAaVjNFm1 iJIQUhC22nGiPkzcdFcEGYf09Qlncvp6BALGUhO1A0zGjDibgeWk7iwwbWF8RmOHND3SEO BbWRcDjZ8L40ZaF8Hg669JHBbAU2SqNnSD9yZsjcV06op5Ccsxbl/pIzPup/ofRPNxn1sy R3zzfxadOOaz5biUfamZYlldFjOux++lNolspqa2rpJWxnpLaLIC0qeGyDbXBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205559; 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=G5tw1k30XpKcj+rfkJuhorzvDU6geBdjTQKdvqT6pJk=; b=Iv3v5J+QtsrHxqvZZR/P1k5Cgz2VlIFmrmKQGeP+2xFtVt5psy/fU5n2Zl+lZ8VJTkl5sO +SbHZEm32MB1TugCcB6QLHuGX23b6frrVDD4mqL4v/KIIY8lhU0DtkSvuBR0TwoyePWMcz GxrHKm+3TdOLeQh1/+maYscQRIipwMU4R10EC3oKw5ROC+P/iU7LKbcOphrait8tytrKt2 PieLgN3D3/nzUkbL1wpwwcfYAolSM/jy7oncIFcjrjT08WkFOUSBU0T3D49bW+QoiuTWWJ i+/VIlS6hLFfM8+HgKFuK59WY5AdC9um8pOqOjYYERID4op2y8P5wWvVQdE7zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708205559; a=rsa-sha256; cv=none; b=utNAEhpTtsLv/uCI+MQ+gN0tteEYzslVpIMDpAPiumV8NzGlMWuTAe6psCFhG6KFp3V/Hq cwPyIVaMR/Gg8GtHMoagT2Yn8+jB0itKulUDz7/932Rm9rnhuHTeuBo73oX1/5Fv6K7Nzm dQROyo30J39M1oMtZvhQDMe3iOwujQ9ICk4J8av6P5ZVou8kgKrwABvZ9a3rzykJDeE4dw +b8mwTlTjByLHQJYqzyIUMP+TOpU21D3znCErUxgmW3UHhnxOEShM1R5X3LZKk5MtweFig VePgG3sc2cxhNMZJHgTgYLoTMXEG0rKxMA4z1LqwM73wpEF0F855EDhUl6OyUw== 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 4Tchpv00x1zPMB; Sat, 17 Feb 2024 21:32:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HLWcfP019953; Sat, 17 Feb 2024 21:32:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HLWcAh019950; Sat, 17 Feb 2024 21:32:38 GMT (envelope-from git) Date: Sat, 17 Feb 2024 21:32:38 GMT Message-Id: <202402172132.41HLWcAh019950@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 3b97bdb453d1 - stable/14 - linuxkpi: Move `struct kobject` code to `linux_kobject.c` 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3b97bdb453d1d38b1ceed1f1ff0dfc38660a013b Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=3b97bdb453d1d38b1ceed1f1ff0dfc38660a013b commit 3b97bdb453d1d38b1ceed1f1ff0dfc38660a013b Author: Jean-Sébastien Pédron AuthorDate: 2023-12-08 17:58:03 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-02-17 20:58:35 +0000 linuxkpi: Move `struct kobject` code to `linux_kobject.c` [Why] `linux_compat.c` is already too long. I will need to add `struct kset` in a follow-up commit, so let's move the existing `struct kobject` code to its own file. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D43019 (cherry picked from commit 80446fc7b5e5d22e2bac28bc0474dbe2fec83e43) --- sys/compat/linuxkpi/common/include/linux/kobject.h | 2 + sys/compat/linuxkpi/common/src/linux_compat.c | 190 ------------------ sys/compat/linuxkpi/common/src/linux_kobject.c | 221 +++++++++++++++++++++ sys/conf/files | 2 + sys/modules/linuxkpi/Makefile | 1 + 5 files changed, 226 insertions(+), 190 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/kobject.h b/sys/compat/linuxkpi/common/include/linux/kobject.h index 6e59e0952d62..06d71faaa873 100644 --- a/sys/compat/linuxkpi/common/include/linux/kobject.h +++ b/sys/compat/linuxkpi/common/include/linux/kobject.h @@ -154,4 +154,6 @@ kobject_uevent_env(struct kobject *kobj, int action, char *envp[]) */ } +void linux_kobject_kfree_name(struct kobject *kobj); + #endif /* _LINUXKPI_LINUX_KOBJECT_H_ */ diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index 69a17ea1a4a4..59ab61a86ec7 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -159,176 +159,6 @@ RB_GENERATE(linux_root, rb_node, __entry, panic_cmp); INTERVAL_TREE_DEFINE(struct interval_tree_node, rb, unsigned long,, START, LAST,, lkpi_interval_tree) -struct kobject * -kobject_create(void) -{ - struct kobject *kobj; - - kobj = kzalloc(sizeof(*kobj), GFP_KERNEL); - if (kobj == NULL) - return (NULL); - kobject_init(kobj, &linux_kfree_type); - - return (kobj); -} - - -int -kobject_set_name_vargs(struct kobject *kobj, const char *fmt, va_list args) -{ - va_list tmp_va; - int len; - char *old; - char *name; - char dummy; - - old = kobj->name; - - if (old && fmt == NULL) - return (0); - - /* compute length of string */ - va_copy(tmp_va, args); - len = vsnprintf(&dummy, 0, fmt, tmp_va); - va_end(tmp_va); - - /* account for zero termination */ - len++; - - /* check for error */ - if (len < 1) - return (-EINVAL); - - /* allocate memory for string */ - name = kzalloc(len, GFP_KERNEL); - if (name == NULL) - return (-ENOMEM); - vsnprintf(name, len, fmt, args); - kobj->name = name; - - /* free old string */ - kfree(old); - - /* filter new string */ - for (; *name != '\0'; name++) - if (*name == '/') - *name = '!'; - return (0); -} - -int -kobject_set_name(struct kobject *kobj, const char *fmt, ...) -{ - va_list args; - int error; - - va_start(args, fmt); - error = kobject_set_name_vargs(kobj, fmt, args); - va_end(args); - - return (error); -} - -static int -kobject_add_complete(struct kobject *kobj, struct kobject *parent) -{ - const struct kobj_type *t; - int error; - - kobj->parent = parent; - error = sysfs_create_dir(kobj); - if (error == 0 && kobj->ktype && kobj->ktype->default_attrs) { - struct attribute **attr; - t = kobj->ktype; - - for (attr = t->default_attrs; *attr != NULL; attr++) { - error = sysfs_create_file(kobj, *attr); - if (error) - break; - } - if (error) - sysfs_remove_dir(kobj); - } - return (error); -} - -int -kobject_add(struct kobject *kobj, struct kobject *parent, const char *fmt, ...) -{ - va_list args; - int error; - - va_start(args, fmt); - error = kobject_set_name_vargs(kobj, fmt, args); - va_end(args); - if (error) - return (error); - - return kobject_add_complete(kobj, parent); -} - -void -linux_kobject_release(struct kref *kref) -{ - struct kobject *kobj; - char *name; - - kobj = container_of(kref, struct kobject, kref); - sysfs_remove_dir(kobj); - name = kobj->name; - if (kobj->ktype && kobj->ktype->release) - kobj->ktype->release(kobj); - kfree(name); -} - -static void -linux_kobject_kfree(struct kobject *kobj) -{ - kfree(kobj); -} - -static void -linux_kobject_kfree_name(struct kobject *kobj) -{ - if (kobj) { - kfree(kobj->name); - } -} - -const struct kobj_type linux_kfree_type = { - .release = linux_kobject_kfree -}; - -static ssize_t -lkpi_kobj_attr_show(struct kobject *kobj, struct attribute *attr, char *buf) -{ - struct kobj_attribute *ka = - container_of(attr, struct kobj_attribute, attr); - - if (ka->show == NULL) - return (-EIO); - - return (ka->show(kobj, ka, buf)); -} - -static ssize_t -lkpi_kobj_attr_store(struct kobject *kobj, struct attribute *attr, - const char *buf, size_t count) -{ - struct kobj_attribute *ka = - container_of(attr, struct kobj_attribute, attr); - - if (ka->store == NULL) - return (-EIO); - - return (ka->store(kobj, ka, buf, count)); -} - -const struct sysfs_ops kobj_sysfs_ops = { - .show = lkpi_kobj_attr_show, - .store = lkpi_kobj_attr_store, -}; - static void linux_device_release(struct device *dev) { @@ -518,26 +348,6 @@ class_create(struct module *owner, const char *name) return (class); } -int -kobject_init_and_add(struct kobject *kobj, const struct kobj_type *ktype, - struct kobject *parent, const char *fmt, ...) -{ - va_list args; - int error; - - kobject_init(kobj, ktype); - kobj->ktype = ktype; - kobj->parent = parent; - kobj->name = NULL; - - va_start(args, fmt); - error = kobject_set_name_vargs(kobj, fmt, args); - va_end(args); - if (error) - return (error); - return kobject_add_complete(kobj, parent); -} - static void linux_kq_lock(void *arg) { diff --git a/sys/compat/linuxkpi/common/src/linux_kobject.c b/sys/compat/linuxkpi/common/src/linux_kobject.c new file mode 100644 index 000000000000..ddd0a58660f1 --- /dev/null +++ b/sys/compat/linuxkpi/common/src/linux_kobject.c @@ -0,0 +1,221 @@ +/*- + * Copyright (c) 2010 Isilon Systems, Inc. + * Copyright (c) 2010 iX Systems, Inc. + * Copyright (c) 2010 Panasas, Inc. + * Copyright (c) 2013-2021 Mellanox Technologies, Ltd. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include + +struct kobject * +kobject_create(void) +{ + struct kobject *kobj; + + kobj = kzalloc(sizeof(*kobj), GFP_KERNEL); + if (kobj == NULL) + return (NULL); + kobject_init(kobj, &linux_kfree_type); + + return (kobj); +} + + +int +kobject_set_name_vargs(struct kobject *kobj, const char *fmt, va_list args) +{ + va_list tmp_va; + int len; + char *old; + char *name; + char dummy; + + old = kobj->name; + + if (old && fmt == NULL) + return (0); + + /* compute length of string */ + va_copy(tmp_va, args); + len = vsnprintf(&dummy, 0, fmt, tmp_va); + va_end(tmp_va); + + /* account for zero termination */ + len++; + + /* check for error */ + if (len < 1) + return (-EINVAL); + + /* allocate memory for string */ + name = kzalloc(len, GFP_KERNEL); + if (name == NULL) + return (-ENOMEM); + vsnprintf(name, len, fmt, args); + kobj->name = name; + + /* free old string */ + kfree(old); + + /* filter new string */ + for (; *name != '\0'; name++) + if (*name == '/') + *name = '!'; + return (0); +} + +int +kobject_set_name(struct kobject *kobj, const char *fmt, ...) +{ + va_list args; + int error; + + va_start(args, fmt); + error = kobject_set_name_vargs(kobj, fmt, args); + va_end(args); + + return (error); +} + +static int +kobject_add_complete(struct kobject *kobj, struct kobject *parent) +{ + const struct kobj_type *t; + int error; + + kobj->parent = parent; + error = sysfs_create_dir(kobj); + if (error == 0 && kobj->ktype && kobj->ktype->default_attrs) { + struct attribute **attr; + t = kobj->ktype; + + for (attr = t->default_attrs; *attr != NULL; attr++) { + error = sysfs_create_file(kobj, *attr); + if (error) + break; + } + if (error) + sysfs_remove_dir(kobj); + } + return (error); +} + +int +kobject_add(struct kobject *kobj, struct kobject *parent, const char *fmt, ...) +{ + va_list args; + int error; + + va_start(args, fmt); + error = kobject_set_name_vargs(kobj, fmt, args); + va_end(args); + if (error) + return (error); + + return kobject_add_complete(kobj, parent); +} + +int +kobject_init_and_add(struct kobject *kobj, const struct kobj_type *ktype, + struct kobject *parent, const char *fmt, ...) +{ + va_list args; + int error; + + kobject_init(kobj, ktype); + kobj->ktype = ktype; + kobj->parent = parent; + kobj->name = NULL; + + va_start(args, fmt); + error = kobject_set_name_vargs(kobj, fmt, args); + va_end(args); + if (error) + return (error); + return kobject_add_complete(kobj, parent); +} + +void +linux_kobject_release(struct kref *kref) +{ + struct kobject *kobj; + char *name; + + kobj = container_of(kref, struct kobject, kref); + sysfs_remove_dir(kobj); + name = kobj->name; + if (kobj->ktype && kobj->ktype->release) + kobj->ktype->release(kobj); + kfree(name); +} + +static void +linux_kobject_kfree(struct kobject *kobj) +{ + kfree(kobj); +} + +const struct kobj_type linux_kfree_type = { + .release = linux_kobject_kfree +}; + +void +linux_kobject_kfree_name(struct kobject *kobj) +{ + if (kobj) { + kfree(kobj->name); + } +} + +static ssize_t +lkpi_kobj_attr_show(struct kobject *kobj, struct attribute *attr, char *buf) +{ + struct kobj_attribute *ka = + container_of(attr, struct kobj_attribute, attr); + + if (ka->show == NULL) + return (-EIO); + + return (ka->show(kobj, ka, buf)); +} + +static ssize_t +lkpi_kobj_attr_store(struct kobject *kobj, struct attribute *attr, + const char *buf, size_t count) +{ + struct kobj_attribute *ka = + container_of(attr, struct kobj_attribute, attr); + + if (ka->store == NULL) + return (-EIO); + + return (ka->store(kobj, ka, buf, count)); +} + +const struct sysfs_ops kobj_sysfs_ops = { + .show = lkpi_kobj_attr_show, + .store = lkpi_kobj_attr_store, +}; diff --git a/sys/conf/files b/sys/conf/files index 366bbc9e43bb..4d5585b0bb79 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4564,6 +4564,8 @@ compat/linuxkpi/common/src/linux_i2cbb.c optional compat_linuxkpi \ compile-with "${LINUXKPI_C}" compat/linuxkpi/common/src/linux_interrupt.c optional compat_linuxkpi \ compile-with "${LINUXKPI_C}" +compat/linuxkpi/common/src/linux_kobject.c optional compat_linuxkpi \ + compile-with "${LINUXKPI_C}" compat/linuxkpi/common/src/linux_kthread.c optional compat_linuxkpi \ compile-with "${LINUXKPI_C}" compat/linuxkpi/common/src/linux_lock.c optional compat_linuxkpi \ diff --git a/sys/modules/linuxkpi/Makefile b/sys/modules/linuxkpi/Makefile index bf40d64de9df..692f69c1f4e1 100644 --- a/sys/modules/linuxkpi/Makefile +++ b/sys/modules/linuxkpi/Makefile @@ -14,6 +14,7 @@ SRCS= linux_compat.c \ linux_i2c.c \ linux_i2cbb.c \ linux_kmod.c \ + linux_kobject.c \ linux_kthread.c \ linux_lock.c \ linux_netdev.c \ From nobody Sat Feb 17 21:32:40 2024 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 4Tchpw3zYyz59lD5; Sat, 17 Feb 2024 21:32:40 +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 4Tchpw1vnQz4gk1; Sat, 17 Feb 2024 21:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205560; 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=54QwJ03fCgUlSXreMJDo8e6Osa/iqYgiUjqMFgmOeTc=; b=AhryF3LbmVpExs2SEEqYU5WBShsvIWOi/4l3B0Gr5LQIGEIWP5YNNg/M2ROXbSE45t7Ww+ xyJxX8QGLRP/hiAYkhgT7QQ9gk3llWAX2KpZVAYC179gx2BvNl9rz+KAPbZJuQJ05Uucad qb4+0WHgDI0ApImpwlsHJ28QERxMxe8gdGPvUgaSfxs0NF8Lwd5zTMEaX7BHdQoI58PFqU lQtbw/OG9AYIKKrNdTmM9NECblAbGGZUfxXuDl0VOkg4tmdVmZNiWHPZLw0JK+IWC0wXjN G9jpFyQfBwFYQzMeIUR5J/rwI4CL/8NgxfhWs6KDbCcocKMQrXyYCdC8C7fvxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205560; 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=54QwJ03fCgUlSXreMJDo8e6Osa/iqYgiUjqMFgmOeTc=; b=TP1eyPI4mjyZeEC846mzsrrlVu4OD843NR9Tsn3EL2Og8zLwa3jA9z058rEAoJ+WvZbMkT yY6upgic6adXNs3EPP7xGW3e2EZOqGBDFHRmQL9ut5simxY8fiTuABBoCMCs/pX7CYCvg6 glor5ytYx9wJDCaRObPK4PvG4xQmKsBigjH1jrKFsLfCDPAiDXBa/t1yWghQGy6o9McfG8 /FAQCcMeIxIO/sS5jBrkJE6Wydms/TXsuiGhqkRKAnLwxBy2zWWbF+srGQ1w5yLV7WAvck SY1rFb1xkFJsOaLPgQ5NqYCspcAcAjKB0ipcuiKnDihwIVZDRwsdO0I4k4abBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708205560; a=rsa-sha256; cv=none; b=jxMw4JbvNjb8ZPMKtdbN3soclHKqyFqfSEnpG+7ra7qKmVBVWhd5XYM6W/LPWeXQtNruix mAYWxuALlrnuwyCvAkdQ5DMalGPTPN2NaSsX+G7H1QL1XHgbamk+NImEFTMKHkKc5WosKz v2FEKtZj5OsW8c3JV8jYTojpODynbSaWsKbwqLuAPw+ZCqxIzyMirvNZyOP3zdR44XdBkj PZB0ATABX/Uo7EyXH2ZMZon9xHqeB6R6YDnGeQtV+q3mhQ7nnTVikuT2vgQu1ZFUVkhfBK ZrcKPqpMkcImH+3eLlX9Eo79mcvn1tjBjhOJmjJArPNolAWE85G1mju4Bp9TfA== 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 4Tchpw11rWzPZS; Sat, 17 Feb 2024 21:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HLWeon019995; Sat, 17 Feb 2024 21:32:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HLWeqm019992; Sat, 17 Feb 2024 21:32:40 GMT (envelope-from git) Date: Sat, 17 Feb 2024 21:32:40 GMT Message-Id: <202402172132.41HLWeqm019992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 0fef6cb7299f - stable/14 - linuxkpi: Add `list_for_each_prev_safe()` in 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0fef6cb7299f541e1b94b84d2b9a9225133b9672 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=0fef6cb7299f541e1b94b84d2b9a9225133b9672 commit 0fef6cb7299f541e1b94b84d2b9a9225133b9672 Author: Jean-Sébastien Pédron AuthorDate: 2023-12-08 21:53:21 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-02-17 20:58:35 +0000 linuxkpi: Add `list_for_each_prev_safe()` in [Why] The amdgpu DRM driver started to use it in Linux 5.18. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D43021 (cherry picked from commit b723bcd05a991d446491e914f2b9f35e66227398) --- sys/compat/linuxkpi/common/include/linux/list.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/list.h b/sys/compat/linuxkpi/common/include/linux/list.h index a27abedc55b0..ca103a670109 100644 --- a/sys/compat/linuxkpi/common/include/linux/list.h +++ b/sys/compat/linuxkpi/common/include/linux/list.h @@ -225,6 +225,11 @@ list_del_init(struct list_head *entry) #define list_for_each_prev(p, h) for (p = (h)->prev; p != (h); p = (p)->prev) +#define list_for_each_prev_safe(p, n, h) \ + for (p = (h)->prev, n = (p)->prev; \ + p != (h); \ + p = n, n = (p)->prev) + #define list_for_each_entry_from_reverse(p, h, field) \ for (; &p->field != (h); \ p = list_prev_entry(p, field)) From nobody Sat Feb 17 21:32:41 2024 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 4Tchpx52vJz59ktP; Sat, 17 Feb 2024 21:32:41 +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 4Tchpx2wbXz4ggt; Sat, 17 Feb 2024 21:32:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205561; 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=YHMibg6dCA664U1Y0EB5qqlB6DaD8gXwZx9nWBHPC3U=; b=acZhlCkF4He9IB3w1O0f8GBNbVQ/9wFaxU3M0ZGK5S9LdtUXH/5tcejxRKLAUeZQNQ6Jea wayOVMjEdIBS9UW2ArrM/c100QS1aYIdgEhQfZOqxs1PszqevYULOgC78d5yzn2echGn5w gNNhYe/nRDzFM8i0NKZGKPJgZZsztOiZscA11sQLdXvnzLpdiFdYXo7l6T58rPU089qxsU dR+w+WL4cGa/VCiQE8JUPiL3wl4R2ucaEOANic4V6rxd4bMV4v1F0OjXiiEhCwV9DmYzYt pivfu0Qgm/gvRPciHbXaxnkQiEaD0RRwW+C+CZyXAG6wTUyNwPN3ey2gVR/n/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205561; 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=YHMibg6dCA664U1Y0EB5qqlB6DaD8gXwZx9nWBHPC3U=; b=H9QtoySjfm6EsMGFBpn5JvudAahVLzttXWcFFk85bC/5tBxgnj7PwnCJCMiiwgr+fdMxrm ENVXbrC79aLuPg5ov3DVhqCU2ebRBoCMy2/ZxDXOStjIe/IOLzV2iRoDMjpOF+31wtOZW6 nOXQuBZCqAbYWnDYYuuYSpGByPjMZa+QaShPLBAKv5uPG12Ic3tWW40OXPoesy5fKtKRDu KgfCSFTX0x+01TC4nz9FDrJzOvj/Lwrxuv5mgVz5xhPMmEMTgKqL/MXaEU2OLDmTIUZP6J EuGYAnKYIEzkzME1W25nWeZEsDiogjir68Ne+d+3KC1taYYB2oQgfloQTOjKnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708205561; a=rsa-sha256; cv=none; b=ffnD18owkfQYUpOrDTDdR5Dr5Rb/Xlm0GuBL/sTfcBnTP2vDaS3cAb6fsCP/HlatQHm06g MX14QylDbHSNoT19Cu0lTR7SvzAURgtlNkdED7irmk/FFGoSNmw1HCRIgL4anV7FvCHw1q mppTb03wFNvjBtuNLxMA3GOEmzfmGuFzQspakjdH8JhJ7Baf5Jk5Yp63D9/OE+enI3RB9x pc61f1aXOFPN4A8pLrTRfsbcDUksRBP5Nwl51sEfBqE6HtiPGM4PmXlr0leiRv9aRcenLg txlLr/g+X14tPvSWjuAl9L42nzM0/PFbnhYmmiWxBdlkFhmWtlAooLazJ0PlqQ== 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 4Tchpx1qbqzPJj; Sat, 17 Feb 2024 21:32:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HLWfjR020037; Sat, 17 Feb 2024 21:32:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HLWfPC020034; Sat, 17 Feb 2024 21:32:41 GMT (envelope-from git) Date: Sat, 17 Feb 2024 21:32:41 GMT Message-Id: <202402172132.41HLWfPC020034@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: af41c1bee4c6 - stable/14 - linuxkpi: Add `sysfs_create_link()` in 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: af41c1bee4c6b55fdbcb92294f62734b199d4402 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=af41c1bee4c6b55fdbcb92294f62734b199d4402 commit af41c1bee4c6b55fdbcb92294f62734b199d4402 Author: Jean-Sébastien Pédron AuthorDate: 2023-12-08 21:54:29 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-02-17 20:58:35 +0000 linuxkpi: Add `sysfs_create_link()` in [Why] The amdgpu DRM driver started to use it in Linux 5.18. [How] The function is a no-op as I'm not sure how to implement this with sysctls yet. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D43022 (cherry picked from commit 509707e8b6b7326c7f4793b6e291f0a8e6939412) --- sys/compat/linuxkpi/common/include/linux/sysfs.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/sysfs.h b/sys/compat/linuxkpi/common/include/linux/sysfs.h index 3dc1a18fdbd3..8b4160453a3a 100644 --- a/sys/compat/linuxkpi/common/include/linux/sysfs.h +++ b/sys/compat/linuxkpi/common/include/linux/sysfs.h @@ -152,6 +152,15 @@ sysfs_remove_file(struct kobject *kobj, const struct attribute *attr) sysctl_remove_name(kobj->oidp, attr->name, 1, 1); } +static inline int +sysfs_create_link(struct kobject *kobj __unused, + struct kobject *target __unused, const char *name __unused) +{ + /* TODO */ + + return (0); +} + static inline int sysfs_create_files(struct kobject *kobj, const struct attribute * const *attrs) { From nobody Sat Feb 17 21:32:42 2024 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 4Tchpy5rFgz59kqx; Sat, 17 Feb 2024 21:32:42 +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 4Tchpy3vy8z4gkV; Sat, 17 Feb 2024 21:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205562; 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=HhJNiZkOCdAFTl9WNE5bZPNBRvUlkaGX01UIQhpG5pk=; b=S7gl/dPXBRr37nBltCA32jG//GYrZBbm6lAqi4gQVyOOQv7qj7sJP6CO6+78HWDrrhSLCR 5pW9CMI8v8sKXGcFutUMYTHkLKd71gGTy9UcgCWVHIRjD1wBrZxJjwxiZ0tj5DTihjrVy5 ++WT9uVquOcK29DUprvMx22M30uvh0agXySMwY1bpSvIJSMPvjlebm14yVqab/DRGe1K+3 OaC0wtEYz0bmiuMsyiRPf9+9o4aL8e8fmLcdjnF5s2dezmOTmG0dGpm3gLP2ccwjIJA8fx 87JEA5N6sPL4OP0zfDAWny9ElLnqvLhl3LoKCoR5O4FeWHDdqhpp1DP4tiPXog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205562; 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=HhJNiZkOCdAFTl9WNE5bZPNBRvUlkaGX01UIQhpG5pk=; b=RfafxNIYOp4qzPZtnuJK0Ni05qUPFN3TRHUu+nNwZ53kp9bj34Ez/CKoFd/X0b0ASO/8DV gVtcBl2D140d9e6DXgEG9w1pgb+hZ1N5mtb/2COMBmg0MHbIMAk1v9ahTiM1oSeeDqBx7E YRfo7uyFuPxpcYFgM+vZUbJyEkzlYinqEPsZFUPg1+1UA41vGdVipWS6MmjrMELdgrC/MZ dTkYuS8C03sOUxpOE/jIP0XZjIeNJ5bdQOIyien5XX3IMDv14CtX0JbVVcK3eXdfWkc3Cp eox28N7LX4yH8BuyI0roqrWdCCfXyMvn/YrrfsYpayPbnKkdEMU//wjLgi6JsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708205562; a=rsa-sha256; cv=none; b=Ga/ekARlS9l+vJGutpXT//LS5lws9tbcYy5ei4XucRJnnKso++KPKqnO38d4JgSPzQBNoP 5QZhtatf0qwo2dSFxfqvfpO3AJwua0NU/BDZ4ffBlO7AgDv4WoPZSHPNn3HskzUdnrWaZV fxuaMhwrMUdnjcvP7gtHuXUb+Yy+2z9my7fHYM+1jaIlrNCMeHgfggae36sneqOO++UtoH AOqu+V4QIaPAtgqYl5yPh9FyzDoc33TlXc9GfHxTjGgBHupFNVvqiuDliKNYb2Ofoh6kJO i0iZ5ha/ktm8KdF/01yfCCUbIy6e3dYsmts3BBzuUgDzwVK7UVaFkmnRfv6/lg== 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 4Tchpy31D8zPMC; Sat, 17 Feb 2024 21:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HLWgU6020085; Sat, 17 Feb 2024 21:32:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HLWgqS020082; Sat, 17 Feb 2024 21:32:42 GMT (envelope-from git) Date: Sat, 17 Feb 2024 21:32:42 GMT Message-Id: <202402172132.41HLWgqS020082@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 0b3e4b3cc9bf - stable/14 - linuxkpi: Fix `__ATTR_RO()` in 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0b3e4b3cc9bf1dda9d86636da02e6f8f96282d6f Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=0b3e4b3cc9bf1dda9d86636da02e6f8f96282d6f commit 0b3e4b3cc9bf1dda9d86636da02e6f8f96282d6f Author: Jean-Sébastien Pédron AuthorDate: 2023-12-08 21:57:24 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-02-17 20:58:35 +0000 linuxkpi: Fix `__ATTR_RO()` in [Why] The passed structure may not have a `.store` field. This is the case in the amdgpu DRM driver starting with Linux 5.18. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D43023 (cherry picked from commit d752a5e82ac92603fadf82e7de75878e1f5d054a) --- sys/compat/linuxkpi/common/include/linux/sysfs.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/sysfs.h b/sys/compat/linuxkpi/common/include/linux/sysfs.h index 8b4160453a3a..4a65095d9eb1 100644 --- a/sys/compat/linuxkpi/common/include/linux/sysfs.h +++ b/sys/compat/linuxkpi/common/include/linux/sysfs.h @@ -54,7 +54,10 @@ struct attribute_group { .attr = { .name = __stringify(_name), .mode = _mode }, \ .show = _show, .store = _store, \ } -#define __ATTR_RO(_name) __ATTR(_name, 0444, _name##_show, NULL) +#define __ATTR_RO(_name) { \ + .attr = { .name = __stringify(_name), .mode = 0444 }, \ + .show = _name##_show, \ +} #define __ATTR_WO(_name) __ATTR(_name, 0200, NULL, _name##_store) #define __ATTR_RW(_name) __ATTR(_name, 0644, _name##_show, _name##_store) #define __ATTR_NULL { .attr = { .name = NULL } } From nobody Sat Feb 17 21:32:43 2024 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 4Tchq01xdnz59lDG; Sat, 17 Feb 2024 21:32:44 +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 4Tchpz4w8Zz4h5P; Sat, 17 Feb 2024 21:32:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205563; 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=sfbg8TwIZs6pqoQwtWVx/Jw9IFO4mF8xaZGlAlSxZ6c=; b=UC0Sv3Hdx3Wj4b6PrY9bZhtXkITOu2FgXfNlH6m60HGqlOMxyEytBgWlOsDKO7P7oGOMR0 A/va7uBBFkWSMYei5D8BxkPcqsMVXLQQpI5uRIop84Q9+bO/RORL/ITgPuJXoHvycyvcV9 oKfWQ3GiZs3DLgiu6NkcV/j/st0UjtNAE1DXqnnnQU54TQUhzmDGIH0alvb3lm3kq4tpIn M8Sd918kdbqpN+ted3H/ZrhutbJEYGkGdgLuuOk79PHaDv8JnxAIrm4D2nSgJLvZk6Grk9 pSHXF3SdTcaKG50dQSBLXnZ+jsD76lRCNnABvwpck1Wvse5W7RCO3si3JHkrqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205563; 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=sfbg8TwIZs6pqoQwtWVx/Jw9IFO4mF8xaZGlAlSxZ6c=; b=M/ZYS2pyG7A17taXo/RAQoUQ05a7n6ahKzi/Mk/oQYWmPdO5utGOiljwFzBshUDoKMpafE 0fAsPmIigFxy9kwCqy24XWLBCiTxLU36IE5HHkD5zGtjJ8gJPAeQYRt1EQ6UUGawQ/+ZXP CHHg8i92oyepuS23IPZhlfq7y7SJK0I8I5Jyb+1mhhTm2ap7Y3s3J9757WKWKX04Cg5nQe Kaxnh87zNM9f+MNlKZoH+q2UCPxIRykBxahGcQRl8GWzw6Pc4rxTtBEoS59Sg1lD6wsRpv THpQs+S4FSHLSqQ1BWqoWuBs7CRFliQbAdC5XqfQoMTYc+hTLWWgVSJ7DfWa1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708205563; a=rsa-sha256; cv=none; b=F5SMlpL8DzSZRkYOn7eqdFTANqEhaiUTrQTB/dicuwM+GzFw0pHRt2G1Y4YIddUwYNonX0 k9B4Lerbyewhqb+6PzCkoQy2GjXlmVgsZ9hrjpLvyWoSCB230GcGvTzCrIdtIYljRXetW7 MTdwgP3GWrHKMJE5qq0NSBVrnlT2nnoBCqAuNHn8xQyBNXorR9QEhKT4JhQd4mTsjBittn ntrtnF7a2EoOnI9QA24NXjID9wb1p43YrVlh0/dOy6srNv/E5kDABobpVb6A9PfxQHsdEx VHaT4Fgk2aLn1hLJaOBcQqDXC64Uqc1cgfcN1+TcHj/WLrvKA6hVyGMDF9v0kw== 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 4Tchpz42GhzPbD; Sat, 17 Feb 2024 21:32:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HLWhYV020130; Sat, 17 Feb 2024 21:32:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HLWhIQ020127; Sat, 17 Feb 2024 21:32:43 GMT (envelope-from git) Date: Sat, 17 Feb 2024 21:32:43 GMT Message-Id: <202402172132.41HLWhIQ020127@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 2f27a0b34052 - stable/14 - linuxkpi: Add