From nobody Mon Dec 23 10:06:50 2024 X-Original-To: dev-commits-src-main@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 4YGtwW1NzFz5gXlB; Mon, 23 Dec 2024 10:06: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YGtwW0q0fz4F4C; Mon, 23 Dec 2024 10:06:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734948411; 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=V2NAoj5EZCHg0x9tzo7mWFOI1pWSKMBQ7mMicBO/ZXc=; b=kEOJ9tsNa0BxVpCL2grj5dmRI19mkHlotPYy7Ty1Af+C53FwT+WOFwr0nLr4dcjSYkec7B +2MFe9xn1VAP8nsSMX6+LM5AlxhagkHiwU221516nJ9YRzK7sJfaOsrZLew6FuXjbxfe6k KRCPbezMPH3F+6REcBhP/KVyxDEjKCusiwQ32t3A0jilmE5FckqTEwHLWFsgXIfXMM+ymI X9qTWOFUWFfQlegOOII5smy3VPGzOjE4sq98f8XwR+ld6ciLgmidLqcteU/zR2jaxuOPDp eVldKvDdFVS/reQctneAKyXBsB7BtQUjU4ZFSOGbSVIeIbTqG1BeJu1d9yZcMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734948411; 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=V2NAoj5EZCHg0x9tzo7mWFOI1pWSKMBQ7mMicBO/ZXc=; b=qiEBZHk9WGY9NJUpWM85LKb19zftL8J7CmC8fppDxzReqZOF2D39TS9KqDbPeSB031Frmr pXy8dCYkG/0LMA985OHW4uhJrG/ETq7RfG3hUCUH+UJaoav7RMrxBK1BKTcYF/rdYEGkTf fFV0EPUEcvYiMkyOUQPHciRE5DIAHufA6iLrAoovYxgZHrvhUKiTYxwmshMWZkfw9zn3OW JKLhiQxRt5Lu/Xry9iOHb8j37ZMJuK5DCUk3uViNgqJXiy3Jc1kaUTj1/HyeEA6LdApwWQ MBrtIHxCRioERyYwlaK2UTqZf4bgKshSottOIrv7L8XFnjV/RRN8Y5UMJuunBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734948411; a=rsa-sha256; cv=none; b=fuWnr7/i23B6NFtXW67UxV60dZMuKvgoE61y5pdItJ4BJFYO63koMvIjqqvuJzxGFQ8Wqq XwtY/G0cGAUudL66qUdPXdkq0zHc7ZN2lCnf84PPIPazpRHxh9uTeM6FQX/l/gd9ydU3us 92ujWWhswZ10yW02oA3eVhwnlRCa7P0nWzCeKfLRuTUhMzG9hSuLXefALTkLgenFCKLY0Q d0RdOzwKCpfhRd9jktFlM4227kZwBIoPdMpPjdwHWfJ19MjuS0u5CeRw0WL1O5F22c/XQ8 N41iXgTk+eGLoC+NLVMXESXdjs6RkZB5pelzlkxY0Ilpp9BS1dEPJBH6Jinejg== 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 4YGtwW02Gjzpqk; Mon, 23 Dec 2024 10:06:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNA6o5n074066; Mon, 23 Dec 2024 10:06:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNA6o0r074063; Mon, 23 Dec 2024 10:06:50 GMT (envelope-from git) Date: Mon, 23 Dec 2024 10:06:50 GMT Message-Id: <202412231006.4BNA6o0r074063@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 6e8233df18c8 - main - hwpmc_x86: Fix NULL deref when loading on unsupported hardware List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e8233df18c8008e1a244c8528521a0369f61369 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=6e8233df18c8008e1a244c8528521a0369f61369 commit 6e8233df18c8008e1a244c8528521a0369f61369 Author: Bojan Novković AuthorDate: 2024-12-21 10:55:57 +0000 Commit: Bojan Novković CommitDate: 2024-12-23 10:00:57 +0000 hwpmc_x86: Fix NULL deref when loading on unsupported hardware The pmc_md_{intialize, finalize} routines rely on a machine-dependent structure to register the appropriate PMC interrupt handler. However, the vendor-specific routines that allocate this structure may return NULL for unsupported hardware, leading to a panic when the hwpmc module gets loaded. This patch adds additional checks that fix this issue. Reported by: Michael Butler (imb@protected-networks.net) Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D48168 --- sys/dev/hwpmc/hwpmc_x86.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_x86.c b/sys/dev/hwpmc/hwpmc_x86.c index 2c6c4cd148bf..2903c25ef5c9 100644 --- a/sys/dev/hwpmc/hwpmc_x86.c +++ b/sys/dev/hwpmc/hwpmc_x86.c @@ -230,7 +230,7 @@ struct pmc_mdep * pmc_md_initialize(void) { int i; - struct pmc_mdep *md; + struct pmc_mdep *md = NULL; /* determine the CPU kind */ if (cpu_vendor_id == CPU_VENDOR_AMD || @@ -238,17 +238,18 @@ pmc_md_initialize(void) md = pmc_amd_initialize(); else if (cpu_vendor_id == CPU_VENDOR_INTEL) md = pmc_intel_initialize(); - else + + if (md == NULL) return (NULL); + nmi_register_handler(md->pmd_intr); /* disallow sampling if we do not have an LAPIC */ - if (md != NULL && !lapic_enable_pcint()) + if (!lapic_enable_pcint()) for (i = 0; i < md->pmd_nclass; i++) { if (i == PMC_CLASS_INDEX_SOFT) continue; md->pmd_classdep[i].pcd_caps &= ~PMC_CAP_INTERRUPT; } - nmi_register_handler(md->pmd_intr); return (md); } @@ -256,9 +257,10 @@ pmc_md_initialize(void) void pmc_md_finalize(struct pmc_mdep *md) { - - lapic_disable_pcint(); - nmi_remove_handler(md->pmd_intr); + if (md != NULL) { + lapic_disable_pcint(); + nmi_remove_handler(md->pmd_intr); + } if (cpu_vendor_id == CPU_VENDOR_AMD || cpu_vendor_id == CPU_VENDOR_HYGON) pmc_amd_finalize(md); From nobody Mon Dec 23 14:39:51 2024 X-Original-To: dev-commits-src-main@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 4YH0zX0bhmz5h8rw; Mon, 23 Dec 2024 14:39: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH0zX0NMNz4d9B; Mon, 23 Dec 2024 14:39:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734964792; 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=5/Phi1KoqJJqMhj/BTuKdvzhWnxJ0aCkAyP8OR9x+yA=; b=TotvBHGHnq8ZHM1ITnOeR1gkHIICD0ZJwOYdWZCvaTcsESB2YBFslHqcDM3aWVwXslQ+53 97yV+paLkLdMUTAvTcxRNBqrRNGYfFIgm8kMjxzvwT2fARop/oo8e3XRwMPlC9zmK3fTrh LSjUNyA/0Z1TLV8Bxogjai4cfyQthDHoc+ynEcEvtpEaFMZnxZO8OPHkO2uXIYt+Yy9ad9 B7SShWiYxdBfxmKQvhwXoWdgYwmSXutTKuIKCFKN7qdbf7mkSRibnFz/vuJpLqUKghevc4 fm1CfcNC9mBrR3Dbs9tvnj8I4c9a5HtYUs9qv7yt+7GKx5oG8UtrMzdhYuZpsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734964792; 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=5/Phi1KoqJJqMhj/BTuKdvzhWnxJ0aCkAyP8OR9x+yA=; b=NcH6SZINb/S07MQSN9vFUoJ3uA5diVVnDH8AXmIRnZknPW845yC0Fjy/byTgvkJIThWLQM SklF/sacHsdRRtIjSq72sXotZCq9QqfksNsfojN/Sma7V9NCN0eDo4A+h7oYYcZvNuqWkl a9x+VWta+UA2dHKNmtpUV7zmyXfICfPbOiFsLeyKc90blsa1ek1eKzZOZNnGaJz1DnTrFQ AE1eUogacr/56kCnZg6AIqopYTviC6ZXR3FIhAI/Ok6hE5zO//7kum3ooAJIEYtcEIQQUN gCet6hhijq/Aa4KKUWe9bmhntUn1DOr9Z9TgNTZJVkmrhOyQRPU/juRLnR9DMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734964792; a=rsa-sha256; cv=none; b=TPy7PmuRmzax0inpZ0NybhCJLL6usbPIBQYxjm0pX+R08H2avRoycO3kfOAE1GaWkt1CVk ndvOLQDcRCM+HEuVWvbLN5tpQpQJs+TU9XUvPsaMx5OOqKWJaMpQm3TMHSFsuQtgTmBd8v NiTm2NZvCAlKRw7pVHPBMmf83//jPiOyRYjX3H0NW/JZclUIa8WwpFkfhq8089QQ+SYD5o 9G8kR3v496F+B62rzBbCUYi4XDk4WkQqeDQeLnuQP0pgKZ4mjSB5fcQL5cbJr0YeZXZvB1 U4m2uWbkXa81XAzXVIV2bXswvgOQDSqOsagABgKSDpLW28RYpaZHZvTEQFuqdg== 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 4YH0zW6zjQzxKw; Mon, 23 Dec 2024 14:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNEdpaJ079876; Mon, 23 Dec 2024 14:39:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNEdpwp079873; Mon, 23 Dec 2024 14:39:51 GMT (envelope-from git) Date: Mon, 23 Dec 2024 14:39:51 GMT Message-Id: <202412231439.4BNEdpwp079873@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: bc201841d139 - main - mac_do(4): Revamp manual page after MAC/do updates List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: bc201841d13928c2a088fb07ac0a010b36eafa13 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=bc201841d13928c2a088fb07ac0a010b36eafa13 commit bc201841d13928c2a088fb07ac0a010b36eafa13 Author: Olivier Certner AuthorDate: 2024-12-19 21:13:12 +0000 Commit: Olivier Certner CommitDate: 2024-12-23 14:39:35 +0000 mac_do(4): Revamp manual page after MAC/do updates The new manual page in particular describes MAC/do's new rules syntax and the jail support, as well as security considerations explaining the overall design and how to leverage it in the most secure fashion. Reviewed by: bapt, otis, Alexander Ziaee (in part) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48153 --- share/man/man4/mac_do.4 | 460 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 417 insertions(+), 43 deletions(-) diff --git a/share/man/man4/mac_do.4 b/share/man/man4/mac_do.4 index aa84a71b4953..9a9f669cd51c 100644 --- a/share/man/man4/mac_do.4 +++ b/share/man/man4/mac_do.4 @@ -1,38 +1,274 @@ .\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2024 Baptiste Daroussin +.\" Copyright (c) 2024 The FreeBSD Foundation .\" -.\" SPDX-License-Identifier: BSD-2-Clause +.\" Portions of this documentation were written by Olivier Certner +.\" at Kumacom SARL under sponsorship from the FreeBSD +.\" Foundation. .\" -.Dd May 22, 2024 +.Dd December 19, 2024 .Dt MAC_DO 4 .Os .Sh NAME .Nm mac_do -.Nd "policy allowing user to execute program as another user" +.Nd "policy allowing unprivileged users to change process credentials" .Sh SYNOPSIS To compile the -.Nm -policy into your kernel, place the following lines -in your kernel configruation file: +.Sy mac_do +policy into your kernel, place the following lines in your kernel configuration +file: .Bd -ragged -offset indent .Cd "options MAC" .Cd "options MAC_DO" .Ed +.Pp +Alternately, to load this policy module at boot time, place the following line +in your kernel configuration file: +.Bd -ragged -offset indent +.Cd "options MAC" +.Ed +.Pp +and in +.Xr loader.conf 5 : +.Bd -literal -offset indent +mac_do_load="YES" +.Ed .Sh DESCRIPTION The .Nm -policy grants users the ability to run processs as other users -according to predefined rules. +policy module allows unprivileged users to change process credentials according +to rules configured by the administrator. +It supports per-jail configuration. +.Pp +Currently, the +.Nm +policy module only produces effects to processes spwaned from the +.Pa /usr/bin/mdo +executable, please see +.Xr mdo 1 +for more details on this program. +.Sh CREDENTIALS RULES +Rules specify which transitions of process credentials +.Nm +will allow, based on current process credentials and the desired final ones. +They are passed by an administrator in the form of a string having the specific +syntax described below in a top-bottom manner. +They have been designed to be able to finely describe the desired target +credentials in a safe and compact way. +.Ss Top-Level List of Rules +At the top, rules are a possibly empty list of individual rules separated by +a semi-colon +.Pq Ql ";" : +.Dl Ao rules Ac \ ⟶\ Oo Ao rule Ac Oo So ";" Sc Ao rule Ac Oc Ns * Oc +They form a disjunction, i.e., +.Nm +authorizes a credentials transition as soon as at least one rule in the list +matches. .Pp -The exact set of kernel privileges granted are: -.Bl -inset -compact -offset indent -.It Dv PRIV_CRED_SETGROUPS -.It Dv PRIV_CRED_SETUID +One rule is composed of a +.Li Aq from +part +.Pq also called Dq match +and a +.Li Aq to +part +.Pq also called Dq target , +in this order, separated by a colon +.Pq Ql ":" : +.Dl Ao rule Ac \ ⟶\ Ao from Ac So ":" Sc Ao to Ac +.Ss Rule's Ao from Ac Part +The first part of a rule, +.Li Aq from , +is matched against the credentials of the process requesting some credentials +transition. +It has the form: +.Dl Ao from Ac \ ⟶\ Ao type Ac So = Sc Ao id Ac +.Pp +.Li Aq type +must be: +.Dl Ao type Ac \ ⟶\ Op So uid Sc | So gid Sc +i.e., one of the literal strings +.Ql uid +or +.Ql gid . +.Li Aq id +must be the numerical ID of a user or group, and is matched with the current +process real ID of the corresponding type. +.Ss Rule's Ao to Ac Part +The second part of a rule, +.Li Aq to , +is a comma-separated +.Pq Ql "," +non-empty list of target clauses: +.Dl Ao to Ac \ ⟶\ Ao target_clause Ac Oo So "," Sc Ao target_clause Ac Oc Ns * +Target clauses of a given rule also form a disjunction, i.e., the IDs they +specify are alternatives for the target credentials, except in some cases +described below. +.Pp +The next subsections describe the syntax of target clauses, the defaults that +apply and the principle of non-redundancy and non-contradiction in each rule's +.Li Aq to +part. +.Ss Target Clauses +A target clause in a rule's +.Li Aq to +part must be of one of the following forms: +.Dl Ao target_clause Ac \ ⟶\ So any Sc +.Dl Ao target_clause Ac \ ⟶\ Ao flags Ac Ao type Ac So = Sc Ao id Ac +The first form is a compact way to specify that any target credentials are +allowed. +The second form is similar to that of +.Li Aq from +clauses, with the following extensions: +.Bl -bullet -compact +.It +.Li Aq id +may also be a literal +.Ql * +or +.Ql any +or +.Ql "." . +.Ql * +and +.Ql any +both designate any ID for the specified +.Li Aq type , +and are treated identically. +.Ql "." +designates the process' current IDs for the specified +.Li Aq type , +as explained below. +.It +.Li Aq flags +may contain at most one of the +.Ql + , +.Ql - +and +.Ql "!" +characters, and may be non-empty only when +.Li Aq type +is +.Ql gid . +Additionally, if +.Li Aq id +is +.Ql * +or +.Ql any , +only the +.Ql + +flag may appear. +.El +.Pp +For target clauses of +.Ql gid +type, an absence of flag indicates that the specified group ID is allowed as the +real, effective and/or saved group IDs +.Pq the Do primary Dc groups . +Conversely, the presence of any allowed flag indicates that the specification +concerns supplementary groups. +Each flag has a specific meaning: +.Bl -bullet -compact +.It +.Ql + +indicates that the group ID is allowed as a supplementary group. +.It +.Ql "!" +indicates that the group ID is mandatory, i.e., it must be listed in the +supplementary groups. +.It +.Ql - +indicates that the group ID must not be listed in the supplementary groups. .El +A specification with +.Ql - +is only useful in conjunction with a +.Ql + Ns +-tagged specification where only one of them has +.Ql "." +as its +.Li Aq id . +Target clauses having the +.Ql "!" +or +.Ql - +flag are +.Dq forcing +clauses, and as such do not take part in the disjunction of the other +target clauses but rather unconditionally apply in their rule. +.Pp +.Ql "." +is a placeholder for IDs that the calling process already has on privilege +check. +For type +.Ql uid , +it designates any of the process' real, effective or +saved user IDs. +For type +.Ql gid , +its effect depends on whether flags are present. +If none is present, it designates any of the process' real, effective or saved +group IDs. +If one is present, it designates any of the process' supplementary groups. +.Ss Defaults for the Ao to Ac Part +If the +.Li Aq to +part does not list a target clause with type +.Ql uid , +any of the current user IDs of the calling process is accepted. +In other words, in this case, +.Nm +behaves as if a target clause of: +.Dl uid=. +had been listed. .Pp +Similarly, if the +.Li Aq to +part does not list a target clause with type +.Ql gid , +all the groups of the calling process are assumed to be required. +More precisely, each of the desired real, effective and saved group IDs must be +one of the current real, effective or saved group ID, and all supplementary +groups must be the same as those that are current. +It is as if the +.Li Aq to +part had contained the following two clauses: +.Dl gid=.,!gid=. +.Ss Non-Redundancy and Non-Contradiction in a Ao to Ac Part +No two target clauses of a single rule may express the exact same logical intent +nor contradictory ones. +.Pp +In practice, no two clauses may display the same ID except for group IDs but +only if, each time the same ID appears, it does so with a different flag, or no +flags only once. +Additionally, the specified flags in multiple occurences must not be +contradictory. +For example, the same group ID appearing with both +.Ql + +and +.Ql - +will cause rejection of the rule. +.Ss Parsing Specifics +Any amount of whitespace is allowed around tokens of the above grammar, except +that there may be no spaces between +.Li Aq flags +and +.Li Aq id +in target clauses. +.Pp +For convenience, numerical IDs may be specified as negative integers, which are +then converted to unsigned ones as specified in the C standard for the +.Vt uid_t +and +.Vt gid_t +types, which are both 64-bit unsigned integers. +.Sh RUNTIME CONFIGURATION The following .Xr sysctl 8 -MIBs are available: +knobs are available: .Bl -tag -width indent .It Va security.mac.do.enabled Enable the @@ -40,39 +276,177 @@ Enable the policy. (Default: 1). .It Va security.mac.do.rules -The set of rules. +The list of credential rules, whose syntax is described in the +.Sx CREDENTIALS RULES +section above. +This list is specific to each jail. +Please see the +.Sx JAIL SUPPORT +section below for more details on the interaction of +.Nm +with jails. +.It Va security.mac.do.print_parse_error +Logs a message on trying to set incorrect rules via the +.Va security.mac.do.rules +.Xr sysctl 8 +knob. .El +.Sh JAIL SUPPORT +.Nm +supports per-jail configuration of rules. .Pp -The rules consist of a list of elements separated by -.So , Sc . -Each element is of the form -.Sm off -.Do -.Op Cm uid | Cm gid -.Li = -.Ar fid -.Li : -.Ar tid -.Dc -.Sm on . -Where -.Ar fid -is the uid or gid of the user or group the rule applies to, and -.Ar tid -is the uid of the targetted user. -Two special forms are accepted for -.Ar tid : -.Va any -or -.Va * , -which allow to target any user. -.Sh EXAMPLES -The following rule: +By default, at creation, a new jail has no credentials rules, effectively +disabling +.Nm +for its processes. .Pp -.Dl security.mac.do.rules=uid=1001:80,gid=0:any +The following jail parameters are defined: +.Bl -tag -width indent +.It Va mac.do +Possible values are: +.Bl -tag -width "'disable'" -compact +.It Ql enable +.Nm +will enforce specific credential rules in the jail. +The +.Va mac.do.rules +jail parameter must also be set in this case. +.It Ql disable +Disables +.Nm +in the jail. +Strictly equivalent to jail creation's default behavior and to setting the rules +to an empty string. +.It Ql inherit +The jail's credentials rules are inherited from the jail's parent +.Pq which may themselves have been inherited . +Modified rules propagate to all children jails configured for inheritance. +.El +.It Va mac.do.rules +The credentials rules for the jail. +It is always equal to the value that can be retrieved by the +.Xr sysctl 8 +knob +.Va security.mac.do.rules +described in section +.Sx RUNTIME CONFIGURATION . +If set, and the jail parameter +.Va mac.do +is not so explicitly, the value of the latter will default to +.Ql disable +if empty, else to +.Ql enable . +.El .Pp -means the user with the uid 1001 can execute processes as user with uid 80, -all the users which belongs to the group gid 0 can execute processes as any user. +Each jail must have +.Xr mdo 1 +installed at path +.Pa /usr/bin/mdo , +as this path is currently not configurable. +.Sh EXAMPLES +Here are several examples of single rules matching processes having a real user +ID of 10001: +.Bl -tag -width indent +.It Li uid=10001:uid=10002 +Allows the process to switch any of its real, effective or saved user ID to +10002, but keeping the groups it is already in, and with the same +primary/supplementary groups split. +.It Li uid=10001:uid=10002,uid=10003 +Same as the first example, but also allows to switch to UID 10003 instead of +10002. +.It Li uid=10001:uid=10002,gid=10002 +Same as the first example, but the new primary groups must be set to 10002 and +no supplementary groups should be set. +.It Li uid=10001:uid=10002,gid=10002,+gid=.\& +Same as the previous example, but in addition allowing to retain any current +supplementary groups. +.It Li uid=10001:uid=10002,gid=10002,!gid=.\& +Same as the previous example, but with the additional constraint that all +current supplementary groups must be kept. +.It Li uid=10001:uid=10002,gid=10002,+gid=.,-gid=10001 +Same as +.Ql uid=10001:uid=10002,gid=10002,+gid=.\& +above, but 10001 cannot be retained as a supplementary group. +.It Li uid=10001:uid=10002,gid=10002,+gid=.,!gid=10003 +Same as +.Ql uid=10001:uid=10002,gid=10002,+gid=.\& +above, with the additional constraint that 10003 must appear in the +supplementary groups. +.It Li uid=10001:uid=10002,gid=*,+gid=* +Same as the first example, but lifting any constraints on groups, allowing the +process to become part of any groups it sees fit. +.El +.Pp +Here are several examples of single rules matching processes having a real group +ID of 10001: +.Bl -tag -width indent +.It Li gid=10001:uid=0 +Makes 10001 a more powerful +.Ql wheel +group, allowing its members to switch to root without password. +.It Li gid=10001:gid=10002 +Allows the process to enter GID 10002 as a primary group, but only if +giving up all its supplementary groups. +.It Li security.mac.do.rules=gid=10001:gid=10002,+gid=.\& +Same as the previous example, but allows to retain any current supplementary +groups. +.It Li gid=10001:gid=10002,!gid=.\& +Same as the previous example, but with the additional constraint that all +current supplementary groups must be kept. +.El .Sh SEE ALSO .Xr mdo 1 , -.Xr mac 4 +.Xr setcred 2 , +.Xr mac 4 , +.Xr jail 8 , +.Xr sysctl 8 +.Sh AUTHORS +.An Olivier Certner Aq Mt olce@FreeBSD.org +.An Baptiste Daroussin Aq Mt bapt@FreeBSD.org +.Sh BUGS +Currently, +.Nm +considers only credentials transitions requested through the +.Xr setcred 2 +system call. +This system call was in large part created so that +.Nm +can see whole credentials transitions to decide whether to authorize them, which +the traditional UNIX's piecewise approach of successively changing different +parts of them cannot allow. +.Pp +However, calls to traditional or standard credentials-changing functions can be +considered as full transitions on their own, however limited, and as such should +be equally monitored by +.Nm . +Future work will lift this restriction. +.Sh SECURITY CONSIDERATIONS +The threat model for +.Nm +is to consider userland programs as generally untrustable to decide upon which +credentials changes are acceptable. +It is in contrast with the traditional UNIX way to change credentials, in which +specialized programs are installed with the setuid bit, giving them full +administrator privileges so that they are effectively able to establish new +ones. +Vulnerabilities in such credentials-changing programs can have catastrophic +consequences on the integrity of the system. +.Pp +Consequently, +.Nm +does not rely on companion userland programs to decide whether some credentials +transition is acceptable. +Instead, it maintains its own configuration independently from the userland +password and group databases. +Establishing this configuration currently itself relies on userland programs +issuing calls to +.Xr sysctl 3 +or +.Xr jail 2 . +It should thus be established near system boot or jail start, before any +possible attacks could happen on the system, and further measures should be +taken to ensure that potential corruptions does not affect the configuration in +subsequent restarts, such as re-establishing pristine state or ensuring that the +boot procedure up to the configuration of +.Nm +can be trusted. From nobody Mon Dec 23 14:47:51 2024 X-Original-To: dev-commits-src-main@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 4YH18m1V6Yz5h9mP; Mon, 23 Dec 2024 14:47: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH18m0zdSz4f2l; Mon, 23 Dec 2024 14:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734965272; 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=n7AIw521r54ou6rf/MR2nE9BhLWECHVxTEXebH27qdo=; b=OgkI16OVuvvifoHiyVHU4WBdxhqJLxccjJxab8qBG5ZotHKuXCE4crmN/2Sh6pwH9Sf6R0 h+Cos7+JEYYQx3gZ8DnskShb/CatAP+iI/CW5jYKWv5iuxCZJu9c25lXjWTb1AxtBcmQbT uXywokDflkPDP5q3m32FFtcX1Qri5dmJDhKqTfvGaUpMLC+a1r+o9uU+1SDLRA7EXqyAb5 8FGfljv9nb31hQbl3taiA9ifMRO+Qd0EtGe+V5EmgBYd5/NuQTyu4AHJSF8DhimMGm98Jv O4qkHwJ0lD1pUTyDmuQaaKQLuEyv6/UcryZRhZOh4YrfkuZfQofDCxhLCJQJuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734965272; 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=n7AIw521r54ou6rf/MR2nE9BhLWECHVxTEXebH27qdo=; b=ScOuPKUiwvzhLvnKUTODdV02e/cjFjCoQa4h1UIp10lE0SO9r6EvyxIzhwWkkD6hBtEpaP GfUxg/Uf/fHUnRd1W4HDITmy3IJ/+OSFqPru8WXxgR/6but4fExPLKb1ufr6g6mE5kHTVv Og/8fuO/oppi0ySdwsicNsqY1e8NEz4E1ilMcYL1CVCPaQtPzdEWIeB4uQpDxFJkWI7BKK vWXIpoxMVx8llC/DolxxFTmgKSP0uB2QyB1IvzTps20GBe9IJEdyuUBnbU3J0+RLToENpW Mwps4YAR6EhZEu0+TvqdvYKS7iDyA11r+EI9g8r3NAIZsP/YUBe1Y+lc2TNnmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734965272; a=rsa-sha256; cv=none; b=FwNYAcCXBviosOz7RZ0q1qcueE8mpZe6hVvNqCybVmdUB63elltACXUoFELmTbZN3JVyeY rWhSswhCpj9DUtKh5sgaHvQPg87fKb1WJk+9coi+LP/DWlZX8zWyo2Mq/MbjyCnlgTlH4q rcfMXNQ8xxtEikxmE1HlqUQukXh0icC7yTMC76VT/8L1OFFZsDCpWxjr8BOWbPH0Kp6/Kz Y+bBN8dwvVm2iJg0vufHDpYynCpbYQjeUwpHnsXKn9klQrf2/wh15BMkZ7rrz46Ro9Vs7e IU4hr2NGMfZ9vuV2znTw1Hpns98EnfHH9UMK8FARxOwIQiuHsfGu6crZaxupNA== 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 4YH18m0bhnzy6t; Mon, 23 Dec 2024 14:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNElpLr097353; Mon, 23 Dec 2024 14:47:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNElpeJ097350; Mon, 23 Dec 2024 14:47:51 GMT (envelope-from git) Date: Mon, 23 Dec 2024 14:47:51 GMT Message-Id: <202412231447.4BNElpeJ097350@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 1ccbdf561f41 - main - tmpfs: Rework file handles List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 1ccbdf561f417f9fe802131d5b1756ac45fd314d Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=1ccbdf561f417f9fe802131d5b1756ac45fd314d commit 1ccbdf561f417f9fe802131d5b1756ac45fd314d Author: Olivier Certner AuthorDate: 2024-12-06 20:23:59 +0000 Commit: Olivier Certner CommitDate: 2024-12-23 14:46:55 +0000 tmpfs: Rework file handles Change 'struct tmpfs_fid_data' to behave consistently with the private structure other FSes use. In a nutshell, make it a full alias of 'struct fid', instead of just using it to fill 'fid_data'. This implies adding a length field at start (aliasing 'fid_len' of 'struct fid'), and filling 'fid_len' with the full size of the aliased structure. To ensure that the new 'struct tmpfs_fid_data' is smaller than 'struct fid', which the compile-time assert introduced in commit 91b5592a1e1af974 ("fs: Add static asserts for the size of fid structures") checks (and thus was not strong enough when added), use '__packed'. A consequence of this change is that copying the 'struct tmpfs_fid_data' into a stack-allocated variable becomes unnecessary, we simply rely on the compiler emitting the proper code on seeing '__packed' (and on the start of 'struct tmpfs_fid_data' being naturally aligned, which is normally guaranteed by kernel's malloc() and/or inclusion in 'struct fhandle'). Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47956 --- sys/fs/tmpfs/tmpfs.h | 5 ++--- sys/fs/tmpfs/tmpfs_vfsops.c | 16 ++++++---------- sys/fs/tmpfs/tmpfs_vnops.c | 16 ++++------------ 3 files changed, 12 insertions(+), 25 deletions(-) diff --git a/sys/fs/tmpfs/tmpfs.h b/sys/fs/tmpfs/tmpfs.h index 58f8720c3f84..52307cc7c7b2 100644 --- a/sys/fs/tmpfs/tmpfs.h +++ b/sys/fs/tmpfs/tmpfs.h @@ -448,11 +448,10 @@ struct tmpfs_mount { * NFS code. */ struct tmpfs_fid_data { + unsigned short tfd_len; ino_t tfd_id; unsigned long tfd_gen; -}; -_Static_assert(sizeof(struct tmpfs_fid_data) <= MAXFIDSZ, - "(struct tmpfs_fid_data) is larger than (struct fid).fid_data"); +} __packed; struct tmpfs_dir_cursor { struct tmpfs_dirent *tdc_current; diff --git a/sys/fs/tmpfs/tmpfs_vfsops.c b/sys/fs/tmpfs/tmpfs_vfsops.c index dd48a24dab2f..431893b77bb9 100644 --- a/sys/fs/tmpfs/tmpfs_vfsops.c +++ b/sys/fs/tmpfs/tmpfs_vfsops.c @@ -585,29 +585,25 @@ static int tmpfs_fhtovp(struct mount *mp, struct fid *fhp, int flags, struct vnode **vpp) { - struct tmpfs_fid_data tfd; + struct tmpfs_fid_data *tfd; struct tmpfs_mount *tmp; struct tmpfs_node *node; int error; - if (fhp->fid_len != sizeof(tfd)) + if (fhp->fid_len != sizeof(*tfd)) return (EINVAL); - /* - * Copy from fid_data onto the stack to avoid unaligned pointer use. - * See the comment in sys/mount.h on struct fid for details. - */ - memcpy(&tfd, fhp->fid_data, fhp->fid_len); + tfd = (struct tmpfs_fid_data *)fhp; tmp = VFS_TO_TMPFS(mp); - if (tfd.tfd_id >= tmp->tm_nodes_max) + if (tfd->tfd_id >= tmp->tm_nodes_max) return (EINVAL); TMPFS_LOCK(tmp); LIST_FOREACH(node, &tmp->tm_nodes_used, tn_entries) { - if (node->tn_id == tfd.tfd_id && - node->tn_gen == tfd.tfd_gen) { + if (node->tn_id == tfd->tfd_id && + node->tn_gen == tfd->tfd_gen) { tmpfs_ref_node(node); break; } diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index 162977b8abf7..83e43ec7ba13 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -1706,23 +1706,15 @@ vop_vptofh { }; */ { - struct tmpfs_fid_data tfd; + struct tmpfs_fid_data *const tfd = (struct tmpfs_fid_data *)ap->a_fhp; struct tmpfs_node *node; - struct fid *fhp; _Static_assert(sizeof(struct tmpfs_fid_data) <= sizeof(struct fid), "struct tmpfs_fid_data cannot be larger than struct fid"); node = VP_TO_TMPFS_NODE(ap->a_vp); - fhp = ap->a_fhp; - fhp->fid_len = sizeof(tfd); - - /* - * Copy into fid_data from the stack to avoid unaligned pointer use. - * See the comment in sys/mount.h on struct fid for details. - */ - tfd.tfd_id = node->tn_id; - tfd.tfd_gen = node->tn_gen; - memcpy(fhp->fid_data, &tfd, fhp->fid_len); + tfd->tfd_len = sizeof(*tfd); + tfd->tfd_gen = node->tn_gen; + tfd->tfd_id = node->tn_id; return (0); } From nobody Mon Dec 23 15:30:51 2024 X-Original-To: dev-commits-src-main@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 4YH26M1zKmz5Wq8w; Mon, 23 Dec 2024 15:30: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH26M1XHQz4hWl; Mon, 23 Dec 2024 15:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734967851; 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=tz5uG5NfQ+O6QogSOplcpVtHWqPpsBbzgYt0lbr3Als=; b=OFHGGhI7KtwQr6sVzoCJXY4nT4eF5kou3V9hxB0LaTjuAsMAiRov9QsnddEpTbjCsB3l8/ ifww/8j313dblPJuolTxYwmBjwJXEn5Gsp3mO5HNYr/CVafsl2wFfLUEgVD88PJ+uO58mF dNeqp6UspbokB1yABTRfPpAJ194DA/SZojS5GwmYg+ksbnhl9muqEZvMpEooyP7u6e+tS2 WU3O8O0HiEzuaQo4JE3kt90HhbzdC8/N5dcuxMpdkYusOOLGZj/q1LsplYI/Lgyp02HAIH 7beVmbD41dyKmFx2Yui2S5OwRolNxMKLxGy2YuwppbVd34T6gN9CT48MSlP3AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734967851; 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=tz5uG5NfQ+O6QogSOplcpVtHWqPpsBbzgYt0lbr3Als=; b=xLFdTHemXzfYwlpVUyVtSY6DWXdX5EzwiqkW/IUo7X8FmVwM5ALvEpz7OZyqiRwgKwy9HN gEVTVREWLiEnf6CBJu8jBDFVBC4rSSkpUIbg19CASuri30HBJ+ixlK5Hm54zDhj5ab1gJW CKCIbXdI7tGZ7BOP+7ah/9VPl/UwcSRibsO7ixPhYLuaDAQWbrI+7dQl7z+0eN/or+SAh9 FgJMnPsVbNHxG9on631gntM38TqihftqmCwrO4L6mW5kmKcGnLatgnd1pkdfDz7SEXY3Ib PuMCqAgBOwPyi746bA1siB7vs1k4OkaK73Z2OuHkL7QDqJDC/Orc4feXP7Smng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734967851; a=rsa-sha256; cv=none; b=xxo7IEtyQCG6cVKfGT3ebPinSEq0w/+tEIcp5IsczrSwBHt9Kfnu4EWsWvO8w0xnq5htrr 17gRImMpXeYEEL/IGmCLYlO13Pw6mgaNsAYWLC06HfMZmLHlrzmqtsQgGAtnu3Dn8lDCik MA9je9OUTScbS5I6jLmKn8JFkLPD8X8U9EHuWIkuLc7zcQiwEy+DlbaDB3fyW29SVNUIBq XMHnhvCJBODnVVfPclZW4/+v/H2F6a0GhtGki/qfcuqZHYceTUHxy8LdClFeUIGMRjRNvp 6UVc9pVeDlMj/pU75jzpivSew8coFyIFP0FvBvxnTenc7pQ2NI+mAASQon2jrA== 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 4YH26M18XJzycN; Mon, 23 Dec 2024 15:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNFUp33082032; Mon, 23 Dec 2024 15:30:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFUpRp082029; Mon, 23 Dec 2024 15:30:51 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:30:51 GMT Message-Id: <202412231530.4BNFUpRp082029@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 2069f6ecb1b1 - main - makefs: Crudely fix a sprintf warning List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2069f6ecb1b1268deac980176c652ffab264970e Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2069f6ecb1b1268deac980176c652ffab264970e commit 2069f6ecb1b1268deac980176c652ffab264970e Author: Ed Maste AuthorDate: 2024-12-22 16:00:49 +0000 Commit: Ed Maste CommitDate: 2024-12-23 15:30:03 +0000 makefs: Crudely fix a sprintf warning Reviewed by: kevans Obtained from: OpenBSD d95291fdb2dc Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48178 --- usr.sbin/makefs/cd9660.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index 500e3c08c7af..19bd6e0d21b0 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -140,10 +140,11 @@ static void cd9660_convert_structure(iso9660_disk *, fsnode *, cd9660node *, int static void cd9660_free_structure(cd9660node *); static int cd9660_generate_path_table(iso9660_disk *); static int cd9660_level1_convert_filename(iso9660_disk *, const char *, char *, - int); + size_t, int); static int cd9660_level2_convert_filename(iso9660_disk *, const char *, char *, + size_t, int); +static int cd9660_convert_filename(iso9660_disk *, const char *, char *, size_t, int); -static int cd9660_convert_filename(iso9660_disk *, const char *, char *, int); static void cd9660_populate_dot_records(iso9660_disk *, cd9660node *); static int64_t cd9660_compute_offsets(iso9660_disk *, cd9660node *, int64_t); #if 0 @@ -222,7 +223,8 @@ cd9660_set_defaults(iso9660_disk *diskStructure) memset(diskStructure->primaryDescriptor.abstract_file_id, 0x20,37); memset(diskStructure->primaryDescriptor.bibliographic_file_id, 0x20,37); - strcpy(diskStructure->primaryDescriptor.system_id, "FreeBSD"); + strlcpy(diskStructure->primaryDescriptor.system_id, "FreeBSD", + sizeof(diskStructure->primaryDescriptor.system_id)); /* Boot support: Initially disabled */ diskStructure->has_generic_bootimage = 0; @@ -797,7 +799,7 @@ cd9660_translate_node_common(iso9660_disk *diskStructure, cd9660node *newnode) memset(temp, 0, ISO_FILENAME_MAXLENGTH_WITH_PADDING); (void)cd9660_convert_filename(diskStructure, newnode->node->name, - temp, !(S_ISDIR(newnode->node->type))); + temp, sizeof(temp), !(S_ISDIR(newnode->node->type))); flag = ISO_FLAG_CLEAR; if (S_ISDIR(newnode->node->type)) @@ -1100,7 +1102,9 @@ cd9660_rename_filename(iso9660_disk *diskStructure, cd9660node *iter, int num, while (digits > 0) { digit = (int)(temp / powers); temp = temp - digit * powers; - sprintf(&tmp[numbts] , "%d", digit); + snprintf(&tmp[numbts], + ISO_FILENAME_MAXLENGTH_WITH_PADDING - numbts, + "%d", digit); digits--; numbts++; powers = powers / 10; @@ -1566,7 +1570,7 @@ cd9660_compute_full_filename(cd9660node *node, char *buf) */ static int cd9660_level1_convert_filename(iso9660_disk *diskStructure, const char *oldname, - char *newname, int is_file) + char *newname, size_t newnamelen, int is_file) { /* * ISO 9660 : 10.1 @@ -1577,6 +1581,7 @@ cd9660_level1_convert_filename(iso9660_disk *diskStructure, const char *oldname, int namelen = 0; int extlen = 0; int found_ext = 0; + char *orignewname = newname; while (*oldname != '\0' && extlen < 3) { /* Handle period first, as it is special */ @@ -1613,7 +1618,7 @@ cd9660_level1_convert_filename(iso9660_disk *diskStructure, const char *oldname, if (!found_ext && !diskStructure->omit_trailing_period) *newname++ = '.'; /* Add version */ - sprintf(newname, ";%i", 1); + snprintf(newname, newnamelen - (newname - orignewname), ";%i", 1); } return namelen + extlen + found_ext; } @@ -1621,7 +1626,7 @@ cd9660_level1_convert_filename(iso9660_disk *diskStructure, const char *oldname, /* XXX bounds checking! */ static int cd9660_level2_convert_filename(iso9660_disk *diskStructure, const char *oldname, - char *newname, int is_file) + char *newname, size_t newnamelen, int is_file) { /* * ISO 9660 : 7.5.1 @@ -1635,6 +1640,7 @@ cd9660_level2_convert_filename(iso9660_disk *diskStructure, const char *oldname, int namelen = 0; int extlen = 0; int found_ext = 0; + char *orignewname = newname; while (*oldname != '\0' && namelen + extlen < 30) { /* Handle period first, as it is special */ @@ -1675,7 +1681,7 @@ cd9660_level2_convert_filename(iso9660_disk *diskStructure, const char *oldname, if (!found_ext && !diskStructure->omit_trailing_period) *newname++ = '.'; /* Add version */ - sprintf(newname, ";%i", 1); + snprintf(newname, newnamelen - (newname - orignewname), ";%i", 1); } return namelen + extlen + found_ext; } @@ -1690,15 +1696,15 @@ cd9660_level2_convert_filename(iso9660_disk *diskStructure, const char *oldname, */ static int cd9660_convert_filename(iso9660_disk *diskStructure, const char *oldname, - char *newname, int is_file) + char *newname, size_t newnamelen, int is_file) { assert(1 <= diskStructure->isoLevel && diskStructure->isoLevel <= 2); if (diskStructure->isoLevel == 1) return(cd9660_level1_convert_filename(diskStructure, - oldname, newname, is_file)); + oldname, newname, newnamelen, is_file)); else if (diskStructure->isoLevel == 2) return (cd9660_level2_convert_filename(diskStructure, - oldname, newname, is_file)); + oldname, newname, newnamelen, is_file)); abort(); } @@ -1910,7 +1916,7 @@ cd9660_create_virtual_entry(iso9660_disk *diskStructure, const char *name, temp->isoDirRecord = emalloc(sizeof(*temp->isoDirRecord)); cd9660_convert_filename(diskStructure, tfsnode->name, - temp->isoDirRecord->name, file); + temp->isoDirRecord->name, sizeof(temp->isoDirRecord->name), file); temp->node = tfsnode; temp->parent = parent; From nobody Mon Dec 23 15:41:13 2024 X-Original-To: dev-commits-src-main@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 4YH2LK2CJxz5Wqgd; Mon, 23 Dec 2024 15:41: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH2LK1dQDz4kvR; Mon, 23 Dec 2024 15:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968473; 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=3t7AndXF+Ft5zrUn0w4KZU1YreElTciHWhThhJQffRo=; b=OD84sHKhQvVJE7RP5QUa9ZIt/DtE2FQ7pmgeiwDS39bym6nxgRSdhinUf7GDaLv7NOKM6Z sd2XyxRfWqMvNrroL/Wf8DRMT1ydoeCq3lhRQE1rD8yX+rGA0AHpI+3qu9X9oa6GhHyt5B TJMuWxiieZripGTfckc1Yfld7Uir8JpMNdgk4A6Z5vM3nDobubnk8ZyHh41YMH6kRofzW5 U9CMxm6BPWa8BTliYeE3ZrC0yrXWGLg07Y+q2GR1aUHNm2KnHy1XlQInEOzkfE2vm9cTs6 oc6+E7XnT4w8tUXhwQMPAZpRK60p4Lno26mbGDpTynaFG89aJ2xh0RgIsENpLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968473; 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=3t7AndXF+Ft5zrUn0w4KZU1YreElTciHWhThhJQffRo=; b=CsHBQpt6jnkmP1Zep0cZSU/3ByHZQwxyd4Psj5lO3FTz+5TZWlHg+Wah14SBQdytAiBu8L Y0yNtawOBVG4WEwtKm+ZrEBN7xpYt16YB/uioNELkxPhCgtXZhlWIAWfrjDCxir4wIeR0u 6P+h+6L/ndcSK+McOZcU0XdUHgZ3HH7fzwAKJT84MLoVeFggwBoaeebkDwbxrpeNR7hegq AhIdRNUC5En84zrIImlWXrr7GWAsjlP62LpOll8HWHvSaEJoOJmhamIYm+oHKSPmzJhcHH gfY15cZyLpkff7TDQSdRcsgEb+ZG0TRUyyvmG9sr+snLEJmzu+0kJfcwFgfbzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968473; a=rsa-sha256; cv=none; b=oEQjN/ffo6Oa7Vypbo+lhmfJ306+A3CJKXhq+75cVl+PrtdC/mwl3xC4uGoIni66V+Is3z jvX/RdSEMentZjPH0yu1ybs5aRIHZLFqJdDSXGOlyTWtfpIVDqSJ2iLhaIXWVX04cXyODl lQbVRxUCRH/Bvw2JG+p58NptCnkMILjD4OnkK1MVFigayV85cyEBvTNTfSrpTO123p/ZAZ 4opGs9oAkYy0L0NhqMsp357K48oVy1J0ti/V0WXhA6QFwvppyuvPJ4JjWKVa2xUKWkVu2E D1yY5bPpi+iJ24BwqSA3f0lIuSQgdXb+WmQLqD77O/cCLWh2oc7482N9Heak4Q== 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 4YH2LK1DnfzyjS; Mon, 23 Dec 2024 15:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNFfDt8003761; Mon, 23 Dec 2024 15:41:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFfDDC003758; Mon, 23 Dec 2024 15:41:13 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:41:13 GMT Message-Id: <202412231541.4BNFfDDC003758@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: c9756953bded - main - inpcb: Further restrict binding to a port owned by a different UID List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9756953bded0d8428027fa3e812c9bdac069252 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c9756953bded0d8428027fa3e812c9bdac069252 commit c9756953bded0d8428027fa3e812c9bdac069252 Author: Mark Johnston AuthorDate: 2024-12-23 15:31:11 +0000 Commit: Mark Johnston CommitDate: 2024-12-23 15:41:06 +0000 inpcb: Further restrict binding to a port owned by a different UID See commit 4f02a7d739b3 for more background. I cannot see a good reason to continue ignoring mismatching UIDs when binding to INADDR_ANY. Looking at the sdr.V2.4a7n sources (mentioned in bugzilla PR 7713), there is a CANT_MCAST_BIND hack wherein the application binds to INADDR_ANY instead of a multicast address, but CANT_MCAST_BIND isn't defined for FreeBSD builds. It seems unlikely that we still have a use-case for allowing sockets from different UIDs to bind to the same port when binding to the unspecified address. And, as noted in D47832, applications like sdr would have been broken by the inverted SO_REUSEPORT check removed in that revision, apparently without any bug reports. Let's break compatibility and simply disallow this case outright. Also, add some comments, remove a hack in a regression test which tests this funtionality, and add a new regression test to exercise the remaining checks that were added in commit 4658dc8325e03. MFC after: 1 month Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D47870 --- sys/netinet/in_pcb.c | 11 ++++- sys/netinet6/in6_pcb.c | 11 ++++- tests/sys/netinet/socket_afinet.c | 86 ++++++++++++++++++++++++++++++++++----- 3 files changed, 94 insertions(+), 14 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 432cae68062a..11bc68a3915a 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -919,13 +919,20 @@ in_pcbbind_avail(struct inpcb *inp, const struct in_addr laddr, if (!IN_MULTICAST(ntohl(laddr.s_addr)) && priv_check_cred(inp->inp_cred, PRIV_NETINET_REUSEPORT) != 0) { + /* + * If a socket owned by a different user is already + * bound to this port, fail. In particular, SO_REUSE* + * can only be used to share a port among sockets owned + * by the same user. + * + * However, we can share a port with a connected socket + * which has a unique 4-tuple. + */ t = in_pcblookup_local(inp->inp_pcbinfo, laddr, lport, INPLOOKUP_WILDCARD, cred); if (t != NULL && (inp->inp_socket->so_type != SOCK_STREAM || in_nullhost(t->inp_faddr)) && - (!in_nullhost(laddr) || - !in_nullhost(t->inp_laddr)) && (inp->inp_cred->cr_uid != t->inp_cred->cr_uid)) return (EADDRINUSE); } diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 51f2a29918fe..b44fe5ed3553 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -239,13 +239,20 @@ in6_pcbbind_avail(struct inpcb *inp, const struct sockaddr_in6 *sin6, if (!IN6_IS_ADDR_MULTICAST(laddr) && priv_check_cred(inp->inp_cred, PRIV_NETINET_REUSEPORT) != 0) { + /* + * If a socket owned by a different user is already + * bound to this port, fail. In particular, SO_REUSE* + * can only be used to share a port among sockets owned + * by the same user. + * + * However, we can share a port with a connected socket + * which has a unique 4-tuple. + */ t = in6_pcblookup_local(inp->inp_pcbinfo, laddr, lport, INPLOOKUP_WILDCARD, cred); if (t != NULL && (inp->inp_socket->so_type != SOCK_STREAM || IN6_IS_ADDR_UNSPECIFIED(&t->in6p_faddr)) && - (!IN6_IS_ADDR_UNSPECIFIED(laddr) || - !IN6_IS_ADDR_UNSPECIFIED(&t->in6p_laddr)) && (inp->inp_cred->cr_uid != t->inp_cred->cr_uid)) return (EADDRINUSE); diff --git a/tests/sys/netinet/socket_afinet.c b/tests/sys/netinet/socket_afinet.c index ba8c03af46a6..6fc98d982602 100644 --- a/tests/sys/netinet/socket_afinet.c +++ b/tests/sys/netinet/socket_afinet.c @@ -337,7 +337,8 @@ ATF_TC_BODY(socket_afinet_bindany, tc) * Returns true if the bind succeeded, and false if it failed with EADDRINUSE. */ static bool -child_bind(const atf_tc_t *tc, int type, struct sockaddr *sa, int opt, bool unpriv) +child_bind(const atf_tc_t *tc, int type, struct sockaddr *sa, int opt, + bool unpriv) { const char *user; pid_t child; @@ -483,16 +484,8 @@ multibind_test(const atf_tc_t *tc, int domain, int type) /* * Multi-binding is only allowed when both * sockets have the same owner. - * - * XXX-MJ we for some reason permit this when - * binding to the unspecified address, but I - * don't think that's right */ - if (flags[flagi] && opts[opti] != 0 && - opts[opti] != SO_REUSEADDR && opti == optj) - ATF_REQUIRE(res); - else - ATF_REQUIRE(!res); + ATF_REQUIRE(!res); } ATF_REQUIRE(close(s) == 0); } @@ -517,6 +510,78 @@ ATF_TC_BODY(socket_afinet_multibind, tc) multibind_test(tc, AF_INET6, SOCK_DGRAM); } +static void +bind_connected_port_test(const atf_tc_t *tc, int domain) +{ + struct sockaddr_in sin; + struct sockaddr_in6 sin6; + struct sockaddr *sinp; + int error, sd[3], tmp; + bool res; + + /* + * Create a connected socket pair. + */ + sd[0] = socket(domain, SOCK_STREAM, 0); + ATF_REQUIRE_MSG(sd[0] >= 0, "socket failed: %s", strerror(errno)); + sd[1] = socket(domain, SOCK_STREAM, 0); + ATF_REQUIRE_MSG(sd[1] >= 0, "socket failed: %s", strerror(errno)); + if (domain == PF_INET) { + memset(&sin, 0, sizeof(sin)); + sin.sin_family = AF_INET; + sin.sin_len = sizeof(sin); + sin.sin_addr.s_addr = htonl(INADDR_ANY); + sin.sin_port = htons(0); + sinp = (struct sockaddr *)&sin; + } else { + ATF_REQUIRE(domain == PF_INET6); + memset(&sin6, 0, sizeof(sin6)); + sin6.sin6_family = AF_INET6; + sin6.sin6_len = sizeof(sin6); + sin6.sin6_addr = in6addr_any; + sin6.sin6_port = htons(0); + sinp = (struct sockaddr *)&sin6; + } + + error = bind(sd[0], sinp, sinp->sa_len); + ATF_REQUIRE_MSG(error == 0, "bind failed: %s", strerror(errno)); + error = listen(sd[0], 1); + ATF_REQUIRE_MSG(error == 0, "listen failed: %s", strerror(errno)); + + error = getsockname(sd[0], sinp, &(socklen_t){ sinp->sa_len }); + ATF_REQUIRE_MSG(error == 0, "getsockname failed: %s", strerror(errno)); + + error = connect(sd[1], sinp, sinp->sa_len); + ATF_REQUIRE_MSG(error == 0, "connect failed: %s", strerror(errno)); + tmp = accept(sd[0], NULL, NULL); + ATF_REQUIRE_MSG(tmp >= 0, "accept failed: %s", strerror(errno)); + ATF_REQUIRE(close(sd[0]) == 0); + sd[0] = tmp; + + /* bind() should succeed even from an unprivileged user. */ + res = child_bind(tc, SOCK_STREAM, sinp, 0, false); + ATF_REQUIRE(!res); + res = child_bind(tc, SOCK_STREAM, sinp, 0, true); + ATF_REQUIRE(!res); +} + +/* + * Normally bind() prevents port stealing by a different user, even when + * SO_REUSE* are specified. However, if the port is bound by a connected + * socket, then it's fair game. + */ +ATF_TC(socket_afinet_bind_connected_port); +ATF_TC_HEAD(socket_afinet_bind_connected_port, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); + atf_tc_set_md_var(tc, "require.config", "unprivileged_user"); +} +ATF_TC_BODY(socket_afinet_bind_connected_port, tc) +{ + bind_connected_port_test(tc, AF_INET); + bind_connected_port_test(tc, AF_INET6); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, socket_afinet); @@ -527,6 +592,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, socket_afinet_stream_reconnect); ATF_TP_ADD_TC(tp, socket_afinet_bindany); ATF_TP_ADD_TC(tp, socket_afinet_multibind); + ATF_TP_ADD_TC(tp, socket_afinet_bind_connected_port); return atf_no_error(); } From nobody Mon Dec 23 15:49:51 2024 X-Original-To: dev-commits-src-main@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 4YH2XJ33nCz5WrHC; Mon, 23 Dec 2024 15:49: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH2XJ191xz4pY6; Mon, 23 Dec 2024 15:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968992; 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=fWlCKHCIbs3BelB1kd2kBq9QZuO2G+TbPPggT1Qqq5k=; b=Tdz6hs4H8514CeHfQVbtn2Lxxbp3SqrEc1bweSxnAfjBmcFWEOVOD/r6w7FuMRYRsFVnGB FzV6pPEObAAcVta4sS2mxKArNpV9aPENmyOFRUyU7Uc+BCv9PoDRclV2cTRs9V7qQuH5Pv 0raUe86nh7cqAHsMSfPYKo4iEW2b9krsyD6CDQmg0E6frqLQisFLhjSebjhYS6SKuzZWsC WFjddGM0QyAO/kqRv1DkWg4rEHwXISOjlPELkwbWP+sWXNLb0GsYD/F/0QRvMRLl5Fbv3I /X/2NQjkkX5TGnHbGdS7NFs9V+n/BhimIfekGigqWZQmEvcSg4QpBrHA2wjqkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968992; 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=fWlCKHCIbs3BelB1kd2kBq9QZuO2G+TbPPggT1Qqq5k=; b=ypMUyPNQMdrdKpPMA4BrqZ4V6ccalFVExZB2Y7TXuSCuMOM0PKOgQWzCpyvIS7YQGR+O/U D1k3Q7em+tbJ05SOijBQw2br70WSln98e2Uy0YXtEKRU/9z4CEmGpQiHnIFnIp7gNvnqfp ExGuz/QJDqcQN2k8b+3EjBPM0xBaKIUHTwawE3Rww7z5+W/g9NSdiOcQdhtqkXtE8Hl/ed 0XR+E9qWe7nhvaJRG8TvrnQhhuGNKPeR4BxeJTUu/LvoceT5d0++iV6v1hoipY+SVfGogP xQa8BJ53QbBoWoDwsotOIzZF4Lp5YUaHbv+VQmMqnjB0hUYCH3eTsaZAI+4mqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968992; a=rsa-sha256; cv=none; b=q2A1GL5Axz/t/raz58iTo8oPD4B25u/HX0coJ//ZaGKglV+0+Nb5AnjJZi9yGNbDDxEaZC BG9PQIJOeUSoY/iLGMHXIMP7Sj+uTBmU858H3KXGgTulYbd9rQqbFUiqyv8II6xOMHEV87 Fc6i700G2sveXKrOCwjKTRDGSGUx39P4TOglJZXatKsvKbYr6QO/A7JPRXB3mH1epatPyg WkaJjDxMsaWWk7zpO/CaiELzb65IbxSdfCCVnrAvrJ9hylx07aQRcFFDup1PPKDIbZSpTn vvNme5JyBWJ4JeyJF7Rq+U9YUxIwgF45EwTf8tIaRfNYaPu3DA9/h53aRO/6DQ== 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 4YH2XH4yrlz10Lt; Mon, 23 Dec 2024 15:49:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNFnpEh011887; Mon, 23 Dec 2024 15:49:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFnpkJ011884; Mon, 23 Dec 2024 15:49:51 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:49:51 GMT Message-Id: <202412231549.4BNFnpkJ011884@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: aa94868f5e9a - main - syslogd: Remove is_exclusive metadata from tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa94868f5e9a5998c3277755ac7d4cc19dcd3a25 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=aa94868f5e9a5998c3277755ac7d4cc19dcd3a25 commit aa94868f5e9a5998c3277755ac7d4cc19dcd3a25 Author: Michal Scigocki AuthorDate: 2024-12-23 02:53:36 +0000 Commit: Mark Johnston CommitDate: 2024-12-23 15:44:17 +0000 syslogd: Remove is_exclusive metadata from tests - Tests have been updated to use "jail" execution environment, is_exclusive="true" is no longer required. - tests/Makefile update to style.Makefile(5). Reviewed by: markj MFC after: 3 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/1536 --- usr.sbin/syslogd/tests/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/usr.sbin/syslogd/tests/Makefile b/usr.sbin/syslogd/tests/Makefile index 30972d3fced5..c60709b0531d 100644 --- a/usr.sbin/syslogd/tests/Makefile +++ b/usr.sbin/syslogd/tests/Makefile @@ -1,9 +1,7 @@ -ATF_TESTS_SH+= syslogd_test +ATF_TESTS_SH= syslogd_test # Run in jail with new vnet so we don't need to worry about address conflicts -TEST_METADATA+= execenv="jail" -TEST_METADATA+= execenv_jail_params="vnet=new" -# Several syslogd listening on the same port prevent parallel operation -TEST_METADATA+= is_exclusive="true" -TEST_METADATA+= timeout=20 +TEST_METADATA= execenv="jail" \ + execenv_jail_params="vnet=new" + timeout=20 .include From nobody Mon Dec 23 15:49:52 2024 X-Original-To: dev-commits-src-main@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 4YH2XK2Ppbz5WqtM; Mon, 23 Dec 2024 15:49: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH2XK0Dwbz4phQ; Mon, 23 Dec 2024 15:49:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968993; 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=XqKd2dOc+snxAVVQvp3qscIviNEVosyT9eTUrG21CJA=; b=Stk2r6Vpm61/Sz28Wj727/C5cXff5D8hPLOnfvtFo3bZnMlQBsE0Q/90sQJ+x+JXkhdfoy xGNzWSG+wcsNmB/BycupcvKMNuJ4YZPccNjCdS1sg0pUN0XEuT0URvAb+MRjsfe701VN/b kPBgFvAqyAP/Ssav6V9Ds+4WRp7BDc/8WSMv16/ajStSnyTNJWpqpLuM8JQZDuRS7b0ywd lN3zdN9swQUT9zbMXgbvUeTHvsbFgtmSXpyaFwm90L42VQ//NuM+XtWlAfPfnHQBPZV5tf U0wmsppBnEYHpqiSHD9pZGpIRTGtSps6qMa38CJdIyHIg8xKQJoV8QPwSkrXwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968993; 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=XqKd2dOc+snxAVVQvp3qscIviNEVosyT9eTUrG21CJA=; b=laiLfBmZkAjKgcCtegu0xLElmWnnKRXDdQvmfNx/JIP/pVcgwU1Q4Ysw9Uvrnb8igyXW0s 2UXX5lakLBgabzI0B8vlooyLN9HTMgZrgifdn+1hecld0+qGOqsfYhvHcLCUIxpVaKO4CX Za6nURH2kS+Gi/KR8Ilm0lZymuD+HQUqKeNU1YgaCpJsYRYX154hnU5UqoBjg6E2utkH1R 7il6YqfjE1NYwJ7VKGj34Ty2A0gQphRFBm8upJ8UPd9gEZm+f6TkqQSSqOw+klFogC1yZg NEEBRxuVSuZF5uWpESy33iDnq96ksf7DrN851i9v287NWIjwa5qj/dz/sPnT+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968993; a=rsa-sha256; cv=none; b=qQQDtVr/3vUH6fOq1NWyOph7aFSV9aBzOMLVMCY3bYI7ikn+rwENufrxCgotJtrLJft4BD DGTj4o61NtQ4vu/8wqsRztaBQGUmn3m8PjCxD08q/moNmKz3owc+WM/+puku1QuE9ak3OI XLnzD0/NlYsbPb0vfUDtjr1uIFwg+99YrNvQrN3Uu5up7EC4QUVBuUZx9AJ+ebq0i1ocpk qM2OBAqtSeIHDpucYPXXN+OBBH9+xjNfHD/pF7ywZ9dVizEOnNb+qblm7HiUAZ78S3sTKu n8hb4BhtElvwPk7ze8QG2egkQheZRgUyqEQ3nfrf9ymdVgO6u89oXHqbf5Bd5w== 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 4YH2XJ6fx8z107x; Mon, 23 Dec 2024 15:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNFnqrH011942; Mon, 23 Dec 2024 15:49:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFnqRJ011939; Mon, 23 Dec 2024 15:49:52 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:49:52 GMT Message-Id: <202412231549.4BNFnqRJ011939@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 66a022a30dd9 - main - syslogd: Add syslog basic message format tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66a022a30dd968631c64b73e473dd16589592fad Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=66a022a30dd968631c64b73e473dd16589592fad commit 66a022a30dd968631c64b73e473dd16589592fad Author: Michal Scigocki AuthorDate: 2024-12-23 02:53:51 +0000 Commit: Mark Johnston CommitDate: 2024-12-23 15:45:12 +0000 syslogd: Add syslog basic message format tests RFC 3164 and RFC 5424 syslog message format tests and minor refactor of existing tests to reuse components in new tests. Reviewed by: markj MFC after: 3 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/1536 --- usr.sbin/syslogd/tests/Makefile | 11 +- .../syslogd/tests/syslogd_basic_format_test.sh | 111 +++++++++++++++++++ .../syslogd/tests/syslogd_format_test_common.sh | 32 ++++++ usr.sbin/syslogd/tests/syslogd_test.sh | 105 +----------------- usr.sbin/syslogd/tests/syslogd_test_common.sh | 117 +++++++++++++++++++++ 5 files changed, 270 insertions(+), 106 deletions(-) diff --git a/usr.sbin/syslogd/tests/Makefile b/usr.sbin/syslogd/tests/Makefile index c60709b0531d..65d08d75fcd1 100644 --- a/usr.sbin/syslogd/tests/Makefile +++ b/usr.sbin/syslogd/tests/Makefile @@ -1,7 +1,14 @@ -ATF_TESTS_SH= syslogd_test +PACKAGE= tests + +ATF_TESTS_SH= syslogd_basic_format_test \ + syslogd_test + # Run in jail with new vnet so we don't need to worry about address conflicts TEST_METADATA= execenv="jail" \ - execenv_jail_params="vnet=new" + execenv_jail_params="vnet=new" \ timeout=20 +${PACKAGE}FILES=syslogd_format_test_common.sh \ + syslogd_test_common.sh + .include diff --git a/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh b/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh new file mode 100644 index 000000000000..7ee7cd0e1e91 --- /dev/null +++ b/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh @@ -0,0 +1,111 @@ +#- +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 Michal Scigocki +# + +. $(atf_get_srcdir)/syslogd_test_common.sh +. $(atf_get_srcdir)/syslogd_format_test_common.sh + +# Basic format tests +# Single server, logging to local socket (inet disabled) +setup_basic_format_test() +{ + local format="$1" + local logfile="$2" + + printf "user.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + + syslogd_start \ + -O "${format}" \ + -N \ + -ss + + syslogd_log -p user.debug -t "${TAG}" \ + -h "${SYSLOGD_LOCAL_SOCKET}" \ + -H "${HOSTNAME}" "${MSG}" +} + +atf_test_case "O_flag_bsd_basic" "cleanup" +O_flag_bsd_basic_head() +{ + atf_set descr "bsd format test on local syslog message" +} +O_flag_bsd_basic_body() +{ + local format="bsd" + local logfile="${PWD}/O_flag_${format}_basic.log" + + setup_basic_format_test "${format}" "${logfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" +} +O_flag_bsd_basic_cleanup() +{ + syslogd_stop +} + +atf_test_case "O_flag_rfc3164_basic" "cleanup" +O_flag_rfc3164_basic_head() +{ + atf_set descr "rfc3164 format test on local syslog message" +} +O_flag_rfc3164_basic_body() +{ + local format="rfc3164" + local logfile="${PWD}/O_flag_${format}_basic.log" + + setup_basic_format_test "${format}" "${logfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" +} +O_flag_rfc3164_basic_cleanup() +{ + syslogd_stop +} + +atf_test_case "O_flag_syslog_basic" "cleanup" +O_flag_syslog_basic_head() +{ + atf_set descr "syslog format test on local syslog message" +} +O_flag_syslog_basic_body() +{ + local format="syslog" + local logfile="${PWD}/O_flag_${format}_basic.log" + + setup_basic_format_test "${format}" "${logfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC5424_LOGFILE}" cat "${logfile}" +} +O_flag_syslog_basic_cleanup() +{ + syslogd_stop +} + +atf_test_case "O_flag_rfc5424_basic" "cleanup" +O_flag_rfc5424_basic_head() +{ + atf_set descr "rfc5424 format test on local syslog message" +} +O_flag_rfc5424_basic_body() +{ + local format="rfc5424" + local logfile="${PWD}/O_flag_${format}_basic.log" + + setup_basic_format_test "${format}" "${logfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC5424_LOGFILE}" cat "${logfile}" +} +O_flag_rfc5424_basic_cleanup() +{ + syslogd_stop +} + +atf_init_test_cases() +{ + atf_add_test_case "O_flag_bsd_basic" + atf_add_test_case "O_flag_rfc3164_basic" + atf_add_test_case "O_flag_syslog_basic" + atf_add_test_case "O_flag_rfc5424_basic" +} diff --git a/usr.sbin/syslogd/tests/syslogd_format_test_common.sh b/usr.sbin/syslogd/tests/syslogd_format_test_common.sh new file mode 100644 index 000000000000..199fb746839c --- /dev/null +++ b/usr.sbin/syslogd/tests/syslogd_format_test_common.sh @@ -0,0 +1,32 @@ +#- +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 Michal Scigocki +# + +# REGEX Components +readonly PRI="<15>" +readonly VERSION="1" +readonly DATE_RFC3164="[A-Z][a-z]{2} [ 1-3][0-9]" +readonly TIMESPEC_RFC5424="([:TZ0-9\.\+\-]{20,32}|\-)" # Simplified TIMESPEC +readonly TIME_RFC3164="([0-9]{2}:){2}[0-9]{2}" +readonly HOSTNAME="example.test" +readonly HOSTNAME_REGEX="example\.test" +readonly TAG="test_tag" +readonly MSG="test_log_message" + +# Test REGEX +# Dec 2 15:55:00 example.test test_tag: test_log_message +readonly REGEX_RFC3164="${DATE_RFC3164} ${TIME_RFC3164} ${HOSTNAME_REGEX} ${TAG}: ${MSG}" +readonly REGEX_RFC3164_LOGFILE="^${REGEX_RFC3164}$" +readonly REGEX_RFC3164_PAYLOAD="${PRI}${REGEX_RFC3164}$" + +# Dec 2 15:55:00 Forwarded from example.test: test_tag: test_log_message +readonly REGEX_RFC3164_LEGACY="${DATE_RFC3164} ${TIME_RFC3164} Forwarded from ${HOSTNAME_REGEX}: ${TAG}: ${MSG}" +readonly REGEX_RFC3164_LEGACY_LOGFILE="^${REGEX_RFC3164_LEGACY}$" +readonly REGEX_RFC3164_LEGACY_PAYLOAD="${PRI}${REGEX_RFC3164_LEGACY}$" + +# <15>1 2024-12-02T15:55:00.000000+00:00 example.test test_tag - - - test_log_message +readonly REGEX_RFC5424="${PRI}${VERSION} ${TIMESPEC_RFC5424} ${HOSTNAME_REGEX} ${TAG} - - - ${MSG}" +readonly REGEX_RFC5424_LOGFILE="^${REGEX_RFC5424}$" +readonly REGEX_RFC5424_PAYLOAD="${REGEX_RFC5424}$" diff --git a/usr.sbin/syslogd/tests/syslogd_test.sh b/usr.sbin/syslogd/tests/syslogd_test.sh index e75c85d5995a..51c3a5fca1c6 100644 --- a/usr.sbin/syslogd/tests/syslogd_test.sh +++ b/usr.sbin/syslogd/tests/syslogd_test.sh @@ -13,110 +13,7 @@ # Tests to-do: # actions: users -readonly SYSLOGD_UDP_PORT="5140" -readonly SYSLOGD_CONFIG="${PWD}/syslog.conf" -readonly SYSLOGD_LOCAL_SOCKET="${PWD}/log.sock" -readonly SYSLOGD_PIDFILE="${PWD}/syslogd.pid" -readonly SYSLOGD_LOCAL_PRIVSOCKET="${PWD}/logpriv.sock" - -# Start a private syslogd instance. -syslogd_start() -{ - local jail bind_addr conf_file pid_file socket privsocket - local opt next other_args - - # Setup loopback so we can deliver messages to ourself. - atf_check ifconfig lo0 inet 127.0.0.1/16 - - OPTIND=1 - while getopts ":b:f:j:P:p:S:" opt; do - case "${opt}" in - b) - bind_addr="${OPTARG}" - ;; - f) - conf_file="${OPTARG}" - ;; - j) - jail="jexec ${OPTARG}" - ;; - P) - pid_file="${OPTARG}" - ;; - p) - socket="${OPTARG}" - ;; - S) - privsocket="${OPTARG}" - ;; - ?) - opt="${OPTARG}" - next="$(eval echo \${${OPTIND}})" - - case "${next}" in - -* | "") - other_args="${other_args} -${opt}" - shift $((OPTIND - 1)) - ;; - *) - other_args="${other_args} -${opt} ${next}" - shift ${OPTIND} - ;; - esac - - # Tell getopts to continue parsing. - OPTIND=1 - ;; - :) - atf_fail "The -${OPTARG} flag requires an argument" - ;; - esac - done - - $jail syslogd \ - -b "${bind_addr:-":${SYSLOGD_UDP_PORT}"}" \ - -C \ - -d \ - -f "${conf_file:-${SYSLOGD_CONFIG}}" \ - -H \ - -P "${pid_file:-${SYSLOGD_PIDFILE}}" \ - -p "${socket:-${SYSLOGD_LOCAL_SOCKET}}" \ - -S "${privsocket:-${SYSLOGD_LOCAL_PRIVSOCKET}}" \ - ${other_args} \ - & - - # Give syslogd a bit of time to spin up. - while [ "$((i+=1))" -le 20 ]; do - [ -S "${socket:-${SYSLOGD_LOCAL_SOCKET}}" ] && return - sleep 0.1 - done - atf_fail "timed out waiting for syslogd to start" -} - -# Simple logger(1) wrapper. -syslogd_log() -{ - atf_check -s exit:0 -o empty -e empty logger $* -} - -# Make syslogd reload its configuration file. -syslogd_reload() -{ - pkill -HUP -F "${1:-${SYSLOGD_PIDFILE}}" -} - -# Stop a private syslogd instance. -syslogd_stop() -{ - local pid_file="${1:-${SYSLOGD_PIDFILE}}" - - pid=$(cat "${pid_file}") - if pkill -F "${pid_file}"; then - wait "${pid}" - rm -f "${pid_file}" "${2:-${SYSLOGD_LOCAL_SOCKET}}" \ - "${3:-${SYSLOGD_LOCAL_PRIVSOCKET}}" - fi -} +. $(atf_get_srcdir)/syslogd_test_common.sh atf_test_case "unix" "cleanup" unix_head() diff --git a/usr.sbin/syslogd/tests/syslogd_test_common.sh b/usr.sbin/syslogd/tests/syslogd_test_common.sh new file mode 100644 index 000000000000..a764ebfb0e24 --- /dev/null +++ b/usr.sbin/syslogd/tests/syslogd_test_common.sh @@ -0,0 +1,117 @@ +#- +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2021, 2023 The FreeBSD Foundation +# +# This software was developed by Mark Johnston under sponsorship from +# the FreeBSD Foundation. +# +# This software was developed by Jake Freeland under sponsorship from +# the FreeBSD Foundation. +# + +readonly SYSLOGD_UDP_PORT="5140" +readonly SYSLOGD_CONFIG="${PWD}/syslog.conf" +readonly SYSLOGD_LOCAL_SOCKET="${PWD}/log.sock" +readonly SYSLOGD_PIDFILE="${PWD}/syslogd.pid" +readonly SYSLOGD_LOCAL_PRIVSOCKET="${PWD}/logpriv.sock" + +# Start a private syslogd instance. +syslogd_start() +{ + local jail bind_addr conf_file pid_file socket privsocket + local opt next other_args + + # Setup loopback so we can deliver messages to ourself. + atf_check ifconfig lo0 inet 127.0.0.1/16 + + OPTIND=1 + while getopts ":b:f:j:P:p:S:" opt; do + case "${opt}" in + b) + bind_addr="${OPTARG}" + ;; + f) + conf_file="${OPTARG}" + ;; + j) + jail="jexec ${OPTARG}" + ;; + P) + pid_file="${OPTARG}" + ;; + p) + socket="${OPTARG}" + ;; + S) + privsocket="${OPTARG}" + ;; + ?) + opt="${OPTARG}" + next="$(eval echo \${${OPTIND}})" + + case "${next}" in + -* | "") + other_args="${other_args} -${opt}" + shift $((OPTIND - 1)) + ;; + *) + other_args="${other_args} -${opt} ${next}" + shift ${OPTIND} + ;; + esac + + # Tell getopts to continue parsing. + OPTIND=1 + ;; + :) + atf_fail "The -${OPTARG} flag requires an argument" + ;; + esac + done + + $jail syslogd \ + -b "${bind_addr:-":${SYSLOGD_UDP_PORT}"}" \ + -C \ + -d \ + -f "${conf_file:-${SYSLOGD_CONFIG}}" \ + -H \ + -P "${pid_file:-${SYSLOGD_PIDFILE}}" \ + -p "${socket:-${SYSLOGD_LOCAL_SOCKET}}" \ + -S "${privsocket:-${SYSLOGD_LOCAL_PRIVSOCKET}}" \ + ${other_args} \ + & + + # Give syslogd a bit of time to spin up. + while [ "$((i+=1))" -le 20 ]; do + [ -S "${socket:-${SYSLOGD_LOCAL_SOCKET}}" ] && return + sleep 0.1 + done + atf_fail "timed out waiting for syslogd to start" +} + +# Simple logger(1) wrapper. +syslogd_log() +{ + atf_check -s exit:0 -o empty -e empty logger $* +} + +# Make syslogd reload its configuration file. +syslogd_reload() +{ + pkill -HUP -F "${1:-${SYSLOGD_PIDFILE}}" +} + +# Stop a private syslogd instance. +syslogd_stop() +{ + local pid_file="${1:-${SYSLOGD_PIDFILE}}" + local socket_file="${2:-${SYSLOGD_LOCAL_SOCKET}}" + local privsocket_file="${3:-${SYSLOGD_LOCAL_PRIVSOCKET}}" + + pid=$(cat "${pid_file}") + if pkill -F "${pid_file}"; then + wait "${pid}" + rm -f "${pid_file}" "${socket_file}" "${privsocket_file}" + fi +} From nobody Mon Dec 23 15:49:54 2024 X-Original-To: dev-commits-src-main@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 4YH2XM6BdSz5WrX4; Mon, 23 Dec 2024 15:49: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH2XM1swCz4pkT; Mon, 23 Dec 2024 15:49:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968995; 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=s3n9dU026c7S5SMKYs7zbos2pDBDPaQRK9iegz4eDt0=; b=w7XJE6y3lyZbS9MbW3TxDaXrM6xhXJ1yFF/WfQWYtUpCVi2aYkx9/enlPtFDkUYgDDd7W6 5tUHdDrrIIIlID6Lrwu/x+z1A3chAErSomsIa9UzR2zj2L5Pe0UMPVNCTnS+RNSlvf+Lpa FQqqu5fHcRRvHHyATAfMIGl++sL18KSXXanOf5I31f9OYy4WzwnVY6BU+aE+g5682A0dL0 h9kDfEh6xaRQ/bshuBCB+yxqSKLBktjRd8EToo7izdNsdZGsDwfnoZ6dFa6ljgBK1hRfwh wmT/9jdDH6Uzk0PLtYh9EZ66KULRRjJJhI6zoQ6pivSppHkkM64VS0hOI2wLvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968995; 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=s3n9dU026c7S5SMKYs7zbos2pDBDPaQRK9iegz4eDt0=; b=eIdVMh1wzBwdvQwKjZlv1jowxHo6DhVB5xviih3QGPIPzB31/MThomT+0ddLQOJ5MdjZcO j7+xbBMgKqJsa2B33EJw/3/Fnaicw110g+Wx6GhlCsS1ecYM7M5x9U1/1BNOkhQei1L7Kd iv4dmqLLP+B3mOLkffz6GZxC+SZ1EwLSXM3rex1+WVTBCIFb3zNJkUxT/LCGirsQjYGYoY 0YI2GrwzyWnPqXiLyMH4cLtoMOV3o3IAMtaJxUzi06WXM1Sxm9SNMUFZiF4KCMu9qiMaaT 4mkBuXkQhPvPaqR5d5lHy2cpQoeVDjMSL8358H3tol9K4YOEPaMweyTN8YFRMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968995; a=rsa-sha256; cv=none; b=X6O/NBbnnzvlKCsrjpraaH26w2Ufdgl1xBZhnh4H+sGAhD/5ERbuxulkOwdHiIiS7Pg890 o79e+KGuAa09XaW2TIr7l3klaPxXUeO9WWf9lQyjj9WdrjLZwJYfeVuaenoxd8vjHxxJBQ JeWVvDoh3ZzvEceJH3ho/7AGeiw+g9Szsu4pVhCWfAuQyUh2tRBkaVhJVTOBD4ufNWmRo1 C9dbis+287LyQc3r3Fa4fmijwAboyUyYPBuslz4Dy+mRfcvKuLT2hgsi4Y/rNAeUS573k0 g4QvyEJ0JQkQCVsl5h94MLbKE48bldI9lk/+baN9LH2TjKESQi2NH3HVRcMU7g== 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 4YH2XM00hRz1080; Mon, 23 Dec 2024 15:49:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNFnsaa012048; Mon, 23 Dec 2024 15:49:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFnsmR012045; Mon, 23 Dec 2024 15:49:54 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:49:54 GMT Message-Id: <202412231549.4BNFnsmR012045@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 65c61840eeb7 - main - syslogd: Add syslog relayed message format tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65c61840eeb794ca1505bc7e076f664c8d985f72 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=65c61840eeb794ca1505bc7e076f664c8d985f72 commit 65c61840eeb794ca1505bc7e076f664c8d985f72 Author: Michal Scigocki AuthorDate: 2024-12-23 02:57:37 +0000 Commit: Mark Johnston CommitDate: 2024-12-23 15:45:59 +0000 syslogd: Add syslog relayed message format tests Reviewed by: markj MFC after: 3 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/1536 --- usr.sbin/syslogd/tests/Makefile | 1 + .../syslogd/tests/syslogd_relayed_format_test.sh | 162 +++++++++++++++++++++ 2 files changed, 163 insertions(+) diff --git a/usr.sbin/syslogd/tests/Makefile b/usr.sbin/syslogd/tests/Makefile index 36b7798d317c..fcc0679f3274 100644 --- a/usr.sbin/syslogd/tests/Makefile +++ b/usr.sbin/syslogd/tests/Makefile @@ -2,6 +2,7 @@ PACKAGE= tests ATF_TESTS_SH= syslogd_basic_format_test \ syslogd_forwarded_format_test \ + syslogd_relayed_format_test \ syslogd_test # Run in jail with new vnet so we don't need to worry about address conflicts diff --git a/usr.sbin/syslogd/tests/syslogd_relayed_format_test.sh b/usr.sbin/syslogd/tests/syslogd_relayed_format_test.sh new file mode 100644 index 000000000000..21481823068d --- /dev/null +++ b/usr.sbin/syslogd/tests/syslogd_relayed_format_test.sh @@ -0,0 +1,162 @@ +#- +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 Michal Scigocki +# + +. $(atf_get_srcdir)/syslogd_format_test_common.sh + +readonly SERVER_1_PORT="5140" +readonly SERVER_2_PORT="5141" +readonly SERVER_3_PORT="5142" + +# Relayed messages tests +# [Host] ---UDP--> [Relay] ---UDP--> [Central] +setup_relayed_format_test() +{ + local format="$1" + local logfile="$2" + local pcapfile="$3" + + confirm_INET_support_or_skip + + # Begin packet capture for single packet + tcpdump --immediate-mode -c 1 -i lo0 -w "${pcapfile}" dst port \ + "${SERVER_1_PORT}" & + tcpdump_pid="$!" + + # Start first (central) server: receive UDP, log to file + printf "user.debug\t${logfile}\n" \ + > "$(config_filename ${SERVER_1_PORT})" + syslogd_start_on_port "${SERVER_1_PORT}" -O "${format}" + + # Start second (relay) server: send UDP, log to central server + printf "user.debug\t@127.0.0.1:${SERVER_1_PORT}\n" \ + > "$(config_filename ${SERVER_2_PORT})" + syslogd_start_on_port "${SERVER_2_PORT}" -O "${format}" + + # Start third logging host: send UDP, log to relay server + printf "user.debug\t@127.0.0.1:${SERVER_2_PORT}\n" \ + > "$(config_filename ${SERVER_3_PORT})" + syslogd_start_on_port "${SERVER_3_PORT}" -O "${format}" + + # Send test syslog message + syslogd_log -4 -p user.debug -t "${TAG}" -h 127.0.0.1 \ + -P "${SERVER_3_PORT}" -H "${HOSTNAME}" "${MSG}" + + wait "${tcpdump_pid}" # Wait for packet capture to finish +} + +atf_test_case "O_flag_bsd_relayed" "cleanup" +O_flag_bsd_relayed_head() +{ + atf_set descr "bsd format test on a relayed syslog message" + set_common_atf_metadata +} +O_flag_bsd_relayed_body() +{ + local format="bsd" + local logfile="${PWD}/${format}_relayed.log" + local pcapfile="${PWD}/${format}_relayed.pcap" + + setup_relayed_format_test "${format}" "${logfile}" "${pcapfile}" + + atf_expect_fail "PR 220246 issue with the legacy bsd format" + atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" + atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC3164_PAYLOAD}" \ + tcpdump -A -r "${pcapfile}" +} +O_flag_bsd_relayed_cleanup() +{ + syslogd_stop_on_ports \ + "${SERVER_1_PORT}" \ + "${SERVER_2_PORT}" \ + "${SERVER_3_PORT}" +} + +atf_test_case "O_flag_rfc3164_relayed" "cleanup" +O_flag_rfc3164_relayed_head() +{ + atf_set descr "rfc3164 format test on a relayed syslog message" + set_common_atf_metadata +} +O_flag_rfc3164_relayed_body() +{ + local format="rfc3164" + local logfile="${PWD}/${format}_relayed.log" + local pcapfile="${PWD}/${format}_relayed.pcap" + + setup_relayed_format_test "${format}" "${logfile}" "${pcapfile}" + + atf_expect_fail "PR 220246 issue with the legacy rfc3164 format" + atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" + atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC3164_PAYLOAD}" \ + tcpdump -A -r "${pcapfile}" +} +O_flag_rfc3164_relayed_cleanup() +{ + syslogd_stop_on_ports \ + "${SERVER_1_PORT}" \ + "${SERVER_2_PORT}" \ + "${SERVER_3_PORT}" +} + +atf_test_case "O_flag_syslog_relayed" "cleanup" +O_flag_syslog_relayed_head() +{ + atf_set descr "syslog format test on a relayed syslog message" + set_common_atf_metadata +} +O_flag_syslog_relayed_body() +{ + local format="syslog" + local logfile="${PWD}/${format}_relayed.log" + local pcapfile="${PWD}/${format}_relayed.pcap" + + setup_relayed_format_test "${format}" "${logfile}" "${pcapfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC5424_LOGFILE}" cat "${logfile}" + atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC5424_PAYLOAD}" \ + tcpdump -A -r "${pcapfile}" +} +O_flag_syslog_relayed_cleanup() +{ + syslogd_stop_on_ports \ + "${SERVER_1_PORT}" \ + "${SERVER_2_PORT}" \ + "${SERVER_3_PORT}" +} + +atf_test_case "O_flag_rfc5424_relayed" "cleanup" +O_flag_rfc5424_relayed_head() +{ + atf_set descr "rfc5424 format test on a relayed syslog message" + set_common_atf_metadata +} +O_flag_rfc5424_relayed_body() +{ + local format="rfc5424" + local logfile="${PWD}/${format}_relayed.log" + local pcapfile="${PWD}/${format}_relayed.pcap" + + setup_relayed_format_test "${format}" "${logfile}" "${pcapfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC5424_LOGFILE}" cat "${logfile}" + atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC5424_PAYLOAD}" \ + tcpdump -A -r "${pcapfile}" +} +O_flag_rfc5424_relayed_cleanup() +{ + syslogd_stop_on_ports \ + "${SERVER_1_PORT}" \ + "${SERVER_2_PORT}" \ + "${SERVER_3_PORT}" +} + +atf_init_test_cases() +{ + atf_add_test_case "O_flag_bsd_relayed" + atf_add_test_case "O_flag_rfc3164_relayed" + atf_add_test_case "O_flag_syslog_relayed" + atf_add_test_case "O_flag_rfc5424_relayed" +} From nobody Mon Dec 23 15:49:53 2024 X-Original-To: dev-commits-src-main@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 4YH2XL40QDz5WqtN; Mon, 23 Dec 2024 15:49: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH2XL0XR3z4pbP; Mon, 23 Dec 2024 15:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968994; 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=oZeXOqfC2f3GDVXveVetiz0Xp5sDSKEgRl7IwlFlFB4=; b=OoVQQFEoT6k/ah9RGooRgJYR2/CTexNE9FfSP9A6Ktic+fZ87rTwTI02wEd0DWj/931pgw 9FXG1sfOQpfS7SQXRqQj3IObLyxGzfIVxr5RarDi1p5MF5XEAbc3/cIABYdFNXNN5wBquo DFb6y14acNgydyppbrSNHFkQzE9CLU/bxAQvy2ynrRtDbyOhQqJ5nASf0VwYfT/4Rq6Q0i gqHodgEUph3HxHG78WBj04qfNJg6+M554GlkBjcjSCss0so2eZyprltn+u+TzKm8/mwr0+ zhmSPsqJYJ4Jzc/nQ1OTTSCt0EEpgB/MkjwWqdqvvgCeLFVra1BaXswt9U02gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968994; 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=oZeXOqfC2f3GDVXveVetiz0Xp5sDSKEgRl7IwlFlFB4=; b=JN/SK6WFvQ5MN5fxwfrKU7pTxKAiE+8/gwTs/SOZYbr2m18Skk0takZ05ntV1Ji7HwUI8+ EUkWCf/thxH53nCr3Qi0KCJD+erU1cCiKy/A5Lesy/VqDS3aXc9YcbF/p3aa2KIsIGg5aO DxpUb9jXu9OpKIEdPsxiZu23EXJGvEQ/KPZJWUw6PsahR36SgGTjGpdaHz4OOCZ7XyzqjD lKYKHrX36KtM59bD6oEISLcK89cVT2aW+kACDXbALp8qIdiOf+Rl0SxD2CRJZjrvLQWiJZ bXOb3zjmDYT4Yvgz3MV0T0qonHQwCbTByCfWlzlylfNw5YY3yjxIfATM/jhpXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968994; a=rsa-sha256; cv=none; b=Z7y5bgwmq5WFWf5JxX4yU2d1QIrYtif1LHiQDa2W3wm/rEy9a9Ia7WHP29ySfn8dwKkjgp AbPwHMstryHTB/GeyS3ZXYpYpe/mJ6iQzyR+TLdOQy/iCVtmnj8Kk8kFUN9kGNqosE5Igq Yqg9n3n9MJnRItxYiUiN/CvLiOXYW9JDLt24m1eXfGuOqGyv5ZIvHiEL/tL6DRCmwTb3yJ wmmRTXvAzhzVKdMb/mkUdiI+a+NePCTgUQaO/t5cQ26QPmAmt3TvvvjWjsSs7h0QTrVYQY 8fpu53+v/WWjfF4enlCBYHlfTr8wx62n6rCZcVUIDmm/SIFaYPRmkFtHUtW6VA== 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 4YH2XK69lPz107y; Mon, 23 Dec 2024 15:49:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNFnrO5012000; Mon, 23 Dec 2024 15:49:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFnrRZ011997; Mon, 23 Dec 2024 15:49:53 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:49:53 GMT Message-Id: <202412231549.4BNFnrRZ011997@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ee75c991acdc - main - syslogd: Add syslog forwarded message format tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee75c991acdca2103e0bc1e763a4ba67c148d132 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ee75c991acdca2103e0bc1e763a4ba67c148d132 commit ee75c991acdca2103e0bc1e763a4ba67c148d132 Author: Michal Scigocki AuthorDate: 2024-12-23 02:57:13 +0000 Commit: Mark Johnston CommitDate: 2024-12-23 15:45:45 +0000 syslogd: Add syslog forwarded message format tests Reviewed by: markj MFC after: 3 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/1536 --- usr.sbin/syslogd/tests/Makefile | 1 + .../syslogd/tests/syslogd_basic_format_test.sh | 1 - .../syslogd/tests/syslogd_format_test_common.sh | 56 ++++++ .../syslogd/tests/syslogd_forwarded_format_test.sh | 213 +++++++++++++++++++++ 4 files changed, 270 insertions(+), 1 deletion(-) diff --git a/usr.sbin/syslogd/tests/Makefile b/usr.sbin/syslogd/tests/Makefile index 65d08d75fcd1..36b7798d317c 100644 --- a/usr.sbin/syslogd/tests/Makefile +++ b/usr.sbin/syslogd/tests/Makefile @@ -1,6 +1,7 @@ PACKAGE= tests ATF_TESTS_SH= syslogd_basic_format_test \ + syslogd_forwarded_format_test \ syslogd_test # Run in jail with new vnet so we don't need to worry about address conflicts diff --git a/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh b/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh index 7ee7cd0e1e91..1969ce180f66 100644 --- a/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh +++ b/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh @@ -4,7 +4,6 @@ # Copyright (c) 2024 Michal Scigocki # -. $(atf_get_srcdir)/syslogd_test_common.sh . $(atf_get_srcdir)/syslogd_format_test_common.sh # Basic format tests diff --git a/usr.sbin/syslogd/tests/syslogd_format_test_common.sh b/usr.sbin/syslogd/tests/syslogd_format_test_common.sh index 199fb746839c..995bb048881b 100644 --- a/usr.sbin/syslogd/tests/syslogd_format_test_common.sh +++ b/usr.sbin/syslogd/tests/syslogd_format_test_common.sh @@ -4,6 +4,8 @@ # Copyright (c) 2024 Michal Scigocki # +. $(atf_get_srcdir)/syslogd_test_common.sh + # REGEX Components readonly PRI="<15>" readonly VERSION="1" @@ -30,3 +32,57 @@ readonly REGEX_RFC3164_LEGACY_PAYLOAD="${PRI}${REGEX_RFC3164_LEGACY}$" readonly REGEX_RFC5424="${PRI}${VERSION} ${TIMESPEC_RFC5424} ${HOSTNAME_REGEX} ${TAG} - - - ${MSG}" readonly REGEX_RFC5424_LOGFILE="^${REGEX_RFC5424}$" readonly REGEX_RFC5424_PAYLOAD="${REGEX_RFC5424}$" + +# Filename helper functions +config_filename() +{ local ref="$1"; echo "${PWD}/syslog_${ref}.conf"; } + +local_socket_filename() +{ local ref="$1"; echo "${PWD}/log_${ref}.sock"; } + +pid_filename() +{ local ref="$1"; echo "${PWD}/syslogd_${ref}.pid"; } + +local_privsocket_filename() +{ local ref="$1"; echo "${PWD}/logpriv_${ref}.sock"; } + +confirm_INET_support_or_skip() +{ + if ! sysctl kern.conftxt | grep -qw INET; then + atf_skip "Running kernel does not support INET" + fi +} + +set_common_atf_metadata() +{ + atf_set timeout 5 + atf_set require.user root +} + +# Wrapper with better semantic name for networking context +syslogd_start_on_port() +{ + local port="$1" + shift 1 + + syslogd_start \ + -b ":${port}" \ + -f "$(config_filename ${port})" \ + -p "$(local_socket_filename ${port})" \ + -P "$(pid_filename ${port})" \ + -S "$(local_privsocket_filename ${port})" \ + $@ +} + +# Wrapper with better semantic name for networking context +syslogd_stop_on_ports() +{ + local ports="$@" + + for port in "${ports}"; do + syslogd_stop \ + "$(pid_filename ${port})" \ + "$(local_socket_filename ${port})" \ + "$(local_privsocket_filename ${port})" + done +} diff --git a/usr.sbin/syslogd/tests/syslogd_forwarded_format_test.sh b/usr.sbin/syslogd/tests/syslogd_forwarded_format_test.sh new file mode 100644 index 000000000000..3d220a80b7e8 --- /dev/null +++ b/usr.sbin/syslogd/tests/syslogd_forwarded_format_test.sh @@ -0,0 +1,213 @@ +#- +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 Michal Scigocki +# + +. $(atf_get_srcdir)/syslogd_format_test_common.sh + +SERVER_1_PORT="5140" +SERVER_2_PORT="5141" + +# Forwarded Message Tests +# Two servers, one sending syslog messages to the other over UDP +setup_forwarded_format_test() +{ + local format="$1" + local logfile="$2" + local pcapfile="$3" + + confirm_INET_support_or_skip + + # Begin packet capture for single packet + tcpdump --immediate-mode -c 1 -i lo0 -w "${pcapfile}" \ + dst port "${SERVER_1_PORT}" & + tcpdump_pid="$!" + + # Start first server: receive UDP, log to file + printf "user.debug\t${logfile}\n" > "$(config_filename ${SERVER_1_PORT})" + syslogd_start_on_port "${SERVER_1_PORT}" -O "${format}" + + # Start second server: send UDP, log to first server + printf "user.debug\t@127.0.0.1:${SERVER_1_PORT}\n" \ + > "$(config_filename ${SERVER_2_PORT})" + syslogd_start_on_port "${SERVER_2_PORT}" -O "${format}" + + # Send test syslog message + syslogd_log -4 -p user.debug -t "${TAG}" -h 127.0.0.1 \ + -P "${SERVER_2_PORT}" -H "${HOSTNAME}" "${MSG}" + + wait "${tcpdump_pid}" # Wait for packet capture to finish +} + +atf_test_case "O_flag_bsd_forwarded" "cleanup" +O_flag_bsd_forwarded_head() +{ + atf_set descr "bsd format test on a forwarded syslog message" + set_common_atf_metadata +} +O_flag_bsd_forwarded_body() +{ + local format="bsd" + local logfile="${PWD}/${format}_forwarded.log" + local pcapfile="${PWD}/${format}_forwarded.pcap" + + setup_forwarded_format_test "${format}" "${logfile}" "${pcapfile}" + + atf_expect_fail \ + "PR 220246 syslog -O bsd deviates from RFC 3164 recommendations" + atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" + atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC3164_PAYLOAD}" \ + tcpdump -A -r "${pcapfile}" +} +O_flag_bsd_forwarded_cleanup() +{ + syslogd_stop_on_ports \ + "${SERVER_1_PORT}" \ + "${SERVER_2_PORT}" +} + +atf_test_case "O_flag_rfc3164_forwarded" "cleanup" +O_flag_rfc3164_forwarded_head() +{ + atf_set descr "rfc3164 format test on a forwarded syslog message" + set_common_atf_metadata +} +O_flag_rfc3164_forwarded_body() +{ + local format="rfc3164" + local logfile="${PWD}/${format}_forwarded.log" + local pcapfile="${PWD}/${format}_forwarded.pcap" + + setup_forwarded_format_test "${format}" "${logfile}" "${pcapfile}" + + atf_expect_fail \ + "PR 220246 syslog -O rfc3164 deviates from RFC 3164 recommendations" + atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" + atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC3164_PAYLOAD}" \ + tcpdump -A -r "${pcapfile}" +} +O_flag_rfc3164_forwarded_cleanup() +{ + syslogd_stop_on_ports \ + "${SERVER_1_PORT}" \ + "${SERVER_2_PORT}" +} + +atf_test_case "O_flag_syslog_forwarded" "cleanup" +O_flag_syslog_forwarded_head() +{ + atf_set descr "syslog format test on a forwarded syslog message" + set_common_atf_metadata +} +O_flag_syslog_forwarded_body() +{ + local format="syslog" + local logfile="${PWD}/${format}_forwarded.log" + local pcapfile="${PWD}/${format}_forwarded.pcap" + + setup_forwarded_format_test "${format}" "${logfile}" "${pcapfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC5424_LOGFILE}" cat "${logfile}" + atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC5424_PAYLOAD}" \ + tcpdump -A -r "${pcapfile}" +} +O_flag_syslog_forwarded_cleanup() +{ + syslogd_stop_on_ports \ + "${SERVER_1_PORT}" \ + "${SERVER_2_PORT}" +} + +atf_test_case "O_flag_rfc5424_forwarded" "cleanup" +O_flag_rfc5424_forwarded_head() +{ + atf_set descr "rfc5424 format test on a forwarded syslog message" + set_common_atf_metadata +} +O_flag_rfc5424_forwarded_body() +{ + local format="rfc5424" + local logfile="${PWD}/${format}_forwarded.log" + local pcapfile="${PWD}/${format}_forwarded.pcap" + + setup_forwarded_format_test "${format}" "${logfile}" "${pcapfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC5424_LOGFILE}" cat "${logfile}" + atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC5424_PAYLOAD}" \ + tcpdump -A -r "${pcapfile}" +} +O_flag_rfc5424_forwarded_cleanup() +{ + syslogd_stop_on_ports \ + "${SERVER_1_PORT}" \ + "${SERVER_2_PORT}" +} + +# Legacy bsd/rfc3164 format tests +# The legacy syntax was introduced in FreeBSD PR 7055, circa 1998 +atf_test_case "O_flag_bsd_forwarded_legacy" "cleanup" +O_flag_bsd_forwarded_legacy_head() +{ + atf_set descr "legacy bsd format test on a forwarded syslog message" + set_common_atf_metadata +} +O_flag_bsd_forwarded_legacy_body() +{ + local format="bsd" + local logfile="${PWD}/${format}_forwarded_legacy.log" + local pcapfile="${PWD}/${format}_forwarded.pcap" + + setup_forwarded_format_test "${format}" "${logfile}" "${pcapfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC3164_LEGACY_LOGFILE}" \ + cat "${logfile}" + atf_check -s exit:0 -e ignore \ + -o match:"${REGEX_RFC3164_LEGACY_PAYLOAD}" \ + tcpdump -A -r "${pcapfile}" +} +O_flag_bsd_forwarded_legacy_cleanup() +{ + syslogd_stop_on_ports \ + "${SERVER_1_PORT}" \ + "${SERVER_2_PORT}" +} + +atf_test_case "O_flag_rfc3164_forwarded_legacy" "cleanup" +O_flag_rfc3164_forwarded_legacy_head() +{ + atf_set descr \ + "legacy rfc3164 format test on a forwarded syslog message" + set_common_atf_metadata +} +O_flag_rfc3164_forwarded_legacy_body() +{ + local format="rfc3164" + local logfile="${PWD}/${format}_forwarded_legacy.log" + local pcapfile="${PWD}/${format}_forwarded.pcap" + + setup_forwarded_format_test "${format}" "${logfile}" "${pcapfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC3164_LEGACY_LOGFILE}" \ + cat "${logfile}" + atf_check -s exit:0 -e ignore \ + -o match:"${REGEX_RFC3164_LEGACY_PAYLOAD}" \ + tcpdump -A -r "${pcapfile}" +} +O_flag_rfc3164_forwarded_legacy_cleanup() +{ + syslogd_stop_on_ports \ + "${SERVER_1_PORT}" \ + "${SERVER_2_PORT}" +} + +atf_init_test_cases() +{ + atf_add_test_case "O_flag_bsd_forwarded" + atf_add_test_case "O_flag_rfc3164_forwarded" + atf_add_test_case "O_flag_syslog_forwarded" + atf_add_test_case "O_flag_rfc5424_forwarded" + + atf_add_test_case "O_flag_bsd_forwarded_legacy" + atf_add_test_case "O_flag_rfc3164_forwarded_legacy" +} From nobody Mon Dec 23 15:49:55 2024 X-Original-To: dev-commits-src-main@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 4YH2XP0gl0z5WrRf; Mon, 23 Dec 2024 15:49: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH2XN1M1Bz4pdv; Mon, 23 Dec 2024 15:49:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968996; 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=YSNflGjmK/+Ee0b7hH3mFlEAnoViwwUoST7l297pNDM=; b=GPDmHGH+rnH9j82eq3K/hHcsvsMhiyt9bej93am4KEGXFU+BtcGGl7T1/AHtivTXKjEiK8 Y04dHcjyFDBKIFAtmtUd0Gp+lCq4cikKmE69i0AQ72T6mFM7lcEiatebn6oLOKJNKiVS9/ oReKT09jE323SUZ7XsYY4vqPMcwPrPt6Ov+gdhBQ0lhNq1yyTYUI2C7UwT/cq51ZgTZSlU robDPhThMAzV4oUFLZ2ZzmNMeFtqDfETHL9Ed59Tmk5eP/QkgOZPoDgLtXQs1vnnMWM/Z+ HwLXE/NoHjCR9Basyev3/pFiL+zHXnuvJq3kUpI8Kjitz8aeBZKOTPXKWvzeXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734968996; 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=YSNflGjmK/+Ee0b7hH3mFlEAnoViwwUoST7l297pNDM=; b=l/ZlKl7Sf6DJJiXZgAXxYMxN3nWPlywmqQmaWXSlnobZ+nABvGZbxTzE3UAkIy2eXlT19h vM+Xe2oYXWqPjjtDSh+MxmHGBdnHzuUSjMYtCu/FC8JrSnJHczR1UM9XX95qpSoHM9jTS9 wOrrx0Nuwv0qlzhmmc1LcG+o+I7VIdIVR4H0V+EJ+CuS4dcE/7uVgaPJRJsNkYJKXJRnM1 E/99xcbDykgtdhoRv13TekDiP+JC7kQvlb2nUgNsrQVVqFFZNoyTFt3FnzTg8FJKs69F85 Z4FUt7mw8DtPMN2GQ6wFzkZp/aTGD4E48ZLMTDRynv6fZ/+t833GL3TRc9CKLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734968996; a=rsa-sha256; cv=none; b=AYqwgkVtv43SMuTmzWZoubSV4RlXZ6CdBnlGcgSrLtwdoRkEaJUy+lDpbX3EM+JwRQkHlm 4UO6gqz3k5uW94xMzXRpQFfv0Zuwfxl/qtmXS0eHzvSKe9QBd29w63W99NTJxixxvZRCJY TLJbnd5B1iUzZw64Rvz/KyON7n7PdzpuSJjqk8G5zQ4gBdqc13HSafe1aX2+9yqNcd4TYT 51RiUMO4/B/0zv5PAZgQ8D+PdiTf52q6cgYNjqJNQbWjMJ4LScB6Xb/UlB3x2eWHbyZoOC 1BOe8QzynKRrz8ZJiGmA5UD6LH35OWsXIHM/tKnmvOGpldiKpmWIGZEB8f9ZEw== 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 4YH2XN0cwTz10Lv; Mon, 23 Dec 2024 15:49:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNFntsY012099; Mon, 23 Dec 2024 15:49:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFntnp012096; Mon, 23 Dec 2024 15:49:55 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:49:55 GMT Message-Id: <202412231549.4BNFntnp012096@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 8cc248fb92bf - main - syslogd: Add rfc3164-strict format option List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8cc248fb92bfae1e6ef4e2b48a0064377c4b3c11 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8cc248fb92bfae1e6ef4e2b48a0064377c4b3c11 commit 8cc248fb92bfae1e6ef4e2b48a0064377c4b3c11 Author: Michal Scigocki AuthorDate: 2024-12-23 04:36:57 +0000 Commit: Mark Johnston CommitDate: 2024-12-23 15:46:14 +0000 syslogd: Add rfc3164-strict format option The syslogd bsd/rfc3164 message format does not strictly conform to the format recommended in RFC 3164 when syslog messages are forwarded from remote hosts. The new rfc3164-strict format generates messages that conform with the RFC 3164 recommended format. The existing format is maintained for backwards compatibility. PR: 220246 Reviewed by: markj MFC after: 3 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/1536 --- usr.sbin/syslogd/syslogd.8 | 11 +++++-- usr.sbin/syslogd/syslogd.c | 34 ++++++++++++++++------ .../syslogd/tests/syslogd_basic_format_test.sh | 20 +++++++++++++ .../syslogd/tests/syslogd_forwarded_format_test.sh | 26 +++++++++++++++++ .../syslogd/tests/syslogd_relayed_format_test.sh | 27 +++++++++++++++++ 5 files changed, 107 insertions(+), 11 deletions(-) diff --git a/usr.sbin/syslogd/syslogd.8 b/usr.sbin/syslogd/syslogd.8 index b23d0327b76c..fa61e78eaf3e 100644 --- a/usr.sbin/syslogd/syslogd.8 +++ b/usr.sbin/syslogd/syslogd.8 @@ -269,14 +269,21 @@ The values .Ar bsd and .Ar rfc3164 -are used to generate RFC 3164 log messages. +are used to generate legacy RFC 3164 log messages. +The value +.Ar rfc3164-strict +is used to generate log messages using the RFC 3164 recommended format, +where messages sent over the network include the hostname, +and messages forwarded by a relay exclude the +.Dq Forwarded from +field. The values .Ar syslog and .Ar rfc5424 are used to generate RFC 5424 log messages, having RFC 3339 timestamps with microsecond precision. -The default is to generate RFC 3164 log messages. +The default is to generate legacy RFC 3164 log messages. .It Fl o Prefix kernel messages with the full kernel boot file as determined by .Xr getbootfile 3 . diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index 23ef5d78c319..be4eaa235d36 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -194,6 +194,13 @@ static STAILQ_HEAD(, socklist) shead = STAILQ_HEAD_INITIALIZER(shead); #define RFC3164_DATELEN 15 #define RFC3164_DATEFMT "%b %e %H:%M:%S" +/* + * FORMAT_BSD_LEGACY and FORMAT_RFC3164_STRICT are two variations of + * the RFC 3164 logging format. + */ +#define IS_RFC3164_FORMAT (output_format == FORMAT_BSD_LEGACY || \ +output_format == FORMAT_RFC3164_STRICT) + static STAILQ_HEAD(, filed) fhead = STAILQ_HEAD_INITIALIZER(fhead); /* Log files that we write to */ static struct filed consfile; /* Console */ @@ -315,7 +322,11 @@ static int LogFacPri; /* Put facility and priority in log message: */ static bool KeepKernFac; /* Keep remotely logged kernel facility */ static bool needdofsync = true; /* Are any file(s) waiting to be fsynced? */ static struct pidfh *pfh; -static bool RFC3164OutputFormat = true; /* Use legacy format by default. */ +static enum { + FORMAT_BSD_LEGACY, /* default, RFC 3164 with legacy deviations */ + FORMAT_RFC3164_STRICT, /* compliant to RFC 3164 recommendataions */ + FORMAT_RFC5424, /* RFC 5424 format */ +} output_format = FORMAT_BSD_LEGACY; static int kq; /* kqueue(2) descriptor. */ struct iovlist; @@ -635,10 +646,12 @@ main(int argc, char *argv[]) case 'O': if (strcmp(optarg, "bsd") == 0 || strcmp(optarg, "rfc3164") == 0) - RFC3164OutputFormat = true; + output_format = FORMAT_BSD_LEGACY; + else if (strcmp(optarg, "rfc3164-strict") == 0) + output_format = FORMAT_RFC3164_STRICT; else if (strcmp(optarg, "syslog") == 0 || strcmp(optarg, "rfc5424") == 0) - RFC3164OutputFormat = false; + output_format = FORMAT_RFC5424; else usage(); break; @@ -666,7 +679,7 @@ main(int argc, char *argv[]) if ((argc -= optind) != 0) usage(); - if (RFC3164OutputFormat && MaxForwardLen > 1024) + if (IS_RFC3164_FORMAT && MaxForwardLen > 1024) errx(1, "RFC 3164 messages may not exceed 1024 bytes"); pfh = pidfile_open(PidFile, 0600, &spid); @@ -1993,7 +2006,10 @@ fprintlog_rfc3164(struct filed *f, const char *hostname, const char *app_name, iovlist_append(&il, priority_number); iovlist_append(&il, ">"); iovlist_append(&il, timebuf); - if (strcasecmp(hostname, LocalHostName) != 0) { + if (output_format == FORMAT_RFC3164_STRICT) { + iovlist_append(&il, " "); + iovlist_append(&il, hostname); + } else if (strcasecmp(hostname, LocalHostName) != 0) { iovlist_append(&il, " Forwarded from "); iovlist_append(&il, hostname); iovlist_append(&il, ":"); @@ -2092,7 +2108,7 @@ fprintlog_first(struct filed *f, const char *hostname, const char *app_name, return; } - if (RFC3164OutputFormat) + if (IS_RFC3164_FORMAT) fprintlog_rfc3164(f, hostname, app_name, procid, msg, flags); else fprintlog_rfc5424(f, hostname, app_name, procid, msgid, @@ -2215,7 +2231,7 @@ cvthname(struct sockaddr *f) if (hl > 0 && hname[hl-1] == '.') hname[--hl] = '\0'; /* RFC 5424 prefers logging FQDNs. */ - if (RFC3164OutputFormat) + if (IS_RFC3164_FORMAT) trimdomain(hname, hl); return (hname); } @@ -2599,7 +2615,7 @@ init(bool reload) err(EX_OSERR, "gethostname() failed"); if ((p = strchr(LocalHostName, '.')) != NULL) { /* RFC 5424 prefers logging FQDNs. */ - if (RFC3164OutputFormat) + if (IS_RFC3164_FORMAT) *p = '\0'; LocalDomain = p + 1; } else { @@ -3134,7 +3150,7 @@ cfline(const char *line, const char *prog, const char *host, if (hl > 0 && f.f_host[hl-1] == '.') f.f_host[--hl] = '\0'; /* RFC 5424 prefers logging FQDNs. */ - if (RFC3164OutputFormat) + if (IS_RFC3164_FORMAT) trimdomain(f.f_host, hl); } diff --git a/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh b/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh index 1969ce180f66..09477a568ba8 100644 --- a/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh +++ b/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh @@ -63,6 +63,25 @@ O_flag_rfc3164_basic_cleanup() syslogd_stop } +atf_test_case "O_flag_rfc3164strict_basic" "cleanup" +O_flag_rfc3164strict_basic_head() +{ + atf_set descr "rfc3164-strict format test on local syslog message" +} +O_flag_rfc3164strict_basic_body() +{ + local format="rfc3164-strict" + local logfile="${PWD}/O_flag_${format}_basic.log" + + setup_basic_format_test "${format}" "${logfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" +} +O_flag_rfc3164strict_basic_cleanup() +{ + syslogd_stop +} + atf_test_case "O_flag_syslog_basic" "cleanup" O_flag_syslog_basic_head() { @@ -105,6 +124,7 @@ atf_init_test_cases() { atf_add_test_case "O_flag_bsd_basic" atf_add_test_case "O_flag_rfc3164_basic" + atf_add_test_case "O_flag_rfc3164strict_basic" atf_add_test_case "O_flag_syslog_basic" atf_add_test_case "O_flag_rfc5424_basic" } diff --git a/usr.sbin/syslogd/tests/syslogd_forwarded_format_test.sh b/usr.sbin/syslogd/tests/syslogd_forwarded_format_test.sh index 3d220a80b7e8..b17627a935c8 100644 --- a/usr.sbin/syslogd/tests/syslogd_forwarded_format_test.sh +++ b/usr.sbin/syslogd/tests/syslogd_forwarded_format_test.sh @@ -94,6 +94,31 @@ O_flag_rfc3164_forwarded_cleanup() "${SERVER_2_PORT}" } +atf_test_case "O_flag_rfc3164strict_forwarded" "cleanup" +O_flag_rfc3164strict_forwarded_head() +{ + atf_set descr "rfc3164-strict format test on a forwarded syslog message" + set_common_atf_metadata +} +O_flag_rfc3164strict_forwarded_body() +{ + local format="rfc3164-strict" + local logfile="${PWD}/${format}_forwarded.log" + local pcapfile="${PWD}/${format}_forwarded.pcap" + + setup_forwarded_format_test "${format}" "${logfile}" "${pcapfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" + atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC3164_PAYLOAD}" \ + tcpdump -A -r "${pcapfile}" +} +O_flag_rfc3164strict_forwarded_cleanup() +{ + syslogd_stop_on_ports \ + "${SYSLOGD_UDP_PORT_1}" \ + "${SYSLOGD_UDP_PORT_2}" +} + atf_test_case "O_flag_syslog_forwarded" "cleanup" O_flag_syslog_forwarded_head() { @@ -205,6 +230,7 @@ atf_init_test_cases() { atf_add_test_case "O_flag_bsd_forwarded" atf_add_test_case "O_flag_rfc3164_forwarded" + atf_add_test_case "O_flag_rfc3164strict_forwarded" atf_add_test_case "O_flag_syslog_forwarded" atf_add_test_case "O_flag_rfc5424_forwarded" diff --git a/usr.sbin/syslogd/tests/syslogd_relayed_format_test.sh b/usr.sbin/syslogd/tests/syslogd_relayed_format_test.sh index 21481823068d..d3e0db4e0f1c 100644 --- a/usr.sbin/syslogd/tests/syslogd_relayed_format_test.sh +++ b/usr.sbin/syslogd/tests/syslogd_relayed_format_test.sh @@ -101,6 +101,32 @@ O_flag_rfc3164_relayed_cleanup() "${SERVER_3_PORT}" } +atf_test_case "O_flag_rfc3164strict_relayed" "cleanup" +O_flag_rfc3164strict_relayed_head() +{ + atf_set descr "rfc3164-strict format test on a relayed syslog message" + set_common_atf_metadata +} +O_flag_rfc3164strict_relayed_body() +{ + local format="rfc3164-strict" + local logfile="${PWD}/${format}_relayed.log" + local pcapfile="${PWD}/${format}_relayed.pcap" + + setup_relayed_format_test "${format}" "${logfile}" "${pcapfile}" + + atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" + atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC3164_PAYLOAD}" \ + tcpdump -A -r "${pcapfile}" +} +O_flag_rfc3164strict_relayed_cleanup() +{ + syslogd_stop_on_ports \ + "${SYSLOGD_UDP_PORT_1}" \ + "${SYSLOGD_UDP_PORT_2}" \ + "${SYSLOGD_UDP_PORT_3}" +} + atf_test_case "O_flag_syslog_relayed" "cleanup" O_flag_syslog_relayed_head() { @@ -157,6 +183,7 @@ atf_init_test_cases() { atf_add_test_case "O_flag_bsd_relayed" atf_add_test_case "O_flag_rfc3164_relayed" + atf_add_test_case "O_flag_rfc3164strict_relayed" atf_add_test_case "O_flag_syslog_relayed" atf_add_test_case "O_flag_rfc5424_relayed" } From nobody Mon Dec 23 16:05:05 2024 X-Original-To: dev-commits-src-main@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 4YH2ss64Dfz5WsFH; Mon, 23 Dec 2024 16:05:05 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH2ss5LyRz4sk4; Mon, 23 Dec 2024 16:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734969905; 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=Z/sJrurirJUkx37J7vvl8jRGuHun5grsxeAgG/qLxuI=; b=m2aJ74AEWRqUCDdqQ67ScWkqQcbae8ktIsDRcD/2RU63eunGSLTuyla6dBgs8GbeC9a7ku Kh3qKeSeyXOuUjL8YktgZQN/QwuJgA83g4Uw6M8iwOXStI4I+2ZbnrtyDPrNFxg+ZfPNNn oFFS2RaPqQhHZHgLwxcWuuvbAYskXidbSjjWVfa3iL+3Fdg3KKysUHfzixqf/Rq+jWRlWY h5zxwgUSSLOb60GKqAJb2SaXYQJqvmfOOtdo+JZSXHANsYFW9tUHJDxxu0cNKLwobLmDxR bLXNvdzqfgdszfXFNX6N3H3vlffXUDlS6vsSaXiCg4Y0peoHvVDxH0xA339eeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734969905; 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=Z/sJrurirJUkx37J7vvl8jRGuHun5grsxeAgG/qLxuI=; b=sKLQGlVY2wlEF1RTkcfkxxvQB73gM0RattnNcJBSGcIwSSHngL304pTcRYJwUowEPYGISS ri5vZVLrw3ANlzLAMPbXjqLGOkp2W1mQ9N7ICFrOLdJtVzucFKIiUOMQOVHhwcnkYcSsxe 5xHjSP98wIwS5RRaE79jWTJWl+hf19l9XEJxxzWekYusFTcXV29ENSeDqHqiJh2aT001hM nsPX0rCyLt8jA6LHNVjDar2r2tjCAqMK+qzAwR5xnKEyqzz7hv7/F2vT/nZUyaUcFWM3Cv Mh1lQcyYRAFr++aqVI46TWTYwbiLwC0dIMgPcS8xvmzwnGtJIzFbXjpBpbT+0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734969905; a=rsa-sha256; cv=none; b=REbYPyA3qkvuiDirEMA47+7J37TsnUKn1kip5umlJHwWuPNLonf2aVX+9XxEOhTv28ymlx fTnRiA1tTkLA5OdVmLzFCG3nfZuj9+Jj+smrGMUcnteYj6tjiUkY6dxH2oQzU/MyDcj2ae Zvf9ta7FO+2jUYDBxVAPCuAoYNP8IqIlBek9qjXr6879eQWS79L1AEDHZ3WOYpu6uZZv2z xWzk9Eh2w/glPw5UHtjRGn8eyTNMm9WMX+lDMawpwdbCUi5JxCXkZoFqF97UkOTHZnjwJB QlPKZz12ZoigqZBKKI6nWl3QobLZ/Rg/Rq9sfUhrQIaoIlaly6qfTeMF22US1g== 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 4YH2ss4yLHz10Ph; Mon, 23 Dec 2024 16:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNG55nZ049052; Mon, 23 Dec 2024 16:05:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNG55AH049049; Mon, 23 Dec 2024 16:05:05 GMT (envelope-from git) Date: Mon, 23 Dec 2024 16:05:05 GMT Message-Id: <202412231605.4BNG55AH049049@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b45f84cc6213 - main - makefs: Exit with error if writing cd image fails List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b45f84cc6213854ead00a4bfc7973332eda65676 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b45f84cc6213854ead00a4bfc7973332eda65676 commit b45f84cc6213854ead00a4bfc7973332eda65676 Author: Ed Maste AuthorDate: 2024-12-23 15:54:32 +0000 Commit: Ed Maste CommitDate: 2024-12-23 16:03:36 +0000 makefs: Exit with error if writing cd image fails Obtained from: OpenBSD c8f48d9b1ea9 Sponsored by: The FreeBSD Foundation --- usr.sbin/makefs/cd9660.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index 19bd6e0d21b0..d3baa3b78a6e 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -462,7 +462,7 @@ cd9660_makefs(const char *image, const char *dir, fsnode *root, fsinfo_t *fsopts) { int64_t startoffset; - int numDirectories; + int ret, numDirectories; uint64_t pathTableSectors; int64_t firstAvailableSector; int64_t totalSpace; @@ -604,7 +604,7 @@ cd9660_makefs(const char *image, const char *dir, fsnode *root, if (diskStructure->include_padding_areas) diskStructure->totalSectors += 150; - cd9660_write_image(diskStructure, image); + ret = cd9660_write_image(diskStructure, image); if (diskStructure->verbose_level > 1) { debug_print_volume_descriptor_information(diskStructure); @@ -616,7 +616,10 @@ cd9660_makefs(const char *image, const char *dir, fsnode *root, cd9660_free_structure(real_root); if (diskStructure->verbose_level > 0) - printf("%s: done\n", __func__); + printf("%s: done ret = %d\n", __func__, ret); + + if (ret == 0) /* cd9660_write_image() failed */ + exit(1); } /* Generic function pointer - implement later */ From nobody Mon Dec 23 17:16:17 2024 X-Original-To: dev-commits-src-main@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 4YH4S13sZ3z5WyyR; Mon, 23 Dec 2024 17:16: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH4S13GMbz51v5; Mon, 23 Dec 2024 17:16:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734974177; 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=OFQcxqdQVvcZM3scWwTNtjXOPpXSJnes/z2ci71tL/8=; b=yXEshEkHGwS1DrcMkILUsyH/fXWw7xrUzENQHoqTDyKy1M1yw+E1kaat6Y6j0dAh77ecbt /VbLwl/TXUd3DfI3fJFP2sYc3VrtFB4zkfoISkFRFoDYvHfrGlDGAckfhG8xhV+zIuFyeI uh88Ml1XD0ph47jnWzLUaYFI/h/B+ixoFf0GlXcD1l2AS/UcNWH4TnXXLqc9biP2TM/Jz0 0TmEM3JIuTVogWL8x0rD6JtIKZLOjT6gWBS3VDusU0geLY3V7LcnYad8m1OiPZrYmUqip/ xR+XDt0APRjkFblgl4DdGXzT2dHEwpKOTR/dHPU7xUOEo8tZFp2YG2nR9LU1aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734974177; 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=OFQcxqdQVvcZM3scWwTNtjXOPpXSJnes/z2ci71tL/8=; b=a8w9a5s4BG7PEdlRcUv65TsYPukMB/7xGd4BgAA0K6ehuHWg72LuKSseJje0cW1CaM7xHu k7zPR60cGhekQgclZZ/kFkvZ06L7/4TBbyXoOjLZ85CldvhBilrYVFUE1+h31wqCQoiE6H s6PzpOTWlrlJC6haUOxwtnsrXqP8PgitLHetXvOcdo3ufFvGjBxZ847ccapcIDflHcjJE0 /1iIAaKk9k3jOHcHEfZHsC8n6XzBzNB1pkHUJbIVNSSMebhw6OB6ukyhqUi30oX69RtokE UqO8xpTbD5PdrnJ5Tg3pxC8lujjmxyUnrzVOee94ZmiSHBagOJCHzRg0a96CIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734974177; a=rsa-sha256; cv=none; b=gsDeOSqAg07l9yWkitWvZ8U2inpb/5sOKfY/k1xx4gICXnP/bmGBod5Y5OnwplTXHMqVOV aqOPLWYGmyqRZffUgjKK9IHW09OGA2gLxD2s1JufA84GoZMD7jeA9Rol6dU1T+tJZV9o2L 4FvGKz8hYf7sl9kTvgUE0W7/B8ot+yCrZrmzTqS7hQejudoZD7LF9cvV8HOEMyc1hBNHac vHFX/k6vsNqpIk6TMqIlTMX6/tnX/mIifuV5OqppemmkLi2rR2cH4UTbwPgW/Tf7d63DZy 2wH54YyZaptcz1gh43nXM3aam5Te0B4SCXoXagOBsCSUEdLwKA/WauAAS79NgQ== 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 4YH4S12sNkz12qG; Mon, 23 Dec 2024 17:16:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNHGH9S079712; Mon, 23 Dec 2024 17:16:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNHGHrr079709; Mon, 23 Dec 2024 17:16:17 GMT (envelope-from git) Date: Mon, 23 Dec 2024 17:16:17 GMT Message-Id: <202412231716.4BNHGHrr079709@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 893839b11988 - main - diff: Fix device case. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 893839b119880d3fe8ab18aba4563af6c80cb875 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=893839b119880d3fe8ab18aba4563af6c80cb875 commit 893839b119880d3fe8ab18aba4563af6c80cb875 Author: Dag-Erling Smørgrav AuthorDate: 2024-12-23 17:15:57 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-12-23 17:16:14 +0000 diff: Fix device case. We already fell back to Stone for FIFOs, but we actually need to fall back to Stone for everything except regular files, because libdiff's atomizer needs to know the size of its input in advance, and neither FIFOs nor devices can be trusted to report their size. MFC after: 1 week Reported by: mav Reviewed by: mav, allanjude Differential Revision: https://reviews.freebsd.org/D48181 --- usr.bin/diff/diffreg_new.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/diff/diffreg_new.c b/usr.bin/diff/diffreg_new.c index af9104559986..f54cd554ccad 100644 --- a/usr.bin/diff/diffreg_new.c +++ b/usr.bin/diff/diffreg_new.c @@ -314,8 +314,8 @@ openfile(const char *path, char **p, struct stat *st) bool can_libdiff(int flags) { - /* We can't use fifos with libdiff yet */ - if (S_ISFIFO(stb1.st_mode) || S_ISFIFO(stb2.st_mode)) + /* libdiff's atomizer can only deal with files */ + if (!S_ISREG(stb1.st_mode) || !S_ISREG(stb2.st_mode)) return false; /* Is this one of the supported input/output modes for diffreg_new? */ From nobody Mon Dec 23 17:29:01 2024 X-Original-To: dev-commits-src-main@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 4YH4lM64XGz5X0kb; Mon, 23 Dec 2024 17:29:35 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp052.goneo.de (smtp5.goneo.de [IPv6:2001:1640:5::8:30]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4YH4lM3Sdjz52tp; Mon, 23 Dec 2024 17:29:35 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; none Received: from hub1.goneo.de (hub1.goneo.de [85.220.129.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp5.goneo.de (Postfix) with ESMTPS id 4E929240EA6; Mon, 23 Dec 2024 18:29:31 +0100 (CET) Received: from hub1.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPS id 5C7D0240615; Mon, 23 Dec 2024 18:29:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1734974969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=alyBtS98jmo+NyP93Cho6jGtclTm//yLXurH2imUMR0=; b=CIdhDcuh/mfnMfxkOGPYNA7j9E9gfW9Py3aITLy5GmnBy9YWi2TD9EB3Qv+N/q0GCkA9zk VKSB2h7E6twBqa/VNu056YmiqRpdZQoMghap8zyzX9hcTnal2TqDPFZNj0/iegYXNoXFi2 fBmB/rxxbzlUC+4iKWHpTBKM0Ygk16qx6mGIfzkfeitJRclL5uBOd656cf7bJIXBnWMyTU dfWvrggOYtFXaH4hLLM4vaI8jFHMgWpEF/W3Q79uG7kn+kebiRlaI59zmIInVc9ewDRxun L4V86yhhZ8rvPYSRy2DeUiePS6Way1pH3eeeeGGBloYgGH4NjPG9zYe7ZJ3L8w== Received: from thor.intern.walstatt.dynvpn.de (dynamic-077-011-159-187.77.11.pool.telefonica.de [77.11.159.187]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPSA id EB57D240591; Mon, 23 Dec 2024 18:29:28 +0100 (CET) Date: Mon, 23 Dec 2024 18:29:01 +0100 From: FreeBSD User To: Olivier Certner Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: bc201841d139 - main - mac_do(4): Revamp manual page after MAC/do updates Message-ID: <20241223182928.024fa9a2@thor.intern.walstatt.dynvpn.de> In-Reply-To: <202412231439.4BNEdpwp079873@gitrepo.freebsd.org> References: <202412231439.4BNEdpwp079873@gitrepo.freebsd.org> Organization: walstatt-de.de List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-UID: a4cb78 X-Rspamd-UID: 636340 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:25394, ipnet:2001:1640::/32, country:DE] X-Rspamd-Queue-Id: 4YH4lM3Sdjz52tp X-Spamd-Bar: ---- Am Mon, 23 Dec 2024 14:39:51 GMT Olivier Certner schrieb: Module MAC_DO can not be compiled statically into the kernel. trying so on = most recent CURRENT, via options MAC_DO results in a=20 unknown option "MAC_DO" Kind regards, oh > The branch main has been updated by olce: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dbc201841d13928c2a088fb07ac= 0a010b36eafa13 >=20 > commit bc201841d13928c2a088fb07ac0a010b36eafa13 > Author: Olivier Certner > AuthorDate: 2024-12-19 21:13:12 +0000 > Commit: Olivier Certner > CommitDate: 2024-12-23 14:39:35 +0000 >=20 > mac_do(4): Revamp manual page after MAC/do updates > =20 > The new manual page in particular describes MAC/do's new rules syntax > and the jail support, as well as security considerations explaining t= he > overall design and how to leverage it in the most secure fashion. > =20 > Reviewed by: bapt, otis, Alexander Ziaee = (in part) > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D48153 > --- > share/man/man4/mac_do.4 | 460 ++++++++++++++++++++++++++++++++++++++++++= +----- > 1 file changed, 417 insertions(+), 43 deletions(-) >=20 > diff --git a/share/man/man4/mac_do.4 b/share/man/man4/mac_do.4 > index aa84a71b4953..9a9f669cd51c 100644 > --- a/share/man/man4/mac_do.4 > +++ b/share/man/man4/mac_do.4 > @@ -1,38 +1,274 @@ > .\"- > +.\" SPDX-License-Identifier: BSD-2-Clause > +.\" > .\" Copyright (c) 2024 Baptiste Daroussin > +.\" Copyright (c) 2024 The FreeBSD Foundation > .\" > -.\" SPDX-License-Identifier: BSD-2-Clause > +.\" Portions of this documentation were written by Olivier Certner > +.\" at Kumacom SARL under sponsorship from the FreeBSD > +.\" Foundation. > .\" > -.Dd May 22, 2024 > +.Dd December 19, 2024 > .Dt MAC_DO 4 > .Os > .Sh NAME > .Nm mac_do > -.Nd "policy allowing user to execute program as another user" > +.Nd "policy allowing unprivileged users to change process credentials" > .Sh SYNOPSIS > To compile the > -.Nm > -policy into your kernel, place the following lines > -in your kernel configruation file: > +.Sy mac_do > +policy into your kernel, place the following lines in your kernel config= uration > +file: > .Bd -ragged -offset indent > .Cd "options MAC" > .Cd "options MAC_DO" > .Ed > +.Pp > +Alternately, to load this policy module at boot time, place the followin= g line > +in your kernel configuration file: > +.Bd -ragged -offset indent > +.Cd "options MAC" > +.Ed > +.Pp > +and in > +.Xr loader.conf 5 : > +.Bd -literal -offset indent > +mac_do_load=3D"YES" > +.Ed > .Sh DESCRIPTION > The > .Nm > -policy grants users the ability to run processs as other users > -according to predefined rules. > +policy module allows unprivileged users to change process credentials ac= cording > +to rules configured by the administrator. > +It supports per-jail configuration. > +.Pp > +Currently, the > +.Nm > +policy module only produces effects to processes spwaned from the > +.Pa /usr/bin/mdo > +executable, please see > +.Xr mdo 1 > +for more details on this program. > +.Sh CREDENTIALS RULES > +Rules specify which transitions of process credentials > +.Nm > +will allow, based on current process credentials and the desired final o= nes. > +They are passed by an administrator in the form of a string having the s= pecific > +syntax described below in a top-bottom manner. > +They have been designed to be able to finely describe the desired target > +credentials in a safe and compact way. > +.Ss Top-Level List of Rules > +At the top, rules are a possibly empty list of individual rules separate= d by > +a semi-colon > +.Pq Ql ";" : > +.Dl Ao rules Ac \ =E2=9F=B6\ Oo Ao rule Ac Oo So ";" Sc Ao rule Ac Oc N= s * Oc > +They form a disjunction, i.e., > +.Nm > +authorizes a credentials transition as soon as at least one rule in the = list > +matches. > .Pp > -The exact set of kernel privileges granted are: > -.Bl -inset -compact -offset indent > -.It Dv PRIV_CRED_SETGROUPS > -.It Dv PRIV_CRED_SETUID > +One rule is composed of a > +.Li Aq from > +part > +.Pq also called Dq match > +and a > +.Li Aq to > +part > +.Pq also called Dq target , > +in this order, separated by a colon > +.Pq Ql ":" : > +.Dl Ao rule Ac \ =E2=9F=B6\ Ao from Ac So ":" Sc Ao to Ac > +.Ss Rule's Ao from Ac Part > +The first part of a rule, > +.Li Aq from , > +is matched against the credentials of the process requesting some creden= tials > +transition. > +It has the form: > +.Dl Ao from Ac \ =E2=9F=B6\ Ao type Ac So =3D Sc Ao id Ac > +.Pp > +.Li Aq type > +must be: > +.Dl Ao type Ac \ =E2=9F=B6\ Op So uid Sc | So gid Sc > +i.e., one of the literal strings > +.Ql uid > +or > +.Ql gid . > +.Li Aq id > +must be the numerical ID of a user or group, and is matched with the cur= rent > +process real ID of the corresponding type. > +.Ss Rule's Ao to Ac Part > +The second part of a rule, > +.Li Aq to , > +is a comma-separated > +.Pq Ql "," > +non-empty list of target clauses: > +.Dl Ao to Ac \ =E2=9F=B6\ Ao target_clause Ac Oo So "," Sc Ao target_cl= ause Ac Oc Ns * > +Target clauses of a given rule also form a disjunction, i.e., the IDs th= ey > +specify are alternatives for the target credentials, except in some cases > +described below. > +.Pp > +The next subsections describe the syntax of target clauses, the defaults= that > +apply and the principle of non-redundancy and non-contradiction in each = rule's > +.Li Aq to > +part. > +.Ss Target Clauses > +A target clause in a rule's > +.Li Aq to > +part must be of one of the following forms: > +.Dl Ao target_clause Ac \ =E2=9F=B6\ So any Sc > +.Dl Ao target_clause Ac \ =E2=9F=B6\ Ao flags Ac Ao type Ac So =3D Sc A= o id Ac > +The first form is a compact way to specify that any target credentials a= re > +allowed. > +The second form is similar to that of > +.Li Aq from > +clauses, with the following extensions: > +.Bl -bullet -compact > +.It > +.Li Aq id > +may also be a literal > +.Ql * > +or > +.Ql any > +or > +.Ql "." . > +.Ql * > +and > +.Ql any > +both designate any ID for the specified > +.Li Aq type , > +and are treated identically. > +.Ql "." > +designates the process' current IDs for the specified > +.Li Aq type , > +as explained below. > +.It > +.Li Aq flags > +may contain at most one of the > +.Ql + , > +.Ql - > +and > +.Ql "!" > +characters, and may be non-empty only when > +.Li Aq type > +is > +.Ql gid . > +Additionally, if > +.Li Aq id > +is > +.Ql * > +or > +.Ql any , > +only the > +.Ql + > +flag may appear. > +.El > +.Pp > +For target clauses of > +.Ql gid > +type, an absence of flag indicates that the specified group ID is allowe= d as the > +real, effective and/or saved group IDs > +.Pq the Do primary Dc groups . > +Conversely, the presence of any allowed flag indicates that the specific= ation > +concerns supplementary groups. > +Each flag has a specific meaning: > +.Bl -bullet -compact > +.It > +.Ql + > +indicates that the group ID is allowed as a supplementary group. > +.It > +.Ql "!" > +indicates that the group ID is mandatory, i.e., it must be listed in the > +supplementary groups. > +.It > +.Ql - > +indicates that the group ID must not be listed in the supplementary grou= ps. > .El > +A specification with > +.Ql - > +is only useful in conjunction with a > +.Ql + Ns > +-tagged specification where only one of them has > +.Ql "." > +as its > +.Li Aq id . > +Target clauses having the > +.Ql "!" > +or > +.Ql - > +flag are > +.Dq forcing > +clauses, and as such do not take part in the disjunction of the other > +target clauses but rather unconditionally apply in their rule. > +.Pp > +.Ql "." > +is a placeholder for IDs that the calling process already has on privile= ge > +check. > +For type > +.Ql uid , > +it designates any of the process' real, effective or > +saved user IDs. > +For type > +.Ql gid , > +its effect depends on whether flags are present. > +If none is present, it designates any of the process' real, effective or= saved > +group IDs. > +If one is present, it designates any of the process' supplementary group= s. > +.Ss Defaults for the Ao to Ac Part > +If the > +.Li Aq to > +part does not list a target clause with type > +.Ql uid , > +any of the current user IDs of the calling process is accepted. > +In other words, in this case, > +.Nm > +behaves as if a target clause of: > +.Dl uid=3D. > +had been listed. > .Pp > +Similarly, if the > +.Li Aq to > +part does not list a target clause with type > +.Ql gid , > +all the groups of the calling process are assumed to be required. > +More precisely, each of the desired real, effective and saved group IDs = must be > +one of the current real, effective or saved group ID, and all supplement= ary > +groups must be the same as those that are current. > +It is as if the > +.Li Aq to > +part had contained the following two clauses: > +.Dl gid=3D.,!gid=3D. > +.Ss Non-Redundancy and Non-Contradiction in a Ao to Ac Part > +No two target clauses of a single rule may express the exact same logica= l intent > +nor contradictory ones. > +.Pp > +In practice, no two clauses may display the same ID except for group IDs= but > +only if, each time the same ID appears, it does so with a different flag= , or no > +flags only once. > +Additionally, the specified flags in multiple occurences must not be > +contradictory. > +For example, the same group ID appearing with both > +.Ql + > +and > +.Ql - > +will cause rejection of the rule. > +.Ss Parsing Specifics > +Any amount of whitespace is allowed around tokens of the above grammar, = except > +that there may be no spaces between > +.Li Aq flags > +and > +.Li Aq id > +in target clauses. > +.Pp > +For convenience, numerical IDs may be specified as negative integers, wh= ich are > +then converted to unsigned ones as specified in the C standard for the > +.Vt uid_t > +and > +.Vt gid_t > +types, which are both 64-bit unsigned integers. > +.Sh RUNTIME CONFIGURATION > The following > .Xr sysctl 8 > -MIBs are available: > +knobs are available: > .Bl -tag -width indent > .It Va security.mac.do.enabled > Enable the > @@ -40,39 +276,177 @@ Enable the > policy. > (Default: 1). > .It Va security.mac.do.rules > -The set of rules. > +The list of credential rules, whose syntax is described in the > +.Sx CREDENTIALS RULES > +section above. > +This list is specific to each jail. > +Please see the > +.Sx JAIL SUPPORT > +section below for more details on the interaction of > +.Nm > +with jails. > +.It Va security.mac.do.print_parse_error > +Logs a message on trying to set incorrect rules via the > +.Va security.mac.do.rules > +.Xr sysctl 8 > +knob. > .El > +.Sh JAIL SUPPORT > +.Nm > +supports per-jail configuration of rules. > .Pp > -The rules consist of a list of elements separated by > -.So , Sc . > -Each element is of the form > -.Sm off > -.Do > -.Op Cm uid | Cm gid > -.Li =3D > -.Ar fid > -.Li : > -.Ar tid > -.Dc > -.Sm on . > -Where > -.Ar fid > -is the uid or gid of the user or group the rule applies to, and > -.Ar tid > -is the uid of the targetted user. > -Two special forms are accepted for > -.Ar tid : > -.Va any > -or > -.Va * , > -which allow to target any user. > -.Sh EXAMPLES > -The following rule: > +By default, at creation, a new jail has no credentials rules, effectively > +disabling > +.Nm > +for its processes. > .Pp > -.Dl security.mac.do.rules=3Duid=3D1001:80,gid=3D0:any > +The following jail parameters are defined: > +.Bl -tag -width indent > +.It Va mac.do > +Possible values are: > +.Bl -tag -width "'disable'" -compact > +.It Ql enable > +.Nm > +will enforce specific credential rules in the jail. > +The > +.Va mac.do.rules > +jail parameter must also be set in this case. > +.It Ql disable > +Disables > +.Nm > +in the jail. > +Strictly equivalent to jail creation's default behavior and to setting t= he rules > +to an empty string. > +.It Ql inherit > +The jail's credentials rules are inherited from the jail's parent > +.Pq which may themselves have been inherited . > +Modified rules propagate to all children jails configured for inheritanc= e. > +.El > +.It Va mac.do.rules > +The credentials rules for the jail. > +It is always equal to the value that can be retrieved by the > +.Xr sysctl 8 > +knob > +.Va security.mac.do.rules > +described in section > +.Sx RUNTIME CONFIGURATION . > +If set, and the jail parameter > +.Va mac.do > +is not so explicitly, the value of the latter will default to > +.Ql disable > +if empty, else to > +.Ql enable . > +.El > .Pp > -means the user with the uid 1001 can execute processes as user with uid = 80, > -all the users which belongs to the group gid 0 can execute processes as = any user. > +Each jail must have > +.Xr mdo 1 > +installed at path > +.Pa /usr/bin/mdo , > +as this path is currently not configurable. > +.Sh EXAMPLES > +Here are several examples of single rules matching processes having a re= al user > +ID of 10001: > +.Bl -tag -width indent > +.It Li uid=3D10001:uid=3D10002 > +Allows the process to switch any of its real, effective or saved user ID= to > +10002, but keeping the groups it is already in, and with the same > +primary/supplementary groups split. > +.It Li uid=3D10001:uid=3D10002,uid=3D10003 > +Same as the first example, but also allows to switch to UID 10003 instea= d of > +10002. > +.It Li uid=3D10001:uid=3D10002,gid=3D10002 > +Same as the first example, but the new primary groups must be set to 100= 02 and > +no supplementary groups should be set. > +.It Li uid=3D10001:uid=3D10002,gid=3D10002,+gid=3D.\& > +Same as the previous example, but in addition allowing to retain any cur= rent > +supplementary groups. > +.It Li uid=3D10001:uid=3D10002,gid=3D10002,!gid=3D.\& > +Same as the previous example, but with the additional constraint that all > +current supplementary groups must be kept. > +.It Li uid=3D10001:uid=3D10002,gid=3D10002,+gid=3D.,-gid=3D10001 > +Same as > +.Ql uid=3D10001:uid=3D10002,gid=3D10002,+gid=3D.\& > +above, but 10001 cannot be retained as a supplementary group. > +.It Li uid=3D10001:uid=3D10002,gid=3D10002,+gid=3D.,!gid=3D10003 > +Same as > +.Ql uid=3D10001:uid=3D10002,gid=3D10002,+gid=3D.\& > +above, with the additional constraint that 10003 must appear in the > +supplementary groups. > +.It Li uid=3D10001:uid=3D10002,gid=3D*,+gid=3D* > +Same as the first example, but lifting any constraints on groups, allowi= ng the > +process to become part of any groups it sees fit. > +.El > +.Pp > +Here are several examples of single rules matching processes having a re= al group > +ID of 10001: > +.Bl -tag -width indent > +.It Li gid=3D10001:uid=3D0 > +Makes 10001 a more powerful > +.Ql wheel > +group, allowing its members to switch to root without password. > +.It Li gid=3D10001:gid=3D10002 > +Allows the process to enter GID 10002 as a primary group, but only if > +giving up all its supplementary groups. > +.It Li security.mac.do.rules=3Dgid=3D10001:gid=3D10002,+gid=3D.\& > +Same as the previous example, but allows to retain any current supplemen= tary > +groups. > +.It Li gid=3D10001:gid=3D10002,!gid=3D.\& > +Same as the previous example, but with the additional constraint that all > +current supplementary groups must be kept. > +.El > .Sh SEE ALSO > .Xr mdo 1 , > -.Xr mac 4 > +.Xr setcred 2 , > +.Xr mac 4 , > +.Xr jail 8 , > +.Xr sysctl 8 > +.Sh AUTHORS > +.An Olivier Certner Aq Mt olce@FreeBSD.org > +.An Baptiste Daroussin Aq Mt bapt@FreeBSD.org > +.Sh BUGS > +Currently, > +.Nm > +considers only credentials transitions requested through the > +.Xr setcred 2 > +system call. > +This system call was in large part created so that > +.Nm > +can see whole credentials transitions to decide whether to authorize the= m, which > +the traditional UNIX's piecewise approach of successively changing diffe= rent > +parts of them cannot allow. > +.Pp > +However, calls to traditional or standard credentials-changing functions= can be > +considered as full transitions on their own, however limited, and as suc= h should > +be equally monitored by > +.Nm . > +Future work will lift this restriction. > +.Sh SECURITY CONSIDERATIONS > +The threat model for > +.Nm > +is to consider userland programs as generally untrustable to decide upon= which > +credentials changes are acceptable. > +It is in contrast with the traditional UNIX way to change credentials, i= n which > +specialized programs are installed with the setuid bit, giving them full > +administrator privileges so that they are effectively able to establish = new > +ones. > +Vulnerabilities in such credentials-changing programs can have catastrop= hic > +consequences on the integrity of the system. > +.Pp > +Consequently, > +.Nm > +does not rely on companion userland programs to decide whether some cred= entials > +transition is acceptable. > +Instead, it maintains its own configuration independently from the userl= and > +password and group databases. > +Establishing this configuration currently itself relies on userland prog= rams > +issuing calls to > +.Xr sysctl 3 > +or > +.Xr jail 2 . > +It should thus be established near system boot or jail start, before any > +possible attacks could happen on the system, and further measures should= be > +taken to ensure that potential corruptions does not affect the configura= tion in > +subsequent restarts, such as re-establishing pristine state or ensuring = that the > +boot procedure up to the configuration of > +.Nm > +can be trusted. >=20 --=20 O. Hartmann From nobody Mon Dec 23 18:36:26 2024 X-Original-To: dev-commits-src-main@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 4YH6DW04B0z5hDf3; Mon, 23 Dec 2024 18:36: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH6DV6WFtz58Cy; Mon, 23 Dec 2024 18:36:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734978986; 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=RQIK77/DN1TTPXvynoUsQiDs158nlJJsehhy2cDfeV4=; b=epKZ6dQOYuLAHEk2eORXw8vmwILD/ouB3WZjY0rn38NPWWZ+q8bliQO7iLl8Bbn2BHIKEP SLL5+WB9qVyWDjY+ROWIhumFga4soE+RCbrnXZ/24PZd6/axmMamKN44JX4lXfyOX72OJi RPfsT22qaQmsKbnEzSFD5/CbopP8uYfgSd4QQYqdpCRMou6dG+/rR0qXScb/nzztNTaDP9 FRoF8MUCKXpx2dY2ZtcZjRJYXaVx/1/bUXQJKw6h8jEPR29KX1RjNL2QXwh/g0pJrjxb75 vX+TX/9ZHakFkT7EkA0N8FoP3DOL3paoAipcEnjMFUBuLypF3sd67vGel/DE3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734978986; 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=RQIK77/DN1TTPXvynoUsQiDs158nlJJsehhy2cDfeV4=; b=pp83C30TJ4/DL82lLGBAG0EXGzH6Dv8drm8PZ2lJv4ZJAIlLeixxb7pobKRjk+YkXbSLRr FY4i5C6UvKrVyQq6xmfDLuFnjfilR52pBOHANMkYTLvTFpDPjlHmiUR87zEe53WmUbdq6j JjpCjCJx8WId3pjB5ZewQUfjTcqa/rInhMuUSSEQP9zhlSFjiYWc6RxOxedjvjinqQ22kd nyReNpHqNhGSZH28jkWlDHfQOF1KDRTmQaRs5BqLRBN+161l+C6mdkk/IYnsfl7oQKNF2e TTClGFOnlTQHAnPklZEPieXiG4sbRzaVDlttagD5L0ClJPBQrSwbq05SyVgkEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734978986; a=rsa-sha256; cv=none; b=j/ysKfqMQxQ4I3RZ3MZZFzinkgHzdwgZpyx/2cli+3qR1EtBe+ydZQmODrOEWGju12ypce lTFIM8PraSm6+anzUFqaZdHsruDkyXk9kIwwqexTqlEAgvWg6BCdkoYXCMinAYQCRvVP3I FEmM9xeXNf5z+evaT9Ps/YzPIYPwp++t5I0GDg3GpIELKuGWMOpNB7vS4nVwa05n6coaMm lyQjT+nyzyuyhX5H8atgQXSa26xxR/wtPIYVgOXtb/NDaqMmkqH54xq6yO7O1DHbYA1dBg GaSxp4wHPttwwdXCN9CndQjPAFRmSAAF3tR+9HZ1bylWRQxqcrhjt46NxV3AaQ== 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 4YH6DV66KNz14WS; Mon, 23 Dec 2024 18:36:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNIaQxs028761; Mon, 23 Dec 2024 18:36:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNIaQHO028758; Mon, 23 Dec 2024 18:36:26 GMT (envelope-from git) Date: Mon, 23 Dec 2024 18:36:26 GMT Message-Id: <202412231836.4BNIaQHO028758@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 053a98849734 - main - tcp: don't ever return ECONNRESET on close(2) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 053a988497342a6fd0a717cc097d09c23f83e103 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=053a988497342a6fd0a717cc097d09c23f83e103 commit 053a988497342a6fd0a717cc097d09c23f83e103 Author: Gleb Smirnoff AuthorDate: 2024-12-23 18:35:49 +0000 Commit: Gleb Smirnoff CommitDate: 2024-12-23 18:35:49 +0000 tcp: don't ever return ECONNRESET on close(2) The SUS doesn't mention this error code as a possible one [1]. The FreeBSD manual page specifies a possible ECONNRESET for close(2): [ECONNRESET] The underlying object was a stream socket that was shut down by the peer before all pending data was delivered. In the past it had been EINVAL (see 21367f630d72), and this EINVAL was added as a safety measure in 623dce13c64ef. After conversion to ECONNRESET it had been documented in the manual page in 78e3a7fdd51e6, but I bet wasn't ever tested to actually be ever returned, cause the tcp-testsuite[2] didn't exist back then. So documentation is incorrect since 2006, if my bet wins. Anyway, in the modern FreeBSD the condition described above doesn't end up with ECONNRESET error code from close(2). The error condition is reported via SO_ERROR socket option, though. This can be checked using the tcp-testsuite, temporarily disabling the getsockopt(SO_ERROR) lines using sed command [3]. Most of these getsockopt(2)s are followed by '+0.00 close(3) = 0', which will confirm that close(2) doesn't return ECONNRESET even on a socket that has the error stored, neither it is returned in the case described in the manual page. The latter case is covered by multiple tests residing in tcp- testsuite/state-event-engine/rcv-rst-*. However, the deleted block of code could be entered in a race condition between close(2) and processing of incoming packet, when connection had already been half-closed with shutdown(SHUT_WR) and sits in TCPS_LAST_ACK. This was reported in the bug 146845. With the block deleted, we will continue into tcp_disconnect() which has proper handling of INP_DROPPED. The race explanation follows. The connection is in TCPS_LAST_ACK. The network input thread acquires the tcpcb lock first, sets INP_DROPPED, acquires the socket lock in soisdisconnected() and clears SS_ISCONNECTED. Meanwhile, the syscall thread goes through sodisconnect() which checks for SS_ISCONNECTED locklessly(!). The check passes and the thread blocks on the tcpcb lock in tcp_usr_disconnect(). Once input thread releases the lock, the syscall thread observes INP_DROPPED and returns ECONNRESET. - Thread 1: tcp_do_segment()->tcp_close()->in_pcbdrop(),soisdisconnected() - Thread 2: sys_close()...->soclose()->sodisconnect()->tcp_usr_disconnect() Note that the lockless operation in sodisconnect() isn't correct, but enforcing the socket lock there will not fix the problem. [1] https://pubs.opengroup.org/onlinepubs/9799919799/ [2] https://github.com/freebsd-net/tcp-testsuite [3] sed -i "" -Ee '/\+0\.00 getsockopt\(3, SOL_SOCKET, SO_ERROR, \[ECONNRESET\]/d' $(grep -lr ECONNRESET tcp-testsuite) PR: 146845 Reviewed by: tuexen, rrs, imp Differential Revision: https://reviews.freebsd.org/D48148 --- lib/libsys/close.2 | 5 +---- sys/netinet/tcp_usrreq.c | 5 ----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/libsys/close.2 b/lib/libsys/close.2 index 83f8604a4a22..91a7a902d70d 100644 --- a/lib/libsys/close.2 +++ b/lib/libsys/close.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 1, 2017 +.Dd December 18, 2024 .Dt CLOSE 2 .Os .Sh NAME @@ -111,9 +111,6 @@ is not an active descriptor. An interrupt was received. .It Bq Er ENOSPC The underlying object did not fit, cached data was lost. -.It Bq Er ECONNRESET -The underlying object was a stream socket that was shut down by the peer -before all pending data was delivered. .El .Pp In case of any error except diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 35578b348c9f..acc3e2ea2942 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -690,11 +690,6 @@ tcp_usr_disconnect(struct socket *so) inp = sotoinpcb(so); KASSERT(inp != NULL, ("tcp_usr_disconnect: inp == NULL")); INP_WLOCK(inp); - if (inp->inp_flags & INP_DROPPED) { - INP_WUNLOCK(inp); - NET_EPOCH_EXIT(et); - return (ECONNRESET); - } tp = intotcpcb(inp); if (tp->t_state == TCPS_TIME_WAIT) From nobody Mon Dec 23 19:13:55 2024 X-Original-To: dev-commits-src-main@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 4YH73l4bJqz5hH1Z; Mon, 23 Dec 2024 19:13: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH73l2TmDz40pf; Mon, 23 Dec 2024 19:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734981235; 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=PWnnV7AjAzEBycvdPeIhzh5wGRlhz2XteHjrBi/PA3g=; b=uRhx2KsPgB976A9lPeOKsFWbROueQNuhKUKyL4vwpDqkAC3m4oApzotfGPoMS4jlCy1Ez9 hzTeM62CYGzBk207DYAClAv03Dx8MmH4LNqOYsUtomSyWb0pnXQD2/q0DWvUFS4NtScO11 BCzlPJyN8WzVTEsJYKm8JJv1rhW5Dlu32thH78+g0gQJA8HPnvWb5x2U1pjqzHa6cKNgb4 rFfMCGrJ2GPSbtJd0KV0yrwTjX5BeoQ/3dY7r9DGCYc7FoIGY5SIFrSjy6P647T//WaRvb /ygvP5dQO3Axpp19+VsYNwiMCQ0weNnU6dolgLT9dojAiGV7lNL0OBPD1eU1FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734981235; 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=PWnnV7AjAzEBycvdPeIhzh5wGRlhz2XteHjrBi/PA3g=; b=apt/xR2OZ0KNxIwbpaOZbQ6SN5ujOyOGznXzMIamMOSwyKPNi1ojcw+Cb1Hyk4WM+KycJv Fl4PnnqJLJ1dGkh6XyafZd6vr64Nq5wZ9IwH+XbitcGMx2UluCK6HThUUBqYHbzqO+e5ON AG2wx+yFzWqGfraDpLcGdHLYJGrN30fc1m69YaYOD4nS57UmeR7Yx6B0Ekty5N6GO4Q+RA Vifyhf3cNAqJxDD1icB/0Peq26J7hizl9OVh5H2+DG88S7JCzGYz7UA12wJ7I2WZoxc/4m spbQEcxt5T3vLOX8mHzaRRwVKNc5iB5zHfZgue+KJA9Va8oRIehJdYwkPIumFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734981235; a=rsa-sha256; cv=none; b=xiVYBUGW3KgbJFu+EiLoM2MXdIg8SS0ISFJaNdAWhiNyrMJyDzY79gnVqjQprxjB4640Tl hT+bNbuLb/EcUP6lm9pihZ+4H7eGaV1fesnOXo/21lhP0WFBGSFKYIZ/sFHaNPoFJPiXGu HR86TlMiFWYuYX8/TPmrIdXX0LzF06dURtDGdGR9lBUZc/fGeKpABvK8wUQHrDgme9Dcmn tJp+8i6uuzB2Z9T1mjqmQbuf8tZLQHjmS+NkpMwT9lDP/vY0kSCoADhXsY734Gp/VKjj3z Aw/3N0+3fXHy81JNKrHKGhEjNxTBvEs/IhvEODVa6maw4x7uh337Xc05cI+PMw== 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 4YH73l25g6z15kx; Mon, 23 Dec 2024 19:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNJDtHR003689; Mon, 23 Dec 2024 19:13:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNJDtMc003686; Mon, 23 Dec 2024 19:13:55 GMT (envelope-from git) Date: Mon, 23 Dec 2024 19:13:55 GMT Message-Id: <202412231913.4BNJDtMc003686@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5982237f1e5a - main - sed: Fix handling of an empty pattern space List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5982237f1e5a30b6b7d67b307b4d3685b00718bf Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5982237f1e5a30b6b7d67b307b4d3685b00718bf commit 5982237f1e5a30b6b7d67b307b4d3685b00718bf Author: Mohamed Akram AuthorDate: 2024-12-23 19:06:09 +0000 Commit: Mark Johnston CommitDate: 2024-12-23 19:07:14 +0000 sed: Fix handling of an empty pattern space Add a regression test. PR: 271791 Obtained from: OpenBSD (1.38 millert) MFC after: 2 weeks --- usr.bin/sed/process.c | 10 ++++------ usr.bin/sed/tests/sed2_test.sh | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c index d06dc09542e1..c177524a528a 100644 --- a/usr.bin/sed/process.c +++ b/usr.bin/sed/process.c @@ -436,14 +436,12 @@ substitute(struct s_command *cp) * and at the end of the line, terminate. */ if (match[0].rm_so == match[0].rm_eo) { - if (*s == '\0' || *s == '\n') - slen = -1; - else - slen--; - if (*s != '\0') { + if (slen > 0) { cspace(&SS, s++, 1, APPEND); + slen--; le++; - } + } else + slen = -1; lastempty = 1; } else lastempty = 0; diff --git a/usr.bin/sed/tests/sed2_test.sh b/usr.bin/sed/tests/sed2_test.sh index f50619612561..0b849b1ea132 100755 --- a/usr.bin/sed/tests/sed2_test.sh +++ b/usr.bin/sed/tests/sed2_test.sh @@ -159,6 +159,19 @@ minus_e_body() atf_check -o 'inline:--\nab\n' sed $'1 i\\\n--' a } +atf_test_case command_D +command_D_head() +{ + atf_set "descr" "Test handling of an empty pattern space" +} +command_D_body() +{ + printf "hello\n\nworld\n" > a + + atf_check -o file:a sed -e 's/^//;P;D' a + atf_check -o file:a sed -e 's/^//;$!N;P;D' a +} + atf_init_test_cases() { atf_add_test_case inplace_command_q @@ -169,4 +182,5 @@ atf_init_test_cases() atf_add_test_case hex_subst atf_add_test_case bracket_y atf_add_test_case minus_e + atf_add_test_case command_D } From nobody Mon Dec 23 19:13:56 2024 X-Original-To: dev-commits-src-main@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 4YH73m6gsMz5hH6c; Mon, 23 Dec 2024 19:13: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH73m4Z4Fz40dt; Mon, 23 Dec 2024 19:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734981236; 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=M9dQqDTAvrktUKu9ehMFneDPChX3Ytv0H8H8zngqz64=; b=rOj8xFokQP5vTA14BTt/GgbysHV5kRxFOiLqpB2Qw0ar+j2BhqCzoC8XwGs58fX2zVWd/w TrwkcuFx6aGL3LArFwgCHAXGJgK2oTN6XA7XsMgJxGc5lIo/59dRyTMbdYYn9KMqXx4sHR JLuZJ3IKSBrDgqLjfjISwwT7UQnrLP0OMSX/Jexf+IS//AqJ8W+ToDSL+UaaJomegLjUUM eBSOzna1H3wS279DfdQF8+LQqnC1qNkwZ+n4xbsI3gvP+SvDcPHzj7upYVX67PHxSnF3vW Hk2/aLX0fk68kjWWlXo+OLlWUxrN2FDl6da81ItoCvdMkOr8sMJ3XWQxblwlDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734981236; 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=M9dQqDTAvrktUKu9ehMFneDPChX3Ytv0H8H8zngqz64=; b=wmxiav62toipRGX0ZDiNnsY4/Vch9v/FoerggydTp7637boINfETmQFJakzNdbA8G6imUJ PcUp9uZu5yyOIdvgnNAQUDGMtmcQmpKDnZMlLgQeJ06zL20ntnzSDzfvZhYE/mAVn3JK0x vue189d7+WBlfSP/0B6JXPN+vek3ITEx9czHxDFadPzUi90/0E3oOHlJn3VMD+QI/T2akL z6lMefnbAXH4E6Ps9LfWyRqwRIp/A9JhbXcPNYNS3ZbXR6RIzg2osvdrBuKUJQ327ycnfH 4d8UP8Ug9mnRqFbzgF1N93S8uhpJ8gIU2EUzOsR3olSNff8F6n1sceD1SEo80g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734981236; a=rsa-sha256; cv=none; b=Ym8ZqIQ4egKeX2p2Xadw86cBq5+1jlHvwAScUiRlbvAAcTBNvYXs+n3WIsblDuoB+eklqE 0vcaMCN5h8m/Z1aHZsPjgbeMQ8DfKN7pKB7fOjLgcMmQPavXBxjT7R4r0naPeXAfwmY1fm bOwubMvfq0uvXfT3exYUETB4PA4RbIT1yTQQwH1n/I0hxxeaS9LGPSYDOfK+g9r92Nv3eV foO0H3xTwVI2BZpyphvngYZewbsVNtD8cVjTypp5F8EVWM1WfsqlxfVrHNwXtWq0mRP0So C7pn9v+C0p8WouhX0UDZGWebYyB+kwv73yzZEWhvHe0sSwjTqwvpPYDciXdJ9A== 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 4YH73m36D2z15ky; Mon, 23 Dec 2024 19:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNJDutE003762; Mon, 23 Dec 2024 19:13:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNJDus9003759; Mon, 23 Dec 2024 19:13:56 GMT (envelope-from git) Date: Mon, 23 Dec 2024 19:13:56 GMT Message-Id: <202412231913.4BNJDus9003759@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 003818aca4cd - main - sed tests: Add a regression test for the c function List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 003818aca4cdda47adef808a56d48003aa514029 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=003818aca4cdda47adef808a56d48003aa514029 commit 003818aca4cdda47adef808a56d48003aa514029 Author: Mark Johnston AuthorDate: 2024-12-23 19:06:11 +0000 Commit: Mark Johnston CommitDate: 2024-12-23 19:08:15 +0000 sed tests: Add a regression test for the c function Based on the test case from PR 271817 by Mohamed Akram. PR: 271817 MFC after: 2 weeks --- usr.bin/sed/tests/sed2_test.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/usr.bin/sed/tests/sed2_test.sh b/usr.bin/sed/tests/sed2_test.sh index 0b849b1ea132..c88e998425a0 100755 --- a/usr.bin/sed/tests/sed2_test.sh +++ b/usr.bin/sed/tests/sed2_test.sh @@ -159,6 +159,28 @@ minus_e_body() atf_check -o 'inline:--\nab\n' sed $'1 i\\\n--' a } +atf_test_case command_c +command_c_head() +{ + atf_set "descr" "Verify that the 'c' command starts a new cycle" +} +command_c_body() +{ + printf "%s\n" a b c d e f > a + printf "%s\n" x c d e f > expected + + atf_check -o file:expected sed ' +/a/,/b/c\ +x +' a + + atf_check -o file:expected sed ' +/a/,/b/c\ +x +$!N +' a +} + atf_test_case command_D command_D_head() { @@ -182,5 +204,6 @@ atf_init_test_cases() atf_add_test_case hex_subst atf_add_test_case bracket_y atf_add_test_case minus_e + atf_add_test_case command_c atf_add_test_case command_D } From nobody Mon Dec 23 20:43:31 2024 X-Original-To: dev-commits-src-main@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 4YH9381Qmjz5hPCg; Mon, 23 Dec 2024 20:43: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH9380qXYz47ym; Mon, 23 Dec 2024 20:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734986612; 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=zK5DZ+y63uBLfsf9SwU9WTuL5aiFWHvAD7gznaaotKM=; b=S19EFjqJldFyMGYlusI/s0RQ3VclanY7MPnUY7OiQTH0ZoR4DFH3NC/2s8Ny9gI0LUhizh FklMYpX2k1hg8df5WaoG7t8dTzIrC7O+1B7hV61madDKwLQTTg9B7XKukrrK1xCkahPFAl EjwKimmK7Qc0N6aZFiRvSXkA874ewpwyHK9wirVDiIMu8sEX3iBuvNXvOD9QMdb8nkbw0y c94lA5CUNQboChNvvMdkBKioacMwis1Y6H7vlG7LFOnNEnFVYXVheObwa3nmSErJmwUg0s SYnA7svzG+M2DdQ8KHRanwcgOdBs0kfC22EBZwULeXtQibBylDTRUbWbVXesCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734986612; 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=zK5DZ+y63uBLfsf9SwU9WTuL5aiFWHvAD7gznaaotKM=; b=Uiqaze4uaFpxNIklMxjJcmpSFNkRHYmh8F5POJjHoCjFNWnszvS2+w5p0CDv5eHQotXaSy o9UXnuaMKA/JIM+VjcMxBmhtHp53n85DTrTkt7X6uUSE/wONEl8AMATeNbbQwXrOVAk8Nh +8H3W89OnDIEs8HGQMQifrJ/tRe8/Bl4TbRUU746UDoOTuNtd3eJ888Z0KXRjxCaVzEUKp gkcSENv/u3MvGOZ9kqO5KQdTWBgXyl2HUBnU0mvUg+o6R2wCOi5di83AznghyT4VlJ+LGT oivl2NRpGWnVBngnujHWS636Qw6Nr4AYwY1e3EfeF18wenCR2KwdV2kyZCIK2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734986612; a=rsa-sha256; cv=none; b=ey323Dcz/Szh7E2AkrDa4ZeSlwwyMKLGKfCMQrEuR7K6/YngeoQ5eaYd1oQU/7e7BOftTe XzJzzib92vGd0PRu3BoTpYOQAN/fdm/040uRkTvO3S8F+1q/PiStj/uCAmCD6vvGMWMtl1 A55+9ACj34+63nA2HFmJ0wNELmgDbZy+MSS7SrpDu6tYuaNK8Qr9yAcIzlzZncIgNsYNnZ 50uDee0ObjOZLnFNjDzn65JHtFX8apWi3Zrnqw7oAgaEk55DMrwH3M2uFtZ7VPZNVc+FBz WImiExLHaTt56/kgdeuswPg2J4kPR+XI82M4PhtS9CRv/7Fsui76g0pxy5509w== 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 4YH93806ztz188P; Mon, 23 Dec 2024 20:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNKhVG5070087; Mon, 23 Dec 2024 20:43:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNKhVUK070084; Mon, 23 Dec 2024 20:43:31 GMT (envelope-from git) Date: Mon, 23 Dec 2024 20:43:31 GMT Message-Id: <202412232043.4BNKhVUK070084@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 969d1aa4dbfc - main - fusefs: fix a memory leak List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 969d1aa4dbfcbccd8de965f7761203208bf04e46 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=969d1aa4dbfcbccd8de965f7761203208bf04e46 commit 969d1aa4dbfcbccd8de965f7761203208bf04e46 Author: Alan Somers AuthorDate: 2024-12-23 20:26:11 +0000 Commit: Alan Somers CommitDate: 2024-12-23 20:37:19 +0000 fusefs: fix a memory leak Fix a leak of a fuse_ticket structure. The leak mostly affected NFS-exported fuse file systems, and was triggered by a failure during FUSE_LOOKUP. MFC after: 2 weeks Sponsored by: ConnectWise --- sys/fs/fuse/fuse_vfsops.c | 2 +- tests/sys/fs/fusefs/nfs.cc | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/sys/fs/fuse/fuse_vfsops.c b/sys/fs/fuse/fuse_vfsops.c index e60c9aa80cfa..0da51b865873 100644 --- a/sys/fs/fuse/fuse_vfsops.c +++ b/sys/fs/fuse/fuse_vfsops.c @@ -565,7 +565,7 @@ fuse_vfsop_vget(struct mount *mp, ino_t ino, int flags, struct vnode **vpp) error = fdisp_wait_answ(&fdi); if (error) - return error; + goto out; feo = (struct fuse_entry_out *)fdi.answ; if (feo->nodeid == 0) { diff --git a/tests/sys/fs/fusefs/nfs.cc b/tests/sys/fs/fusefs/nfs.cc index 79fead8e77cb..27ffc8f5cbc1 100644 --- a/tests/sys/fs/fusefs/nfs.cc +++ b/tests/sys/fs/fusefs/nfs.cc @@ -144,6 +144,36 @@ TEST_F(Fhstat, lookup_dot) EXPECT_EQ(mode, sb.st_mode); } +/* Gracefully handle failures to lookup ".". */ +TEST_F(Fhstat, lookup_dot_error) +{ + const char FULLPATH[] = "mountpoint/some_dir/."; + const char RELDIRPATH[] = "some_dir"; + fhandle_t fhp; + struct stat sb; + const uint64_t ino = 42; + const mode_t mode = S_IFDIR | 0755; + const uid_t uid = 12345; + + EXPECT_LOOKUP(FUSE_ROOT_ID, RELDIRPATH) + .WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto& out) { + SET_OUT_HEADER_LEN(out, entry); + out.body.entry.attr.mode = mode; + out.body.entry.nodeid = ino; + out.body.entry.generation = 1; + out.body.entry.attr.uid = uid; + out.body.entry.attr_valid = UINT64_MAX; + out.body.entry.entry_valid = 0; + }))); + + EXPECT_LOOKUP(ino, ".") + .WillOnce(Invoke(ReturnErrno(EDOOFUS))); + + ASSERT_EQ(0, getfh(FULLPATH, &fhp)) << strerror(errno); + ASSERT_EQ(-1, fhstat(&fhp, &sb)); + EXPECT_EQ(EDOOFUS, errno); +} + /* Use a file handle whose entry is still cached */ TEST_F(Fhstat, cached) { From nobody Mon Dec 23 21:14:54 2024 X-Original-To: dev-commits-src-main@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 4YH9lW54Rmz5hR6P; Mon, 23 Dec 2024 21:15:03 +0000 (UTC) (envelope-from olce@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH9lW4Wvtz4FR0; Mon, 23 Dec 2024 21:15:03 +0000 (UTC) (envelope-from olce@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734988503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ro/MCliS98TgFp2l4q0LCVBm1oGXMfq8BmvI3zhAZqU=; b=iHTp2M0FGD1Da051KY4J0eqQBKVU6RDx0g8H6AiJH42heK/mtQ7d8i1WPkMGoLYd5Ep/xj eUY2VBb6KN45xSMqay15Clc3KokuCs2DFE2CzroEqKEJA+QAR9UIzEwih/EtqHtI8jOHNB vbNLyM7R7zaMLwKkeN83fvImbnvpn57N+QXT2KVxF7UKs7Y0/jQD4iafdhcr0yzcdXcZUq e6Bpz5i1LsKcRdOj2umcmkKBI/F4ldAbztGmBmjYQ0wkBb/x4+9rPxELPLdwd/HkXthTDF ckStampbhH3A3xcx2uXnchfbbZgGWVJkvxI31dhijidOfS2KZrsV77iCV0+tFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734988503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ro/MCliS98TgFp2l4q0LCVBm1oGXMfq8BmvI3zhAZqU=; b=tK1vVuQiIeaTqLkoGqTwURcpbE5iRD6pBlaJKUXhgxA+vTRI2ftxPVoYNNSOR2ahkyjAFO Nkjet9VGhOmIBX3vCMxcYAIIVYz0osL3d80CnGo8BIotzyHHJO4U24ns5UKN3lu1ERmqYF NkUROIFaEeohLGQQl9HjJ4VY0W8wMI+AxdBZEAW4tQQi3yI8AoCGrpX4snjfSpxcVUnkiP A6tIEM7F84O3+NfeGvtDD0YV8XmHPeYCsjNX6C8BIORiGQeeizxJjGeP0aDkrVteiMTBr7 QmYOr/xxdz1G/iM/fFKEblC86iIgV+agWEVFSspiceBzCAhXlBLPYvGmC7C6cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734988503; a=rsa-sha256; cv=none; b=ZHFJtZR4XpUqy7Kqyu4Bjxr+8+RJHm/NOMAGIsn2pgAM19Vfi7bVz4IinHWDVeUJutle2J PQ4OolgHV/+EVGSpE00+16iTXWWt4K/yr21Fs0aQlHieG6bhvMJjeECdhUQ5NgbvkVRvN7 O1jRbHr/J1PcEOm01lOazBIdD9p2f9xQo3fI5L6LJ+Wn2wIfdkXFt4aQEx4Kxkb1QO1DcZ cyL4U7ZCP2/Z0+UseXgR7nPN9PXSM4WtetZMzU26Hsj1fFMSffXR8/bg/op/2g2Kkh5oKa 0Ncw4kxEv/EmCNwzaYQI39sw6VhJL+pxTgrEN0yhsUjUqwI8LMZg3KZAi/ut3g== Received: from francois.localnet (lfbn-tou-1-1198-221.w90-76.abo.wanadoo.fr [90.76.254.221]) (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) (Authenticated sender: olce/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YH9lW0R0Lzhb6; Mon, 23 Dec 2024 21:15:02 +0000 (UTC) (envelope-from olce@freebsd.org) From: Olivier Certner To: FreeBSD User Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: bc201841d139 - main - mac_do(4): Revamp manual page after MAC/do updates Date: Mon, 23 Dec 2024 22:14:54 +0100 Message-ID: <2529859.0dHE6SNnxz@francois> Organization: FreeBSD In-Reply-To: <20241223182928.024fa9a2@thor.intern.walstatt.dynvpn.de> References: <202412231439.4BNEdpwp079873@gitrepo.freebsd.org> <20241223182928.024fa9a2@thor.intern.walstatt.dynvpn.de> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart4083047.BRNeRiNLvY"; micalg="pgp-sha384"; protocol="application/pgp-signature" --nextPart4083047.BRNeRiNLvY Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii"; protected-headers="v1" From: Olivier Certner To: FreeBSD User Date: Mon, 23 Dec 2024 22:14:54 +0100 Message-ID: <2529859.0dHE6SNnxz@francois> Organization: FreeBSD In-Reply-To: <20241223182928.024fa9a2@thor.intern.walstatt.dynvpn.de> MIME-Version: 1.0 Hi, I didn't touch the substance of this part of the manual page, and indeed never tried to compile mac_do(4) in the kernel statically. There shouldn't be any regression in this respect (i.e., it probably never worked). Will be mostly AFK the next ~10 days, and will look at it when back. Thanks and regards. -- Olivier Certner --nextPart4083047.BRNeRiNLvY Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCQAdFiEEmNCxHjkosai0LYIujKEwQJceJicFAmdp0s8ACgkQjKEwQJce Jicb3Q//Y37gYNvlc+A2gSSObebRblJUAHwV+wWkjIicSeEDraEmsQ3ajIgNYdtq M1xMZHGe2wXxOB9BPC9SNdJ4GMYcZJyiQwP5N4fww2z9t02BlGAbUKb0kv77+DVf 0wG7tgVXPZjsHAL+Wh35ZYwhmV1sEz8qtv1gadAzrgTFftyfUWuz5nJg2FGuL6OO HrqpUEk4SyQ5g8zCp19zTCpD/4njXUMuk0mocegbm0XV+G6RFTjSRkERHi6/AEN4 z1+YLmIGQpCJ3LNXJzpVrgxvjrjCqmHmBuz7aDF4VWpOyfRzqviExUA12zkvJ0tO tSjdwncZm1WC67NowaS17bi/bGLw6NDaOBFjvIFZvTtcuOWplcpgV3VSS6rU4BU1 2OLX3jCdKAy3C6Oi8/xUPGw16vbWbfw69iOI3y2NdemiQxrRXcMTukBYHs5lVgtG aiSfhZxB6KOibEtx0s2ZNT5NHzmg7Efb1wPVFH2VSkN6IUZWxOafPmx1aA9gpzny 2P75jZADRZBQqFFscBVxTlvybIWHCHabuikp/YCjUkdBFfgdeL3+AQD4Eq2k20OK Uov5PAMwCaGSjU5N1m4suPe7O2Hd5faa7JONFMe5PtGxF1Pyr/BoJlvo+l/BhcB0 OLEP2DKAxlgBDEuQgOZD4CSNuHCZ6w38NMI3gRGopNHK4I+zc/c= =W0O0 -----END PGP SIGNATURE----- --nextPart4083047.BRNeRiNLvY-- From nobody Mon Dec 23 22:03:50 2024 X-Original-To: dev-commits-src-main@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 4YHBqp1xWbz5hVVZ; Mon, 23 Dec 2024 22:03: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHBqp1N76z4KWm; Mon, 23 Dec 2024 22:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734991430; 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=bxxHy2zUxJMS0Lz/z8QLaX7EvV8T3yntUeQerm00ZrI=; b=jX73h2Co7wym+mrU/Nqf82x+5mBjGtumpWfKq6q+AjV2P1CWyfsk1PV8FK5aHLSoJfmmzx 7cOt44PH0IFdWFppr+Zgs/izF80vHkQYy4+ih5EZ2IZ+MMot4ycSad0CZvckJKzi1RrP71 LPX+fmpPcNaLEGRpXg88U9WPnJumLNdaNuTL8DPqP4To+EnLEqZRRwXdJ8e0zyHGWB0oP5 abPAZZkHDV25VBDwAzZg+Jc61CePVhetBDtySs+PEUbXhcnWeBv8WSoE6mXApt4ZmNpKyQ RQ2xKAK2+zwjzOFtaUS+Pa/jOmyrThxsMT/wd8E5T2YYWSes4H1yitx8P+0Jzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734991430; 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=bxxHy2zUxJMS0Lz/z8QLaX7EvV8T3yntUeQerm00ZrI=; b=iZM3dZjVsWAvzQ0UqI0uyLBy8Fu5ei65yY7pmm+PPmUiMe65bQ9Wu46wp939eTt2EoGjBX W0d5IODqddM1V6+G56ZcwPWV/dCcq4tZdQj7sD7mMP6BlWPi6HricLlIFD5Wky8lVJNrRI EPuLu1T3dpQyk9fz562MhyHZUAKh8OzO945TXzITfCl+d8397r585ETbUtXGrok3T14sL7 j4vbbnZUMZRW9aj+e7OBYeCDZ9PRMmucXYtyavN0n+xyo2qREM2Ya+aQfg2FGu81mJSb5L x2HDPEP3Iw1ZkwuPYY/U0TlhedyJbpUr9LaviJzFRmrvMnpEgxxlwXME8llZhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734991430; a=rsa-sha256; cv=none; b=cTki0A+ngiJsrER9d4Ec+egIIFLervIZnddgiiISV1gaf8scx0FhDogDkBifmCoH5V4Gs7 LiJWuwxRPsrFaxMgTeIAMPR+v+d9qTN/ZYGJJ6oXarBf68RuR2LpFA5tSA/THR61aAijzf auTfnWbcUA9Qg3wQjgg6v49YlCAOSJ0xXCFiHw7j7bs45LpjoET2jXGcSTCMm8Ia/FKi20 T/o5aAsODrstXX8mJ/TB5V6gCd7ejpqXt7SuoXg61SisbItWIoVtnk3ZKrHQWQ6z+13R7N +5NIfw0TcBRwA2seInK0NqUVgqbH9qn/v5GFItWvJ4kh5p6RQLiKWiOBp6VJcQ== 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 4YHBqp0wk0z19l0; Mon, 23 Dec 2024 22:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNM3og9021294; Mon, 23 Dec 2024 22:03:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNM3oEn021291; Mon, 23 Dec 2024 22:03:50 GMT (envelope-from git) Date: Mon, 23 Dec 2024 22:03:50 GMT Message-Id: <202412232203.4BNM3oEn021291@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 3a56015a2f5d - main - pkgbase: fix inclusion of tests in ssh, bsnmp, clibs-dev List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 3a56015a2f5d630910177fa79a522bb95511ccf7 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3a56015a2f5d630910177fa79a522bb95511ccf7 commit 3a56015a2f5d630910177fa79a522bb95511ccf7 Author: Isaac Freund AuthorDate: 2024-12-23 21:54:29 +0000 Commit: Ed Maste CommitDate: 2024-12-23 22:03:30 +0000 pkgbase: fix inclusion of tests in ssh, bsnmp, clibs-dev Currently, files that belong in the tests package are included in the ssh, bsnmp, and clibs-dev packages: ssh.plist 24:@dir(root,wheel,0755,) /usr/tests/secure/libexec 25:@(root,wheel,0444,) /usr/tests/secure/libexec/Kyuafile bsnmp.plist 82:@dir(root,wheel,0755,) /usr/tests/lib/libbsnmp 83:@(root,wheel,0444,) /usr/tests/lib/libbsnmp/Kyuafile 84:@(root,wheel,0555,) /usr/tests/lib/libbsnmp/bsnmpd_test clibs-dev.plist 2518:@dir(root,wheel,0755,) /usr/tests/lib/csu 2519:@(root,wheel,0444,) /usr/tests/lib/csu/Kyuafile This is caused by the PACKAGE=foo assignment in foo/Makefile.inc which overrides the default PACKAGE?=tests in bsd.test.mk. To fix this, instead use PACKAGE?=foo in foo/Makefile.inc and set PACKAGE=tests in foo/tests/Makefile. PR: 249144 Reviewed by: bapt, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47025 --- lib/csu/Makefile.inc | 2 +- lib/csu/tests/Makefile | 2 ++ lib/libbsnmp/Makefile.inc | 2 +- lib/libbsnmp/tests/Makefile | 2 ++ secure/libexec/Makefile.inc | 2 +- secure/libexec/tests/Makefile | 1 + 6 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc index 9903b25b7011..c4a1f90b173f 100644 --- a/lib/csu/Makefile.inc +++ b/lib/csu/Makefile.inc @@ -1,4 +1,4 @@ -PACKAGE= clibs-dev +PACKAGE?= clibs-dev NO_WMISSING_VARIABLE_DECLARATIONS= # Can't instrument these files since that breaks non-sanitized programs. diff --git a/lib/csu/tests/Makefile b/lib/csu/tests/Makefile index 946d293973db..c9a0e6eff5da 100644 --- a/lib/csu/tests/Makefile +++ b/lib/csu/tests/Makefile @@ -1,3 +1,5 @@ +PACKAGE= tests + SUBDIR= dso TESTS_SUBDIRS= dynamic TESTS_SUBDIRS+= dynamiclib diff --git a/lib/libbsnmp/Makefile.inc b/lib/libbsnmp/Makefile.inc index ea77a5f420d3..ed0d6c46bd6c 100644 --- a/lib/libbsnmp/Makefile.inc +++ b/lib/libbsnmp/Makefile.inc @@ -1,4 +1,4 @@ INCSDIR= ${INCLUDEDIR}/bsnmp -PACKAGE= bsnmp +PACKAGE?= bsnmp .include "../Makefile.inc" diff --git a/lib/libbsnmp/tests/Makefile b/lib/libbsnmp/tests/Makefile index fdd5484ec075..7a4a17e893a6 100644 --- a/lib/libbsnmp/tests/Makefile +++ b/lib/libbsnmp/tests/Makefile @@ -1,5 +1,7 @@ .include +PACKAGE= tests + ATF_TESTS_C+= bsnmpd_test SRCS.bsmpd_test= bsnmpd_test.c diff --git a/secure/libexec/Makefile.inc b/secure/libexec/Makefile.inc index 8998b613dda3..e5e48d7a9b37 100644 --- a/secure/libexec/Makefile.inc +++ b/secure/libexec/Makefile.inc @@ -1,4 +1,4 @@ BINDIR?= /usr/libexec -PACKAGE= ssh +PACKAGE?= ssh .include "../Makefile.inc" diff --git a/secure/libexec/tests/Makefile b/secure/libexec/tests/Makefile index 29b1b564beca..e142d9c1e98a 100644 --- a/secure/libexec/tests/Makefile +++ b/secure/libexec/tests/Makefile @@ -1,4 +1,5 @@ .PATH: ${SRCTOP}/tests KYUAFILE= yes +PACKAGE= tests .include From nobody Mon Dec 23 22:38:02 2024 X-Original-To: dev-commits-src-main@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 4YHCbG1tfsz5hXtZ; Mon, 23 Dec 2024 22:38: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHCbG1LZxz4Mdy; Mon, 23 Dec 2024 22:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734993482; 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=i0pRTUJa286uDVoDYRNexXjjlU10VFmAp28U6FrqOhc=; b=jzRKSY8u3MMTRjIcGVVy7GMlmBCOotO5vKGFHEcB3Js0qkDFJKG0scqZf1mUDROM+Kt1kq 5Ooz3a8tmzOVVaXKXs50F91MSB7SBu0i78rRn0lUOPWnPVojwLXtX3G4U2ZbQoWAhwEf/m 1QjY1/a00FP0OK6o9DtunNeeNsabi51uxCABpnIrkfzPlrp9NE9ISeBY/pUy3S+NRarLfw krTcfojrNUvDTGwj24WyeRIwukNiSqcQ5YmYKMPyH3FypNtlGYpXQpBxxzPURBornNoeOn YZYPw6B30x2Pau+1uCetKZN0qI6l0tvcCCBdhQTm94BqOLrVhXzTHuVMH9Lwig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734993482; 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=i0pRTUJa286uDVoDYRNexXjjlU10VFmAp28U6FrqOhc=; b=hCHHJOTHbJNev8PKTP3CdPF8zlwL6PYY75vVzqWt5InnXonkCfBOGo5ZiG0XfoqX6Ac4tG FieI2KYCx6xSSzxs55ZtQDf+nOlK4yfnxCkOERvNq5+Akdck/6Zik9ZZ3XxEhTP65N4TIY p9krLQXyTbskOu19JXYL+mFG2hFLmhtOXiWBY4rcfIqR87SHc6AY3ngkBJas9xcgos/4Bh Bue4ciR6Iu1/C5PnyJPJH8jAXbgsGXb68CLLAtKcbOSN43cUwO6wYC97SG88E0esLc+GyS G7zQanyTVE93PRWXqz0/UjOLtvlaPWkOJSUt25hSSHvk/3LgBP+pEQ04doKOKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734993482; a=rsa-sha256; cv=none; b=L+xJmtNCg1osVv/G+3AHsDqR8OIhmy4Ur/mvqOojvcdf9xge37ysWcHiBzHnRO/MpEoaFG rdbggY3yIq/W1E2D22elDrngpt8uVXmDcG2RmBxVaZMdQUuVBQgyTL6/9lFeF/RdvWTjTp q8guz7GPb7LO17k7sCz6P6wxBeqmAdy4we4xlwHofBCCxSdS4v2HHiHyyILGfsc6sYsSnL XmzY5fSD6cdVfv/NOiEreNF7fGI0NMoJ1dREi5yrI+UaUWyh0EKnYSjgx2ubo0dL37mtOr tiZOMrYmxcWCGkYLn+OG+zcbkuJLvlXiOqbvVqF4KjGUp/W0Q9KtjEon6o3y4g== 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 4YHCbG0xT4z1BKW; Mon, 23 Dec 2024 22:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNMc2FC078547; Mon, 23 Dec 2024 22:38:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNMc2M9078544; Mon, 23 Dec 2024 22:38:02 GMT (envelope-from git) Date: Mon, 23 Dec 2024 22:38:02 GMT Message-Id: <202412232238.4BNMc2M9078544@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 98e34e8e2557 - main - ntp: Undo upstream (ntp.org) fix for upstream Bug 3851 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 98e34e8e255767e18dd8a6c348cff8bfc01b2662 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=98e34e8e255767e18dd8a6c348cff8bfc01b2662 commit 98e34e8e255767e18dd8a6c348cff8bfc01b2662 Author: Cy Schubert AuthorDate: 2024-12-23 22:30:58 +0000 Commit: Cy Schubert CommitDate: 2024-12-23 22:37:34 +0000 ntp: Undo upstream (ntp.org) fix for upstream Bug 3851 The patch for upstream (ntp.org) fix for upstream Bug 3851 may have fixed a Linux bug but it caused a regression when ntpd is run on FreeBSD. Suggested that so@ publish an errata and merge this to releng/14.2. PR: 283116 MFH: 3 days --- contrib/ntp/ntpd/ntp_proto.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/ntp/ntpd/ntp_proto.c b/contrib/ntp/ntpd/ntp_proto.c index 170294c68bb6..f9605b8feacb 100644 --- a/contrib/ntp/ntpd/ntp_proto.c +++ b/contrib/ntp/ntpd/ntp_proto.c @@ -471,6 +471,7 @@ transmit( return; } +#if 0 /* [Bug 3851] drop pool servers which can no longer be reached. */ if (MDF_PCLNT & peer->cast_flags) { if ( (IS_IPV6(&peer->srcadr) && !nonlocal_v6_addr_up) @@ -479,6 +480,7 @@ transmit( return; } } +#endif /* * In unicast modes the dance is much more intricate. It is From nobody Tue Dec 24 02:13:22 2024 X-Original-To: dev-commits-src-main@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 4YHJMk3lc7z5hpWj; Tue, 24 Dec 2024 02:13:22 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHJMk390Dz4q7n; Tue, 24 Dec 2024 02:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735006402; 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=+2wQR4ZG8uSX6iOodQWp4K+i+oq4b0iLR3fjzNM5Is4=; b=Kgq3XE5aiYb2QPBJVJsrIKAgRDS1d0io6Ry4E08ei5+J04mcpjbQE3pQgxpLBqsQKi2PUr HSTsr3dH9okCIdkpryEhCaef8Uuv4BnDvnseJkhHp2srgXk7MfYSh4+LIi15ko2t9rqZ6H KJvcZaxmQtpiHDi0neIwIc+TMIavOPZoOuZTF1Vxz6YHVRly0aHmnJUzuuwbDmSPkZhwOK f3ODdhvDSgasQF5S/3h389hGJvAEd56k3rUATl2Aa8HPLlXWmeANg0n/82jnH/p0WYViSz qkJNyBqVZXuPqa/ANIV9mM7rBvVhqQQcC2mzDTXgERCK1m8fhJaXt4aP9MeLEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735006402; 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=+2wQR4ZG8uSX6iOodQWp4K+i+oq4b0iLR3fjzNM5Is4=; b=DQI1IT5tqMdbX/NrcEOr38r8OomUTCIpfUJvPtTDL90WbiK1RfIPLr3hYWVxIYmNtIGrN/ LoY7CWLBRoFGwjztXBNMsndDvVBFRcTgJfO8Yq0NJtLasksPtNW/WIwrxevMEej4yQDwcQ 4kGxF9D6lvXMea6acL2vmlvbNdSaaGXDioRY5cj4Fira6q4epIwQ8BCzYTewoUD/RBkeW/ RGLFIUW1QC9pjr3u1d407KQwklSYXRPeJeziCAGnEOlb/l4jG58CAFfzBOq/jNmTyBOv41 E64X24UEu+bAOOogBkL8DUk/pScbux27Psbfz5hw/rXBV9eba8/kbaTwL1Ohjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735006402; a=rsa-sha256; cv=none; b=D0lsfZM7eYrHebxms94mBs/Iw6/U29gaQsC71sZRTPXrPVDdpMHMIkvpMv+rMY6KEceaG6 Car/SdTerRQ+0kWuQT7JzMeremjvpdJFLYnyjhT1jBRkf9n6R1H4b8pWCuNl0qLif1KpwT 5I2yH3XZchAsudVlT1L1OcYo+I4yQlbz9MkG3XbgDwtPORqhYM9QUe3gYXmIOFpmG41jN8 1aN0T2jptUhrjBH/nc+jM8qpEIx8WJ10kni4jkkdHq6XLU836McXgozknhHqjwa6B5F832 b9VabRkDvShb31/3uyxecAEF6mWZx7hGGn0i2jdOl7aekmaBgYD8T65a6JEdRg== 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 4YHJMk2mJLzJhL; Tue, 24 Dec 2024 02:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BO2DMhA087870; Tue, 24 Dec 2024 02:13:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BO2DMLE087867; Tue, 24 Dec 2024 02:13:22 GMT (envelope-from git) Date: Tue, 24 Dec 2024 02:13:22 GMT Message-Id: <202412240213.4BO2DMLE087867@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: c21f5751ef09 - main - acpi_ibm: pass brightness events to evdev(4) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c21f5751ef0932796676e55953461e0679020e28 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=c21f5751ef0932796676e55953461e0679020e28 commit c21f5751ef0932796676e55953461e0679020e28 Author: Gleb Smirnoff AuthorDate: 2024-12-24 02:10:56 +0000 Commit: Gleb Smirnoff CommitDate: 2024-12-24 02:10:56 +0000 acpi_ibm: pass brightness events to evdev(4) unless the dev.acpi_ibm.0.handlerevents sysctl is set to process them internally. The default for the latter is to ignore them, so passing to evdev(4) is enabled by default. Reviewed by: wulf, imp Tested on: Lenovo Thinpad X11 Carbon 7Th Gen Differential Revision: https://reviews.freebsd.org/D48174 --- sys/dev/acpi_support/acpi_ibm.c | 43 ++++++++++++++++++++++++++++++++++++++ sys/modules/acpi/acpi_ibm/Makefile | 2 +- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/sys/dev/acpi_support/acpi_ibm.c b/sys/dev/acpi_support/acpi_ibm.c index a617088d4246..c1302508b8a2 100644 --- a/sys/dev/acpi_support/acpi_ibm.c +++ b/sys/dev/acpi_support/acpi_ibm.c @@ -37,6 +37,7 @@ */ #include "opt_acpi.h" +#include "opt_evdev.h" #include #include #include @@ -55,6 +56,11 @@ #include #include +#ifdef EVDEV_SUPPORT +#include +#include +#endif + #define _COMPONENT ACPI_OEM ACPI_MODULE_NAME("IBM") @@ -198,6 +204,9 @@ struct acpi_ibm_softc { struct sysctl_ctx_list *sysctl_ctx; struct sysctl_oid *sysctl_tree; +#ifdef EVDEV_SUPPORT + struct evdev_dev *evdev; +#endif }; static struct { @@ -363,6 +372,9 @@ static driver_t acpi_ibm_driver = { DRIVER_MODULE(acpi_ibm, acpi, acpi_ibm_driver, 0, 0); MODULE_DEPEND(acpi_ibm, acpi, 1, 1, 1); +#ifdef EVDEV_SUPPORT +MODULE_DEPEND(acpi_ibm, evdev, 1, 1, 1); +#endif static char *ibm_ids[] = {"IBM0068", "LEN0068", "LEN0268", NULL}; static int @@ -482,6 +494,20 @@ acpi_ibm_attach(device_t dev) } sc->ec_handle = acpi_get_handle(sc->ec_dev); +#ifdef EVDEV_SUPPORT + sc->evdev = evdev_alloc(); + evdev_set_name(sc->evdev, device_get_desc(dev)); + evdev_set_phys(sc->evdev, device_get_nameunit(dev)); + evdev_set_id(sc->evdev, BUS_HOST, 0, 0, 1); + evdev_support_event(sc->evdev, EV_SYN); + evdev_support_event(sc->evdev, EV_KEY); + evdev_support_key(sc->evdev, KEY_BRIGHTNESSUP); + evdev_support_key(sc->evdev, KEY_BRIGHTNESSDOWN); + + if (evdev_register(sc->evdev) != 0) + return (ENXIO); +#endif + /* Get the sysctl tree */ sc->sysctl_ctx = device_get_sysctl_ctx(dev); sc->sysctl_tree = device_get_sysctl_tree(dev); @@ -627,6 +653,10 @@ acpi_ibm_detach(device_t dev) if (sc->led_dev != NULL) led_destroy(sc->led_dev); +#ifdef EVDEV_SUPPORT + evdev_free(sc->evdev); +#endif + return (0); } @@ -1499,6 +1529,19 @@ acpi_ibm_notify(ACPI_HANDLE h, UINT32 notify, void *context) /* Execute event handler */ if (sc->handler_events & (1 << (arg - 1))) acpi_ibm_eventhandler(sc, (arg & 0xff)); +#ifdef EVDEV_SUPPORT + else if ((arg & 0xff) == IBM_EVENT_BRIGHTNESS_UP || + (arg & 0xff) == IBM_EVENT_BRIGHTNESS_DOWN) { + uint16_t key; + + key = arg == IBM_EVENT_BRIGHTNESS_UP ? + KEY_BRIGHTNESSUP : KEY_BRIGHTNESSDOWN; + evdev_push_key(sc->evdev, key, 1); + evdev_sync(sc->evdev); + evdev_push_key(sc->evdev, key, 0); + evdev_sync(sc->evdev); + } +#endif /* Notify devd(8) */ acpi_UserNotify("IBM", h, (arg & 0xff)); diff --git a/sys/modules/acpi/acpi_ibm/Makefile b/sys/modules/acpi/acpi_ibm/Makefile index ac7428ac4524..40ef83d6e78c 100644 --- a/sys/modules/acpi/acpi_ibm/Makefile +++ b/sys/modules/acpi/acpi_ibm/Makefile @@ -1,6 +1,6 @@ .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_ibm SRCS= acpi_ibm.c opt_acpi.h device_if.h bus_if.h acpi_if.h -SRCS+= opt_ddb.h +SRCS+= opt_ddb.h opt_evdev.h .include From nobody Tue Dec 24 08:39:55 2024 X-Original-To: dev-commits-src-main@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 4YHSxl4vMsz5Ws6s; Tue, 24 Dec 2024 08:39: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHSxl4QWKz4Ry3; Tue, 24 Dec 2024 08:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735029595; 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=7xmvYUp94WhCjLfm1KG8jkMEyOJnKr0LBzLbfsgtVvc=; b=G3bOWjE2po+7Q7WYYzAdQSwbOjgidWdmMunrMBQu9U8w6GxroQzJhAdlW6PSaPPUN/Tm4+ NMQan7q6LEyIfGkYWRUYZ/pV9hPsxgntodewtHXm2TqLmtLntp/OBVyz1Zkhs0eMy2ZmMR jgXVpTwfi2OdPoZTZyK63HU8vkKxxdEHl6r7IBI3fED8onK2lkwrTH02g7c4cg+SJUCB8K x+61QvIY8qr0A6y5rN0br0S96lbORalfSCpx1riVJwXiiaSS4uKdh2D0MDFXlb3qblMYe5 SswBeyUtINmDf4OHWJS6GjBEo66FkhBMimd51R6nlgaEUV1YT51/bZKNEmQNlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735029595; 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=7xmvYUp94WhCjLfm1KG8jkMEyOJnKr0LBzLbfsgtVvc=; b=mKheyYrxC8OdeCkA39/+ekJyv5AkOqaZPoeFWELsXug4rC6hX/cU+U7Mjlms8UTwa0KIYu ycHbipY0JPPK+UtPilqDLUocwIat9bwCsDLBoyK1G2PsFCXgKS4DVUCdGZqBXiuArU00H6 7XaF6mCIY8mGJiqY5RAPS6nZNNMtoL1t+isX0bxyY8g8BP7YV6P5itV4P0PqHjPiNujzO1 65B9LslVnuyckqTUsjdIm3fP1i108+A47+1zoGw8etfUmDt2LDLcO5WinVz4xvpsCwPml1 bLQcVuPTnzuB895wSQIyEAj9JFJLf49GiEe73VDKO9E5Gu3cbNyZyzx7+QFzUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735029595; a=rsa-sha256; cv=none; b=GLPLLg1Pjf+3FJEgffQUIaZ8AJWDDjOZHig+w4cFx6lfTjpL+ZWgNYm2rkCNEhKzBLCj+K hbiNqqsv5Wy9JldOzbU+85lMXOwIK8ynPeYKPyUNb7IcU77GXyN8KKj152182flQD/WVBZ qnjmdyDE+59DuNk6LPaR8FnBxSXXlw/GKf7ZhUwyIFM4mEkvufZ1bx/8IhFxwhcPbB4M6u YsE30x+Gm/PdP99aMoPqKdQ/qop76iRIHjg8s3qfygi6nsJDxjK0dtcJLnSbT9bFL8Qh7v XS5K6K6VEl6pMHSGXpaD07vsKM0N/7RlluRIkNnc2UUCaUmsfhlMG4jP+syZyg== 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 4YHSxl42K5zWxY; Tue, 24 Dec 2024 08:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BO8dthU001842; Tue, 24 Dec 2024 08:39:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BO8dtnm001839; Tue, 24 Dec 2024 08:39:55 GMT (envelope-from git) Date: Tue, 24 Dec 2024 08:39:55 GMT Message-Id: <202412240839.4BO8dtnm001839@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Igor Ostapenko Subject: git: 2ed24e28d1d9 - main - kyua: Support is_exclusive metadata coming from an ATF test case List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: igoro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ed24e28d1d95c62cc37ca3534d4d33360b4cef2 Auto-Submitted: auto-generated The branch main has been updated by igoro: URL: https://cgit.FreeBSD.org/src/commit/?id=2ed24e28d1d95c62cc37ca3534d4d33360b4cef2 commit 2ed24e28d1d95c62cc37ca3534d4d33360b4cef2 Author: Igor Ostapenko AuthorDate: 2024-12-24 08:36:33 +0000 Commit: Igor Ostapenko CommitDate: 2024-12-24 08:36:33 +0000 kyua: Support is_exclusive metadata coming from an ATF test case On ATF side it is named "is.exclusive". Reviewed by: ngie, markj MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D47671 --- contrib/kyua/engine/atf_list.cpp | 2 ++ contrib/kyua/engine/atf_list_test.cpp | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/contrib/kyua/engine/atf_list.cpp b/contrib/kyua/engine/atf_list.cpp index c9c2fed70175..c4f348ada2f6 100644 --- a/contrib/kyua/engine/atf_list.cpp +++ b/contrib/kyua/engine/atf_list.cpp @@ -125,6 +125,8 @@ engine::parse_atf_metadata(const model::properties_map& props) mdbuilder.set_string("execenv", value); } else if (name == "execenv.jail.params") { mdbuilder.set_string("execenv_jail_params", value); + } else if (name == "is.exclusive") { + mdbuilder.set_string("is_exclusive", value); } else if (name == "require.config") { mdbuilder.set_string("required_configs", value); } else if (name == "require.files") { diff --git a/contrib/kyua/engine/atf_list_test.cpp b/contrib/kyua/engine/atf_list_test.cpp index 7f19ca8fbec5..7648ee2c6a80 100644 --- a/contrib/kyua/engine/atf_list_test.cpp +++ b/contrib/kyua/engine/atf_list_test.cpp @@ -64,6 +64,7 @@ ATF_TEST_CASE_BODY(parse_atf_metadata__override_all) model::properties_map properties; properties["descr"] = "Some text"; properties["has.cleanup"] = "true"; + properties["is.exclusive"] = "true"; properties["require.arch"] = "i386 x86_64"; properties["require.config"] = "var1 var2 var3"; properties["require.files"] = "/file1 /dir/file2"; @@ -93,6 +94,7 @@ ATF_TEST_CASE_BODY(parse_atf_metadata__override_all) .add_required_program(fs::path("svn")) .set_description("Some text") .set_has_cleanup(true) + .set_is_exclusive(true) .set_required_memory(units::bytes::parse("1m")) .set_required_user("root") .set_timeout(datetime::delta(123, 0)) @@ -261,6 +263,36 @@ ATF_TEST_CASE_BODY(parse_atf_list__many_test_cases) } +ATF_TEST_CASE_WITHOUT_HEAD(parse_atf_list__is_exclusive_support); +ATF_TEST_CASE_BODY(parse_atf_list__is_exclusive_support) +{ + const std::string text = + "Content-Type: application/X-atf-tp; version=\"1\"\n" + "\n" + "ident: first\n" + "is.exclusive: false\n" + "descr: This is the descr\n" + "\n" + "ident: second\n" + "is.exclusive: true\n" + "\n" + "ident: third\n"; + std::istringstream input(text); + const model::test_cases_map tests = engine::parse_atf_list(input); + + const model::test_cases_map exp_tests = model::test_cases_map_builder() + .add("first", model::metadata_builder() + .set_description("This is the descr") + .build()) + .add("second", model::metadata_builder() + .set_is_exclusive(true) + .build()) + .add("third") + .build(); + ATF_REQUIRE_EQ(exp_tests, tests); +} + + ATF_INIT_TEST_CASES(tcs) { ATF_ADD_TEST_CASE(tcs, parse_atf_metadata__defaults); @@ -275,4 +307,5 @@ ATF_INIT_TEST_CASES(tcs) ATF_ADD_TEST_CASE(tcs, parse_atf_list__one_test_case_invalid_syntax); ATF_ADD_TEST_CASE(tcs, parse_atf_list__one_test_case_invalid_properties); ATF_ADD_TEST_CASE(tcs, parse_atf_list__many_test_cases); + ATF_ADD_TEST_CASE(tcs, parse_atf_list__is_exclusive_support); } From nobody Tue Dec 24 21:56:13 2024 X-Original-To: dev-commits-src-main@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 4YHpcY4WN7z5hvDd; Tue, 24 Dec 2024 21:56: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHpcY3dfyz4Srl; Tue, 24 Dec 2024 21:56:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735077373; 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=y6DmZdggUp1Q8Cq0z9Z/zDDEsd3NgLiAgF1OQsUuJrk=; b=ALHsOFqWsrR3W5ExfXBdltulqJR73TxniduUBAqRUObRFTqKtZLvXjBWu6ngt2sg4SYeGU QIYzXvRy8URkHM/00T3KC4864r5R1IAL6jIbBpFBqa8ZZRUJdlxlxRAEwUpYcYIcI8FaBZ u/U4hXPRG7E8WAakxwfxx0+HJ3fUAycTsd/9fI8a4TSaf9BUrEAmCqQEdmtWO3ZjY5wER+ gQHpslSG3cse4yN3J9mr3dmNlxnmCEsRhlGBKv7ks4G+eX8DfiP8vj+zvfs17eY4EsIUhr azMN5V/ZhAUIZP58a1m/PW1rCALNCh1uct54Bjd5TSDlcWfjqc179SiNHKlEfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735077373; 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=y6DmZdggUp1Q8Cq0z9Z/zDDEsd3NgLiAgF1OQsUuJrk=; b=o0jPGpBwJoabhWIWwe6LcFkEvYcdzTXFxs2ofO6D3Bk6OAP3YX8ac4yb7dYEPURoZZ9jAT ArP48vbfLjIQavwdmJoh5V6VFyXYnoEKMD+eQdMlL1cqBVWORNvSATtJmqw9qe4gGI0KtY /CJ7+Lx9oAdhIaP/KNmgWMU+dCHO5t2k24B7LJLdmpGvXlApL9S6JFWywh+rpEZqbz5TBy ndBsz+THysxBC8bvcm5oawo7UbWbctRaLpTSlIIvZ3Ga1bUBX960lW0+K9AFulEJ/zDvaY xn92qOxfXbQukasYZO39EQTxUWjuMpcp/PPBVM9idfG0Obai53h3BgvwLbAacg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735077373; a=rsa-sha256; cv=none; b=iAmf2dLi2EmDFeSkFIFnFA28cUugDuRypcQb9PVMmwR8NWVZ2xhQWdAwb08yv7eaXzebm9 Pj7noRRA6ja7LULr2jpVkGb/lDu9CIS7/PdCapeq0hF6AvXU3iFzQ4csfpaKv75dr/HT7q 1I+FK4q8v1WsOrG5efPw/+A94wMbS/NuiOIwzTOXHn3CvWnF2NpxmjDJnyiLLMkTcJ+buX bdcI3CjhrzChIaIvA800FvT3udEeJ4EGMRzWjsnK255xYWOZ3oWv/9Zajx4CJtdObtsiYI ZKlbXI8kuMVBJFx9+amoY/oS+ITH+Fs6opeG+P7DUrZJWclrHv7ImEOudGkFHg== 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 4YHpcY3BBtzwkm; Tue, 24 Dec 2024 21:56:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BOLuDVb092116; Tue, 24 Dec 2024 21:56:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BOLuDGo092113; Tue, 24 Dec 2024 21:56:13 GMT (envelope-from git) Date: Tue, 24 Dec 2024 21:56:13 GMT Message-Id: <202412242156.4BOLuDGo092113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 3f83f32d7d07 - main - fusefs: minor refactor in the tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 3f83f32d7d07afbb2dbff63fc6ec520f3341eec7 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=3f83f32d7d07afbb2dbff63fc6ec520f3341eec7 commit 3f83f32d7d07afbb2dbff63fc6ec520f3341eec7 Author: Alan Somers AuthorDate: 2024-12-24 21:54:42 +0000 Commit: Alan Somers CommitDate: 2024-12-24 21:55:48 +0000 fusefs: minor refactor in the tests Do more work in MockFS's constructor's member initializer list, instead of the body of the constructor. It's easier to read this way. Sponsored by: ConnectWise --- tests/sys/fs/fusefs/mockfs.cc | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/tests/sys/fs/fusefs/mockfs.cc b/tests/sys/fs/fusefs/mockfs.cc index 023cecd0276f..502f22a1e980 100644 --- a/tests/sys/fs/fusefs/mockfs.cc +++ b/tests/sys/fs/fusefs/mockfs.cc @@ -421,7 +421,18 @@ MockFS::MockFS(int max_readahead, bool allow_other, bool default_permissions, uint32_t kernel_minor_version, uint32_t max_write, bool async, bool noclusterr, unsigned time_gran, bool nointr, bool noatime, const char *fsname, const char *subtype) - : m_uniques(new std::unordered_set) + : m_daemon_id(NULL), + m_kernel_minor_version(kernel_minor_version), + m_kq(pm == KQ ? kqueue() : -1), + m_maxreadahead(max_readahead), + m_pid(getpid()), + m_uniques(new std::unordered_set), + m_pm(pm), + m_time_gran(time_gran), + m_child_pid(-1), + m_maxwrite(MIN(max_write, max_max_write)), + m_nready(-1), + m_quit(false) { struct sigaction sa; struct iovec *iov = NULL; @@ -429,20 +440,6 @@ MockFS::MockFS(int max_readahead, bool allow_other, bool default_permissions, char fdstr[15]; const bool trueval = true; - m_daemon_id = NULL; - m_kernel_minor_version = kernel_minor_version; - m_maxreadahead = max_readahead; - m_maxwrite = MIN(max_write, max_max_write); - m_nready = -1; - m_pm = pm; - m_time_gran = time_gran; - m_quit = false; - - if (m_pm == KQ) - m_kq = kqueue(); - else - m_kq = -1; - /* * Kyua sets pwd to a testcase-unique tempdir; no need to use * mkdtemp @@ -467,9 +464,6 @@ MockFS::MockFS(int max_readahead, bool allow_other, bool default_permissions, throw(std::system_error(errno, std::system_category(), "Couldn't open /dev/fuse")); - m_pid = getpid(); - m_child_pid = -1; - build_iovec(&iov, &iovlen, "fstype", __DECONST(void *, "fusefs"), -1); build_iovec(&iov, &iovlen, "fspath", __DECONST(void *, "mountpoint"), -1); From nobody Wed Dec 25 01:37:25 2024 X-Original-To: dev-commits-src-main@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 4YHvWp0XcQz5h08D; Wed, 25 Dec 2024 01:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHvWn6s9rz4qZk; Wed, 25 Dec 2024 01:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735090646; 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=pJJeJlGaV6FdEDQs/mrmzt0PMzX7gBdxsSoJCjCx77M=; b=nw9AnvZDch6sosENLmofc4D2Ru2mjSswca+abdrrxhWqya3zE4U7GJuKf8715T03DSukKL nxSCyB7C7MB+7iSWpjPpVI7lM8Jahy6lvuOUbYfYF+vMK7AY8QsqWjjS1IUxtK0mTe4I1R 11Wku2EOLj7+VlWyp8tkbsUByRWVuI+G2aSfYz/ljAjXMbt0GgwDCmkSVO3AJVKf0AhEzD JvEjsQ8MEEFkuC6orJTS7gT6xx2VTTjA23XiJpRtksrkQeIF2PugTIseJLcShZs4gLcaAD X5tERB4eTrEm1v1TjSYRpV6ZC7xjIuIUoQL9x8cp5ST7dwGesRwQGGIzWKR1Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735090646; 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=pJJeJlGaV6FdEDQs/mrmzt0PMzX7gBdxsSoJCjCx77M=; b=ZrYyxp/d1AiKEjg0tg1vNymg7E3VGvQbHl8VPADxnyQs4t7PupcimqLo/Z4rnXqhxatsYz xojT5UgQcmbcVkmaQaFnoKajFGwtuNWS5aqr3G3hT427do3pNzghjeqvW4znIInXh2v16v WXWe1FYGE/wDDst5KIUH+guuaLh0+2pzgjxu4sej5Jy9KqyuBmvAPAegZU+n44AB3IKm9p LVbOWmC+h8QcSphz7K/yKDQlblEWFIVSN1IpwlAwxCzNPnXejkqA9RuvcKpnLoNINcyIr8 wxq7SIIrAjq4aB8ol+VfeumoJSIUYT52BW0wRUYrjuayXHCqzT3Yg3bb6fG/AQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735090646; a=rsa-sha256; cv=none; b=PNEQNXkQBP4ICohEUrP9XNZ8Eogo9XwyktJFT5E1weEOKwvF7JHXXlJd24GlMqXAW+sJhS tYbbqdjWu9DHkPONAiO9rTJ1hKEgQP/lGii4TkoFeqEmyKkiHwsqrSCN4ie18FB+QK7TrS hJYg0bU16orJmn9eENu5wH54sCzQp/SoVpqSxpdsvL76INOXT2uU0MvmcxVJPzASIzT8PX FKxBT7EM4KVJ0YDvvuFlGEDLyz9Ov23aolH+hUmzIl6suAcciusG0GGaQOwap3YH5Ui8Dz PcqnygDlTq0Zr3n213XaviCjvJrgtWgbufgiABrFvfTb3lKFV5RbVr8t0dhn9w== 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 4YHvWn62Ncz13nY; Wed, 25 Dec 2024 01:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BP1bPTn004394; Wed, 25 Dec 2024 01:37:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BP1bPiL004391; Wed, 25 Dec 2024 01:37:25 GMT (envelope-from git) Date: Wed, 25 Dec 2024 01:37:25 GMT Message-Id: <202412250137.4BP1bPiL004391@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 5e3ab1894e1e - main - amd64: extract code to print fault details from trap_fatal() into a new helper List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5e3ab1894e1ef0520925038f8d4e4a451e841345 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5e3ab1894e1ef0520925038f8d4e4a451e841345 commit 5e3ab1894e1ef0520925038f8d4e4a451e841345 Author: Konstantin Belousov AuthorDate: 2024-12-24 16:39:38 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-25 01:37:18 +0000 amd64: extract code to print fault details from trap_fatal() into a new helper Suggested by: markj Reviewed by: kevans, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D48186 --- sys/amd64/amd64/trap.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 4590be501d64..3b23a34662d5 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -107,6 +107,7 @@ void trap_check(struct trapframe *frame); void dblfault_handler(struct trapframe *frame); static int trap_pfault(struct trapframe *, bool, int *, int *); +static void trap_diag(struct trapframe *, vm_offset_t); static void trap_fatal(struct trapframe *, vm_offset_t); #ifdef KDTRACE_HOOKS static bool trap_user_dtrace(struct trapframe *, @@ -150,6 +151,13 @@ static const char *const trap_msg[] = { [T_DTRACE_RET] = "DTrace pid return trap", }; +static const char * +traptype_to_msg(u_int type) +{ + return (type < nitems(trap_msg) ? trap_msg[type] : + "unknown/reserved trap"); +} + static int uprintf_signal; SYSCTL_INT(_machdep, OID_AUTO, uprintf_signal, CTLFLAG_RWTUN, &uprintf_signal, 0, @@ -857,15 +865,12 @@ after_vmfault: } static void -trap_fatal(struct trapframe *frame, vm_offset_t eva) +trap_diag(struct trapframe *frame, vm_offset_t eva) { int code, ss; u_int type; struct soft_segment_descriptor softseg; struct user_segment_descriptor *gdt; -#ifdef KDB - bool handled; -#endif code = frame->tf_err; type = frame->tf_trapno; @@ -925,8 +930,20 @@ trap_fatal(struct trapframe *frame, vm_offset_t eva) printf("r13: %016lx r14: %016lx r15: %016lx\n", frame->tf_r13, frame->tf_r14, frame->tf_r15); + printf("trap number = %d\n", type); +} + +static void +trap_fatal(struct trapframe *frame, vm_offset_t eva) +{ + u_int type; + + type = frame->tf_trapno; + trap_diag(frame, eva); #ifdef KDB if (debugger_on_trap) { + bool handled; + kdb_why = KDB_WHY_TRAP; handled = kdb_trap(type, 0, frame); kdb_why = KDB_WHY_UNSET; @@ -934,9 +951,7 @@ trap_fatal(struct trapframe *frame, vm_offset_t eva) return; } #endif - printf("trap number = %d\n", type); - panic("%s", type < nitems(trap_msg) ? trap_msg[type] : - "unknown/reserved trap"); + panic("%s", traptype_to_msg(type)); } #ifdef KDTRACE_HOOKS From nobody Wed Dec 25 01:37:26 2024 X-Original-To: dev-commits-src-main@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 4YHvWq28Skz5h05X; Wed, 25 Dec 2024 01:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHvWq0HJsz4qd9; Wed, 25 Dec 2024 01:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735090647; 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=S9bZqNZxK9vSAA6bX4LJ9fk2npm01THQVMazpYiZaL8=; b=C3PQ+uBU3cHh+GJRCBv8IDBq3C+C3BD6OiXHRxjqyXIJZ4jRzeK+7qWm8XPI7lT3r7Shaf uCNNAnhj76dbK0e81j55gli0LssBI+SaSLtQPrE/7GcJevKEZdxQAYspNziG6IYiDfVSZ6 viJcD3DcSlQNP82LrGnI8nfNOHxDrosCWC61FBkqMKKSHqd0COUGUxjZVqtIALe0t1rf8E EN9/hBoRb+OMrMwS7QWB0SJg9Qno3QqX4iv82ck+ypKXCC0C6ilQtT1mBbbsxzIHdaq90V ndpotroCSHJO294K5kPTDI6WQZpkoJ9GhlcIGJoNetT+Aqh8A7t3RKqJ74ZLiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735090647; 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=S9bZqNZxK9vSAA6bX4LJ9fk2npm01THQVMazpYiZaL8=; b=API7LUCuQylhpJUUBbGNdrBobULzNWKR7jYStNXQ3sj5xGsSzCzCKzPhAFi5fhEd+c+sPG XQGD9ZXHXRKmN2m92HhsJe2JOmKFWPkVZn40Tpj6+hZZbPBdRtu4NQfJUwoGlY//9lLaQS FlGaxgKjxLMT4HYM3BPQUOIlvSyjPYPTkIVGuKC3PzpRk9cRO5ZmUZyXCRpMiQn3vM1I59 wfqKPIiite9gfRc8xBT3LOuB6zAvpK11Eta0RklqP8HALxv32AIuVcZDhouItDObLl7g5C cZNoMbyQVBM0ektF4vfxJOE2yWYTmCL1VmtXB5sjGRYjzupmhz1AkbuJYNJajg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735090647; a=rsa-sha256; cv=none; b=AIW61vIGThFyrfmD3vAiO4fhJqXYASS4UIz1JM0+gZZC5ih6om3OV2GTlDOIxaqce3mqok zE3yhH3rZGiVtrBEAMyYMb2/fO+L+umyYABD+zGpQFxqSsVtNtlyE7aUoGVEKJv+8MwnMq Xs1+LY8F61/6Tz2JjHNtlr7DWHQGbOau7V5KBJ+T42HbDh3aQeqJ0W2mM5LT2GG30rgmkG K6DMJ58QRCf6YsAWsLnzwUGm2VHbH8Nwrrolv10sdmh/pK+lmK/lWHCXRQQ9yUG2VZ+Qol 6aMX8E0uK6wx/lKWLySM3JZaK9TjGlCdUQNbYccNfjgG7zhtKu1Tai6bnkoREw== 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 4YHvWp6jt6z14LM; Wed, 25 Dec 2024 01:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BP1bQ7h004466; Wed, 25 Dec 2024 01:37:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BP1bQYR004463; Wed, 25 Dec 2024 01:37:26 GMT (envelope-from git) Date: Wed, 25 Dec 2024 01:37:26 GMT Message-Id: <202412250137.4BP1bQYR004463@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: dd2b54436445 - main - amd64: on any fault during call to EFI RT, restore execution and print fault details List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: dd2b5443644505af51c95503898ab363e7d7c29d Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=dd2b5443644505af51c95503898ab363e7d7c29d commit dd2b5443644505af51c95503898ab363e7d7c29d Author: Konstantin Belousov AuthorDate: 2024-12-24 02:35:16 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-25 01:37:19 +0000 amd64: on any fault during call to EFI RT, restore execution and print fault details The fault info should be useful to see what specifically BIOS tried to do and why it faulted. E.g. it might allow to see which EFI memory segment needs to be mapped in addition to normal runtime segments, to work around the fault. Reviewed by: kevans, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D48186 --- sys/amd64/amd64/trap.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 3b23a34662d5..8e9b115ef224 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -423,6 +423,20 @@ trap(struct trapframe *frame) KASSERT(cold || td->td_ucred != NULL, ("kernel trap doesn't have ucred")); + + /* + * Most likely, EFI RT faulted. This check prevents + * kdb from handling breakpoints set on the BIOS text, + * if such option is ever needed. + */ + if ((td->td_pflags & TDP_EFIRT) != 0 && + curpcb->pcb_onfault != NULL && type != T_PAGEFLT) { + trap_diag(frame, 0); + printf("EFI RT fault %s\n", traptype_to_msg(type)); + frame->tf_rip = (long)curpcb->pcb_onfault; + return; + } + switch (type) { case T_PAGEFLT: /* page fault */ (void)trap_pfault(frame, false, NULL, NULL); @@ -586,18 +600,6 @@ trap(struct trapframe *frame) * FALLTHROUGH (TRCTRAP kernel mode, kernel address) */ case T_BPTFLT: - /* - * Most likely, EFI RT hitting INT3. This - * check prevents kdb from handling - * breakpoints set on the BIOS text, if such - * option is ever needed. - */ - if ((td->td_pflags & TDP_EFIRT) != 0 && - curpcb->pcb_onfault != NULL) { - frame->tf_rip = (long)curpcb->pcb_onfault; - return; - } - /* * If KDB is enabled, let it handle the debugger trap. * Otherwise, debugger traps "can't happen". @@ -857,6 +859,10 @@ trap_pfault(struct trapframe *frame, bool usermode, int *signo, int *ucode) after_vmfault: if (td->td_intr_nesting_level == 0 && curpcb->pcb_onfault != NULL) { + if ((td->td_pflags & TDP_EFIRT) != 0) { + trap_diag(frame, eva); + printf("EFI RT page fault\n"); + } frame->tf_rip = (long)curpcb->pcb_onfault; return (0); } From nobody Wed Dec 25 02:01:42 2024 X-Original-To: dev-commits-src-main@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 4YHw3p5FShz5h1n5; Wed, 25 Dec 2024 02:01: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHw3p1mq0z4tGJ; Wed, 25 Dec 2024 02:01:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735092102; 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=RYNoN5hbm7plRoZXZ3XG81ZXZTf9N/4OiKRJ/DQRYSg=; b=qrTcY8vpT9dufjblVGh/scQcVUTc+sjs36ICXzWgQqqhH6GzHjHkUudc0j2lDz0Ww8QKzM SoiB5sGW/msHFZjY5k8rIyOa+kmX23hw28xb8HUG917ayMvqK6MXVXnM+Dj6aZdqXaD86n jsgZfrzrWbVMkI1No4va1gTnQknlAPNB0dxKlVn5Nm4x4P1NS0zwkzub9nzLlXASpbYIlX XpK3lwbrnuuz5NCL0avosoJgc0ygnO6SX8oBOF9zczM1c3+ms+m8DBRUg/Tl3bct+PFEc3 uZK4WTcTqLfdCg058F+HEiaSaLa0B4AF7LB7mPbXM6B2YaySz7LGYZERtIHVZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735092102; 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=RYNoN5hbm7plRoZXZ3XG81ZXZTf9N/4OiKRJ/DQRYSg=; b=c6saUqknAAEhhqYFCJWSqfv9DK0QB4MFu4X3f5IaIck05u2HfJNvDcdQOoXLusf7sdyE62 VMlwuusG8l5i1pfpw6ZUEH0vaRnfZX+RpKz3jx2NEcV1RKtKfP2yVVPOR7RZnMMs38TSlS pnpOtqNu91hf6w1ILaRdaAxWQwnOIbYWM78MDw2YVjpLEGpi/2aDFJwoDE809h8mhaQJZx 4beDVe8bbqvCMHwd5q3kJX86ji8/h+og5zLl8/xVBVkqnBE6OrpfRa5+HwxY+p7/pV8j3p hVM71f80riaMq9qprvL1n4vfnrv+V9YYuwRAB4uaJ1ry+uI/QeVyF/ezzf4oQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735092102; a=rsa-sha256; cv=none; b=MDK9ptG0CsXJLerwacQjMvFjYz4czQYY/JZU4wfpkfFTyhZWajdBcg+7Ei6MxIoCo7E61H KdZ5hEfhUlPEuJv3EL86EdTkLXEZMJC3WbdqR2bnjY634pTkGapq7IiflusG/yte0F2ly0 7v6jDnc66vyw5+9zM4jkv7SSZ0YJN4E4bXCYkvf1SQvP6ojpdeZI0Rq+xJMYM0/lOV8Vuz I4vGf4JqHnBQUFeqC+sUGfRqCAa1Qi+yblW4ynNeWaujMbECuL7xawGLYUkIMEyTYfW5ra BRGmnlNsuiD1cAxQ1C8DAo/V5NS/jfgJjUekjDcUMYsoLCbpXgLJTPA1E2YP0Q== 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 4YHw3p1NGFz14j1; Wed, 25 Dec 2024 02:01:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BP21gu9057983; Wed, 25 Dec 2024 02:01:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BP21gaR057981; Wed, 25 Dec 2024 02:01:42 GMT (envelope-from git) Date: Wed, 25 Dec 2024 02:01:42 GMT Message-Id: <202412250201.4BP21gaR057981@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 3e8f4a30594f - main - efirt: use correct ABI for runtime EFI functions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 3e8f4a30594fad6784504d019613ad815b6c9dc5 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3e8f4a30594fad6784504d019613ad815b6c9dc5 commit 3e8f4a30594fad6784504d019613ad815b6c9dc5 Author: Ahmad Khalifa AuthorDate: 2024-12-21 21:09:54 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-25 02:00:09 +0000 efirt: use correct ABI for runtime EFI functions When calling EFI RT methods through no fault path. MFC after: 1 week --- sys/dev/efidev/efirt.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/sys/dev/efidev/efirt.c b/sys/dev/efidev/efirt.c index 8cada0d5061b..fcbed48af395 100644 --- a/sys/dev/efidev/efirt.c +++ b/sys/dev/efidev/efirt.c @@ -490,31 +490,32 @@ efi_rt_arch_call_nofault(struct efirt_callinfo *ec) switch (ec->ec_argcnt) { case 0: - ec->ec_efi_status = ((register_t (*)(void))ec->ec_fptr)(); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(void)) + ec->ec_fptr)(); break; case 1: - ec->ec_efi_status = ((register_t (*)(register_t))ec->ec_fptr) - (ec->ec_arg1); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(register_t)) + ec->ec_fptr)(ec->ec_arg1); break; case 2: - ec->ec_efi_status = ((register_t (*)(register_t, register_t)) - ec->ec_fptr)(ec->ec_arg1, ec->ec_arg2); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(register_t, + register_t))ec->ec_fptr)(ec->ec_arg1, ec->ec_arg2); break; case 3: - ec->ec_efi_status = ((register_t (*)(register_t, register_t, - register_t))ec->ec_fptr)(ec->ec_arg1, ec->ec_arg2, - ec->ec_arg3); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(register_t, + register_t, register_t))ec->ec_fptr)(ec->ec_arg1, + ec->ec_arg2, ec->ec_arg3); break; case 4: - ec->ec_efi_status = ((register_t (*)(register_t, register_t, - register_t, register_t))ec->ec_fptr)(ec->ec_arg1, - ec->ec_arg2, ec->ec_arg3, ec->ec_arg4); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(register_t, + register_t, register_t, register_t))ec->ec_fptr)( + ec->ec_arg1, ec->ec_arg2, ec->ec_arg3, ec->ec_arg4); break; case 5: - ec->ec_efi_status = ((register_t (*)(register_t, register_t, - register_t, register_t, register_t))ec->ec_fptr)( - ec->ec_arg1, ec->ec_arg2, ec->ec_arg3, ec->ec_arg4, - ec->ec_arg5); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(register_t, + register_t, register_t, register_t, register_t)) + ec->ec_fptr)(ec->ec_arg1, ec->ec_arg2, ec->ec_arg3, + ec->ec_arg4, ec->ec_arg5); break; default: panic("efi_rt_arch_call: %d args", (int)ec->ec_argcnt); From nobody Thu Dec 26 14:47:49 2024 X-Original-To: dev-commits-src-main@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 4YJs1K4Sw0z5jBNn; Thu, 26 Dec 2024 14:47: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YJs1K3nVPz4Ws7; Thu, 26 Dec 2024 14:47:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735224469; 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=blKXL5fh6taMWLXgn4i87j06ieVDlnxDqIYoTYB6UGI=; b=f8+Qiy5TgpGmA/Ijc+w69GrEXXikmIDt7Gbsha05CvjlooFtB0ScdremMICYm7+Fo//SHk lDQeG95QkE2dt7kt8JzCM5OEsoyqZHtvDxbB81YM1OJtV60hyvXyQxX7Su3b0klsD5ehUN tYTtrICY8GqjDx3kwDxqpF2Hga94k58pyDJ3SwyM2lbbYX36GVa9oXkKIvzx/WAtwtZhco XS7xGoWgTFJnEXoZUh1gkL7X1bXCv1xP3H+KH6BRlxcy1tjcn5xzH4qjfMvWbxfNwA6BBS LrVHX28s0E+RPLrb71RlaWM+LPKSyVjx5zQ/GRSP5hc2qMCO+SxhFHy4NZokTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735224469; 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=blKXL5fh6taMWLXgn4i87j06ieVDlnxDqIYoTYB6UGI=; b=Kptlx1w1Xi4S6FRFH4b641U0AIdwxXH2yoLTUs03Lat5rRy1bWqvPdnfiasWRM6BvM5dN0 nK6UEeSuA3RDdI1An/tfusYEdfuyuBYlksTXnRogUosoVMiSGSDYPKCUiAc12ENujyFUt0 AEg+iivvXNWhnCGyJvAdsRIe1kVwcEtQTJXikZK6UtrNwrtZPxO0Rl0GT9wtpPrwvRQh3h fVmZS36aZVU8s0kR29twd0JmcP6JE8rAj/Zykk3zXl53H3Efg1BIe8jePCOIiolvPcX0v+ xv76HYNZZr9Dj8+scop41AwzzMxd8HjgAdsyl66v/+M4JzRkkCGkQVkai5qCIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735224469; a=rsa-sha256; cv=none; b=WIWCKoVcMmnXgItJaLqDGLDqVXdGYLuOHaFldblO3Gv+8iO9A9nb6Qv8LSID4XJC4+EtSb KHbiBaJa5qX+EmRg8eOq+QbB/ifTaPqymIBOi75BSqgOMFzyYF/lvpWVrPvNz6pSKbRThC lCOBC/4NkiAELPukJomfq40Evb6CxO6a/3jw1pQRmcJxtlD5qGuA1lqFJa9/uUSuEWydXC FR4+77FT4pJz9DJjXuFkbRoQU/N9u6tqmPIaAwA3CwgnRXEiItN3NSsaEXg3TdW6jXRs1n kp7boTSNcgu179pJ6rWPUnQiwegb9oOgnPIEQN0K7YSsirRb9U+0m+ioRet/sw== 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 4YJs1K3Nl9zy4F; Thu, 26 Dec 2024 14:47:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BQElnww086869; Thu, 26 Dec 2024 14:47:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BQElnbg086866; Thu, 26 Dec 2024 14:47:49 GMT (envelope-from git) Date: Thu, 26 Dec 2024 14:47:49 GMT Message-Id: <202412261447.4BQElnbg086866@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: ca7e12f7df22 - main - bsdinstall zfsboot: Add an option to edit the ZFS pool creation options List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ca7e12f7df222458ec5cac8009c5b0931fb4a95b Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ca7e12f7df222458ec5cac8009c5b0931fb4a95b commit ca7e12f7df222458ec5cac8009c5b0931fb4a95b Author: Craig Leres AuthorDate: 2024-12-26 14:42:11 +0000 Commit: Dimitry Andric CommitDate: 2024-12-26 14:44:24 +0000 bsdinstall zfsboot: Add an option to edit the ZFS pool creation options This allows the default options (-O compress=lz4 -O atime=off) to be overridden, before the ZFS boot pool is created. For example, to set the compression algorithm to something different. Reviewed by: jhb, dim MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D47478 --- usr.sbin/bsdinstall/scripts/zfsboot | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 1d38db2d0f15..45c023b06513 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -324,6 +324,9 @@ msg_unsupported_partition_scheme="%s is an unsupported partition scheme" msg_user_cancelled="User Cancelled." msg_yes="YES" msg_zfs_configuration="ZFS Configuration" +msg_please_enter_options_for_your_zpool="Please enter options for your zpool" +msg_zfs_options_name="ZFS Pool Options" +msg_zfs_options_name_help="Customize ZFS options for the zpool to be created" ############################################################ FUNCTIONS @@ -374,6 +377,8 @@ dialog_menu_main() '$msg_swap_mirror_help' 'W $msg_swap_encrypt' '$swapgeli' '$msg_swap_encrypt_help' + 'O $msg_zfs_options_name' '$ZFSBOOT_POOL_CREATE_OPTIONS' + '$msg_zfs_options_name_help' " # END-QUOTE local defaultitem= # Calculated below local hline="$hline_alnum_arrows_punc_tab_enter" @@ -1853,6 +1858,13 @@ while :; do ZFSBOOT_SWAP_ENCRYPTION=1 fi ;; + ?" $msg_zfs_options_name") + # Prompt the user to input/change the pool options + f_dialog_input input \ + "$msg_please_enter_options_for_your_zpool" \ + "$ZFSBOOT_POOL_CREATE_OPTIONS" && + ZFSBOOT_POOL_CREATE_OPTIONS="$input" + ;; esac done From nobody Thu Dec 26 16:45:44 2024 X-Original-To: dev-commits-src-main@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 4YJvdN4RlRz5jKY6; Thu, 26 Dec 2024 16:45: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YJvdN2W2bz4kk9; Thu, 26 Dec 2024 16: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=1735231544; 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=wcwRne9cn+Ps8njhTPvHRmlNeWeRmGIBPkuBOZ9tOfE=; b=q5owFZTLad4ZASWKMPDFrU9DGvFAk3OwZNtu+ErlKCozfJ1XRA9dYIdXywPXZQlmoDeVcY O3kBi7FI+FbOXOpQpaqAtbIXWaUE4uynau+LbXSbAgaIbUGzFvtWF35wYj/CHDiSV4ubE5 xijgNmJeZKuM+h1K3i7Z/3Y29Um2F/oJ4E7MjG04wtxl0e73sep1d9B7VYBllWYlwvss9j sQjC4B3yVf5vtkeySJdnM37At4n8q489UwPTBs6Kz41rkvJMi55neHPPt0N4hpmFhcwbVT P4qE2g6ghpfpQYP8Es85dHm0fJq1kRU3KNq8chAEljQ99fRmoTT7HkiLGojO7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735231544; 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=wcwRne9cn+Ps8njhTPvHRmlNeWeRmGIBPkuBOZ9tOfE=; b=Mhbk23lymmof/kzY1Xy5sZbZcowDaqMAsM/P4vcE/JhYb9znTHdVn6STIwae0IJnL1b87s v5JLqdObjMOOTlp2nLlg/yb+XRThggkiQfyynvvLxxmlcAVeX95coyl47kUtTcLR9NQEc8 28xOlGoCkmqGC1Oyv7YH2WrGgQp/dv721RDZ7rOLM/pxo+PJgjTYK52B8tUshJOcuzun1j 0XUJ3seYnbT0nAt02PF2JAWJUmSZYovFurE+YkSwWRbkUFXWLwA1sqXs/t6xBDVcZdRbFD WCxcsHQMUAwOW0RrP6ULVZgspoPdF8IFYOUlXNUSma1G9sAhRxBvwUFZs0BpGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735231544; a=rsa-sha256; cv=none; b=xHFV2/0k4K473RNL/T+5W4zrE0mrPpHm2ByE3XtHg3BpKSmUhyJUxPHYUYQae/YHhrAJcZ 3C3Uc+W5qol0eWa4Rfj7Qp5xWd0E0shlsxJa09Hf4Z51zFqIV5SQiBS14GFzyfmKCDXWvJ imkm/6wB28Dg+KNCOWgFaq9vxlOXxlDOjgzl9hh+zzDNgkTtWvsJS/UAQp+YEOjjFWHkLR R1aLmiiUlRJZKcqfeRRtI9lgeFmsGpi5Du5mPS1370h7CI/8B/MTDV/b1IvXz8tBJFJ0bx BFHDJ8hJ726TrXoVrRDntBkMnzzFDYCjNL/bnElgUtUUv7puZ25skNhdsQkDYA== 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 4YJvdN1kMmz12dK; Thu, 26 Dec 2024 16:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BQGjiV1009454; Thu, 26 Dec 2024 16:45:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BQGjiju009451; Thu, 26 Dec 2024 16:45:44 GMT (envelope-from git) Date: Thu, 26 Dec 2024 16:45:44 GMT Message-Id: <202412261645.4BQGjiju009451@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 2e09cef8dc6f - main - makefs: Fix cd9660 filename buffer maximum length List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2e09cef8dc6f46faba8bab87c42c3f19ba2ffe87 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2e09cef8dc6f46faba8bab87c42c3f19ba2ffe87 commit 2e09cef8dc6f46faba8bab87c42c3f19ba2ffe87 Author: Ed Maste AuthorDate: 2024-12-24 16:08:10 +0000 Commit: Ed Maste CommitDate: 2024-12-26 16:44:36 +0000 makefs: Fix cd9660 filename buffer maximum length The maximum length is 30 characters for name and extension, two separators (. and ;) and 5 characters for file version from 1 to 32767, which is 37 characters. Add one for the null term as we treat these buffers as C strings. This is not an issue in practice, as the file version is always 1 in makefs. While here, drop `_WITH_PADDING` from the macro name and update the previously-unused ISO_FILENAME_MAXLENGTH for the corrected length. A 0x00 padding byte is used by ISO9660 when needed for alignment, which can be the null byte at the end of the string. Use sizeof where appropriate. Reviewed by: kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48193 --- usr.sbin/makefs/cd9660.c | 16 +++++++--------- usr.sbin/makefs/cd9660.h | 9 ++++----- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index d3baa3b78a6e..bc9895730b84 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -497,7 +497,7 @@ cd9660_makefs(const char *image, const char *dir, fsnode *root, real_root->isoDirRecord = emalloc(sizeof(*real_root->isoDirRecord)); /* Leave filename blank for root */ memset(real_root->isoDirRecord->name, 0, - ISO_FILENAME_MAXLENGTH_WITH_PADDING); + sizeof(real_root->isoDirRecord->name)); real_root->level = 0; diskStructure->rootNode = real_root; @@ -796,10 +796,10 @@ static int cd9660_translate_node_common(iso9660_disk *diskStructure, cd9660node *newnode) { u_char flag; - char temp[ISO_FILENAME_MAXLENGTH_WITH_PADDING]; + char temp[ISO_FILENAME_MAXLENGTH]; /* Now populate the isoDirRecord structure */ - memset(temp, 0, ISO_FILENAME_MAXLENGTH_WITH_PADDING); + memset(temp, 0, sizeof(temp)); (void)cd9660_convert_filename(diskStructure, newnode->node->name, temp, sizeof(temp), !(S_ISDIR(newnode->node->type))); @@ -1044,7 +1044,7 @@ cd9660_rename_filename(iso9660_disk *diskStructure, cd9660node *iter, int num, else maxlength = ISO_FILENAME_MAXLENGTH_BEFORE_VERSION; - tmp = emalloc(ISO_FILENAME_MAXLENGTH_WITH_PADDING); + tmp = emalloc(ISO_FILENAME_MAXLENGTH); while (i < num && iter) { powers = 1; @@ -1105,8 +1105,7 @@ cd9660_rename_filename(iso9660_disk *diskStructure, cd9660node *iter, int num, while (digits > 0) { digit = (int)(temp / powers); temp = temp - digit * powers; - snprintf(&tmp[numbts], - ISO_FILENAME_MAXLENGTH_WITH_PADDING - numbts, + snprintf(&tmp[numbts], ISO_FILENAME_MAXLENGTH - numbts, "%d", digit); digits--; numbts++; @@ -1153,8 +1152,7 @@ cd9660_copy_filenames(iso9660_disk *diskStructure, cd9660node *node) TAILQ_FOREACH(cn, &node->cn_children, cn_next_child) { cd9660_copy_filenames(diskStructure, cn); - memcpy(cn->o_name, cn->isoDirRecord->name, - ISO_FILENAME_MAXLENGTH_WITH_PADDING); + memcpy(cn->o_name, cn->isoDirRecord->name, sizeof(cn->o_name)); } } @@ -1277,7 +1275,7 @@ cd9660_rrip_move_directory(iso9660_disk *diskStructure, cd9660node *dir) /* TODO: Inherit permissions / ownership (basically the entire inode) */ /* Set the new name */ - memset(dir->isoDirRecord->name, 0, ISO_FILENAME_MAXLENGTH_WITH_PADDING); + memset(dir->isoDirRecord->name, 0, sizeof(dir->isoDirRecord->name)); strncpy(dir->isoDirRecord->name, newname, 8); dir->isoDirRecord->length[0] = 34 + 8; dir->isoDirRecord->name_len[0] = 8; diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h index bc826a414a6d..b2db31460d02 100644 --- a/usr.sbin/makefs/cd9660.h +++ b/usr.sbin/makefs/cd9660.h @@ -72,8 +72,7 @@ /*30 for name and extension, as well as version number and padding bit*/ #define ISO_FILENAME_MAXLENGTH_BEFORE_VERSION 30 -#define ISO_FILENAME_MAXLENGTH 36 -#define ISO_FILENAME_MAXLENGTH_WITH_PADDING 37 +#define ISO_FILENAME_MAXLENGTH 38 #define ISO_FLAG_CLEAR 0x00 #define ISO_FLAG_HIDDEN 0x01 @@ -118,7 +117,7 @@ typedef struct _iso_directory_record_cd9660 { u_char interleave [ISODCL (28, 28)]; /* 711 */ u_char volume_sequence_number [ISODCL (29, 32)]; /* 723 */ u_char name_len [ISODCL (33, 33)]; /* 711 */ - char name [ISO_FILENAME_MAXLENGTH_WITH_PADDING]; + char name [ISO_FILENAME_MAXLENGTH]; } iso_directory_record_cd9660; /* TODO: Lots of optimization of this structure */ @@ -154,7 +153,7 @@ typedef struct _cd9660node { int fileRecordSize;/*copy of a variable, int for quicker calculations*/ /* Old name, used for renaming - needs to be optimized but low priority */ - char o_name [ISO_FILENAME_MAXLENGTH_WITH_PADDING]; + char o_name [ISO_FILENAME_MAXLENGTH]; /***** SPACE RESERVED FOR EXTENSIONS *****/ /* For memory efficiency's sake - we should move this to a separate struct @@ -194,7 +193,7 @@ typedef struct _path_table_entry u_char extended_attribute_length[ISODCL (2, 2)]; u_char first_sector[ISODCL (3, 6)]; u_char parent_number[ISODCL (7, 8)]; - char name[ISO_FILENAME_MAXLENGTH_WITH_PADDING]; + char name[ISO_FILENAME_MAXLENGTH]; } path_table_entry; typedef struct _volume_descriptor From nobody Thu Dec 26 21:44:48 2024 X-Original-To: dev-commits-src-main@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 4YK2GY1DSGz5jdl9; Thu, 26 Dec 2024 21:44:53 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YK2GY0Jsjz4HB1; Thu, 26 Dec 2024 21:44:53 +0000 (UTC) (envelope-from garga@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735249493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=ERSPVIj94MCK9zH6K8Ag2uJqG8tpIyLXqhdZBF6Etg4=; b=F2R/OI9M6F85PeyUfOaQvTRewCNdInkA6TcDVxm9MwsbzR55/kPXw9eHVns3Ec4anXZbJz 1ABBsZx8G9TfVs5MICeB+h8iuNo/Fx9jNFd7tgKvOXqnvzQLhuTZy52Aywn5HrBsCcxeQu SpI07/+ha/6YSLbGJq+uX4WrWt5T1rSfk9FOYo1JBY1P1Xraob6mefvTBlMMO4b4GARilI 5VqUjK0UCgkufoGD/9oJeiQqnsHW7lCYqJR0no5fu96WuleUah9/VZC98Sz5ho6H+3qN3A SgM3fpakRs0sFCBEaiw6AXFA5K4jk65u0s4zS8QbDWYM8ET1qW3rZJVeYZZkVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735249493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=ERSPVIj94MCK9zH6K8Ag2uJqG8tpIyLXqhdZBF6Etg4=; b=tA8EcTbCVV7hgGBgfn53ICKHttirQZFqx5nbvzw7KCFc4/QBTd5ThMAyHRnk8vhJkS98sx D1Xjxux2xS+w/NMlxmKQX9MkDKIG4buMh2NE1Da9OmZZTz4LZWd1XnrT/tMwzSJtKidZqO pDYFwuj7ltv4A1wbCembNh8NXCbHvZLuTIckem0hfLgfSzIy7HZoLv+GYSeDxohFCIFiAQ 8qbsdR3G3AbBPX9oO9CiItf3/rZg6P8jaoY0D/mH4QbZHAOyRFoppMIK86YX9kDP86zqAQ HBVzrZxN7pxnEcoocYNdi1snyEmQa4s4w4UGyK4a2T0XlislSrxMjW/Dj5NldA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735249493; a=rsa-sha256; cv=none; b=f8Q+ZHZFxuc7Oi1rufzBylq1FTKFvTgQeuvL4+TYryWJZDMmxF4t7ymxJQISRw+05XKNd/ /UCo5Kp0cecuFpDWWDDzseY2Nt7l/tvOubbGLXdKjCbTbf9ftfigaDwtwY/5bXfve5z6yi RLMxqd+/HoJf+ArlnOJeV0INgWxT47TpK5y8hxCG7GxaSUkmAU00vuHjGclcvqlW1xKqJD CFKG/Ijwpul3CY+rX6YPralSznJq0rz/kw4gvzEx5rD9djGCzDkLQdzmZaCwqJsqtGe3F/ fGMC+v1h1qtBJ2hKfTULEt//pT7KJMU0UBzJ2jFr0Qq6uUbhifT1HL8c+hwOog== Received: from [IPV6:2804:f1c:31:cc00:f541:9717:f6fd:58ab] (unknown [IPv6:2804:f1c:31:cc00:f541:9717:f6fd:58ab]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: garga) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YK2GW1WL4zLsy; Thu, 26 Dec 2024 21:44:51 +0000 (UTC) (envelope-from garga@FreeBSD.org) Content-Type: multipart/mixed; boundary="------------W0YxwJfHrTrLuFbiP0nKhCQd" Message-ID: <149116bc-677c-47b2-9ff7-f454418fec21@FreeBSD.org> Date: Thu, 26 Dec 2024 18:44:48 -0300 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta Subject: Re: git: ba1904937d9a - main - acpica: Extract _OSC parsing to a common file To: Andrew Turner , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202412121819.4BCIJ1KW097190__8805.67587898753$1734027579$gmane$org@gitrepo.freebsd.org> Content-Language: en-US From: Renato Botelho Autocrypt: addr=garga@FreeBSD.org; keydata= xsBNBGStavwBCACjNlp/9+Y+VFe9ieR2h/WWbdvjz4Mb2z/f22bGoaskzCfvVNbo/v3i34I9 H6OdgZkGqheQEAD2jNfRbmPr4z40xDMUpYGLds+1Mvg7G3Hms3j5Ef8KaLSWUNWIfwKdfSVR Qs35ccSJxAdRW5YdI6J3xZgika+3Bc4eJ05YE/nWW+PNTYevt5rqD50N3zybVYIcLoqVPpBi AZE/sf5SLiLACIJb1t/s4x+pi8vgWevxVVT9u8V1f8zYErmHSLSqjxii0B3eRZphX9NCJOv9 +tfFZhnENInhn9gT7H4e2YumUltEy3jacONHJF3CC1pvvWEa6lEyypclMOkHQwNON7DLABEB AAHNLFJlbmF0byBCb3RlbGhvIChGcmVlQlNEKSA8Z2FyZ2FARnJlZUJTRC5vcmc+wsCXBBMB CgBBAhsDBQkFo5qABQsJCAcDBRUKCQgLBRYDAgEAAh4FAheAFiEERL7Dxegbnh7xTiQ5Ob6P xxJcZXoFAmSta78CGQEACgkQOb6PxxJcZXrYlggAgaZmr6c1yIWzN8VksHrHpwt/uxONEP+h ljy3yfrMsgfS5wx5Uzgfih1xYZUFC6jiI63CetqBqJpp3g1klRS1UWYKx2NeXphDMYZEdPm/ a6sXh4bKZbk6IE8Yn0/YiRT57d9DtbvswC7Gn7Igj/MSbhl49TvTGyvuB6juaffVoYZViomx 5zMoee8Ml2o2qj3MrCJ+/K8GU54RlpOGqGRsqdwVdr9XEWub6fF2YFwR46cjmbiU3P5urFHH nkJlBGPIwKxHimTW0lZsdx9aCKRDd/D80/WOEzXmk3k8B9lv/GsvOluHmveLhJG1R1tIJ31I f2q8dfTvqsQXnu8CcWRcgc7ATQRkrWr8AQgA1DufoxScA+CWQbUR6zExIu8wXQKrhuRt4DG2 BgynT7EMUvEBadcbQRZXsBpemNfncc9Axyut/+rWiyKJf9BLQuo/9QYmSRvW1U6+0LJUYmdg kMyBeYaPk+vnssv/u9jLuvV7FVgyE0yk1iaWIKOVDD+XrQCOvGw9uSceBrQyCyo3A/eRM/+p vnDCaywR63PKE+3axk6lfNdGK3TnaWmS30/ZDCZlNsXuqprqR4JdT5wXids5o36dsuJ5EZ20 s5hNMD34s4Yr1Y1R9elH6qBsFCpozs0+jwrArxq+UJJCR6hH5W8ZEwJtRC8tzR8mRE1WywzX BXYj0YhfGztQIxZckQARAQABwsB8BBgBCgAmFiEERL7Dxegbnh7xTiQ5Ob6PxxJcZXoFAmSt avwCGwwFCQWjmoAACgkQOb6PxxJcZXr1vgf/SKXhoZcUU5I7TqcbHg0lJz9tICTupCGHWr/s SQgjh9oEM5j1wqW7FlCGP90Tl9K0g3ow9YdbhU7VK470o6pymX9V9eLHzGgkZO/KMEtGBeK1 u+5ePjCJ/MK5B21KODLSU7WrIL1VN5ceXfQPLYt02LMLtPri+oduHD6RNBeA7US1DUzleq5F 9NHGbvV2U7BdDUezpiO8NaFjFZVB11I5d99FxUM5XGVstI3VhsRKZxjY0KnqJzaQgTFsPGmv AUfZVIN1pXgXiedhPXpr8+Y64jP+pHVwpVmh1zYWL6+q3kqFOUVP6c5iiMeoEXZvgJz7x/AC ek3X5gvu8Hpcv+MZIg== In-Reply-To: <202412121819.4BCIJ1KW097190__8805.67587898753$1734027579$gmane$org@gitrepo.freebsd.org> This is a multi-part message in MIME format. --------------W0YxwJfHrTrLuFbiP0nKhCQd Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 12/12/24 15:19, Andrew Turner wrote: > The branch main has been updated by andrew: > > URL: https://cgit.FreeBSD.org/src/commit/?id=ba1904937d9ae0539e39001467a1519b17177118 > > commit ba1904937d9ae0539e39001467a1519b17177118 > Author: Andrew Turner > AuthorDate: 2024-12-12 16:29:45 +0000 > Commit: Andrew Turner > CommitDate: 2024-12-12 18:00:22 +0000 > > acpica: Extract _OSC parsing to a common file > > This will be used by pci_host_generic_acpi.c so needs to be in a > common location. > > Reviewed by: imp, jhb > Sponsored by: Arm Ltd > Differential Revision: https://reviews.freebsd.org/D48044 My dev system was running CURRENT from Oct 31 and broke after I upgrade to most recent version on Dec 20. After bisecting I found this commit as the one that introduced the problem. It starts booting but can't found any disk. Pressing ? at mount prompt shows nothing. This system is a VM running on KVM and I've attached dmesg from successfully boot FreeBSD idaho.arrakis.com.br 15.0-CURRENT FreeBSD 15.0-CURRENT #22 n274182-938e4b131c4: Thu Dec 26 18:10:12 -03 2024 root@idaho.arrakis.com.br:/usr/obj/usr/src/amd64.amd64/sys/GENERIC-NODEBUG amd64 I've built GENERIC and collected a video [1] since the VNC server doesn't support copy/paste. [1] https://idaho.arrakis.com.br/share/boot_fail.mov -- Renato Botelho --------------W0YxwJfHrTrLuFbiP0nKhCQd Content-Type: text/plain; charset=UTF-8; name="dmesg.txt" Content-Disposition: attachment; filename="dmesg.txt" Content-Transfer-Encoding: base64 SHlwZXJ2aXNvcjogT3JpZ2luID0gIktWTUtWTUtWTSIKcmVhbCBtZW1vcnkgID0gNTE1Mzk2 MDc1NTIgKDQ5MTUyIE1CKQphdmFpbCBtZW1vcnkgPSA1MDA2NzgwMDA2NCAoNDc3NDggTUIp CkV2ZW50IHRpbWVyICJMQVBJQyIgcXVhbGl0eSA2MDAKQUNQSSBBUElDIFRhYmxlOiA8Qk9D SFMgIEJYUEMgICAgPgpGcmVlQlNEL1NNUDogTXVsdGlwcm9jZXNzb3IgU3lzdGVtIERldGVj dGVkOiAxMiBDUFVzCkZyZWVCU0QvU01QOiAxMiBwYWNrYWdlKHMpIHggMSBjb3JlKHMpCnJh bmRvbTogcmVnaXN0ZXJpbmcgZmFzdCBzb3VyY2UgSW50ZWwgU2VjdXJlIEtleSBSTkcKcmFu ZG9tOiBmYXN0IHByb3ZpZGVyOiAiSW50ZWwgU2VjdXJlIEtleSBSTkciCnJhbmRvbTogdW5i bG9ja2luZyBkZXZpY2UuCmlvYXBpYzAgPFZlcnNpb24gMS4xPiBpcnFzIDAtMjMKTGF1bmNo aW5nIEFQczogMTEgMTAgMSA4IDIgNiA1IDMgOSA3IDQKcmFuZG9tOiBlbnRyb3B5IGRldmlj ZSBleHRlcm5hbCBpbnRlcmZhY2UKa2JkMSBhdCBrYmRtdXgwCnZ0dmdhMDogPFZUIFZHQSBk cml2ZXI+Cmt2bWNsb2NrMDogPEtWTSBwYXJhdmlydHVhbCBjbG9jaz4KVGltZWNvdW50ZXIg Imt2bWNsb2NrIiBmcmVxdWVuY3kgMTAwMDAwMDAwMCBIeiBxdWFsaXR5IDk3NQprdm1jbG9j azA6IHJlZ2lzdGVyZWQgYXMgYSB0aW1lLW9mLWRheSBjbG9jaywgcmVzb2x1dGlvbiAwLjAw MDAwMXMKc21iaW9zMDogPFN5c3RlbSBNYW5hZ2VtZW50IEJJT1M+IGF0IGlvbWVtIDB4ZjVh NTAtMHhmNWE2ZQpzbWJpb3MwOiBWZXJzaW9uOiAyLjgsIEJDRCBSZXZpc2lvbjogMi44CmFl c25pMDogPEFFUy1DQkMsQUVTLUNDTSxBRVMtR0NNLEFFUy1JQ00sQUVTLVhUUz4KYWNwaTA6 IDxCT0NIUyBCWFBDPgphY3BpMDogUG93ZXIgQnV0dG9uIChmaXhlZCkKY3B1MDogPEFDUEkg Q1BVPiBvbiBhY3BpMAphdHJ0YzA6IDxBVCByZWFsdGltZSBjbG9jaz4gcG9ydCAweDcwLTB4 NzcgaXJxIDggb24gYWNwaTAKYXRydGMwOiByZWdpc3RlcmVkIGFzIGEgdGltZS1vZi1kYXkg Y2xvY2ssIHJlc29sdXRpb24gMS4wMDAwMDBzCkV2ZW50IHRpbWVyICJSVEMiIGZyZXF1ZW5j eSAzMjc2OCBIeiBxdWFsaXR5IDAKVGltZWNvdW50ZXIgIkFDUEktZmFzdCIgZnJlcXVlbmN5 IDM1Nzk1NDUgSHogcXVhbGl0eSA5MDAKYWNwaV90aW1lcjA6IDwyNC1iaXQgdGltZXIgYXQg My41Nzk1NDVNSHo+IHBvcnQgMHg2MDgtMHg2MGIgb24gYWNwaTAKcGNpYjA6IDxBQ1BJIEhv c3QtUENJIGJyaWRnZT4gcG9ydCAweGNmOC0weGNmZiBvbiBhY3BpMApwY2kwOiA8QUNQSSBQ Q0kgYnVzPiBvbiBwY2liMAp2Z2FwY2kwOiA8VkdBLWNvbXBhdGlibGUgZGlzcGxheT4gcG9y dCAweGQwNDAtMHhkMDVmIG1lbSAweGY0MDAwMDAwLTB4ZjdmZmZmZmYsMHhmODAwMDAwMC0w eGZiZmZmZmZmLDB4ZmQyMTAwMDAtMHhmZDIxMWZmZiBpcnEgMjEgYXQgZGV2aWNlIDEuMCBv biBwY2kwCnZnYXBjaTA6IEJvb3QgdmlkZW8gZGV2aWNlCnBjaWIxOiA8QUNQSSBQQ0ktUENJ IGJyaWRnZT4gbWVtIDB4ZmQyMTIwMDAtMHhmZDIxMmZmZiBpcnEgMjIgYXQgZGV2aWNlIDIu MCBvbiBwY2kwCnBjaTE6IDxBQ1BJIFBDSSBidXM+IG9uIHBjaWIxCnBjaWIyOiA8QUNQSSBQ Q0ktUENJIGJyaWRnZT4gbWVtIDB4ZmMyMDAwMDAtMHhmYzIwMDBmZiBpcnEgMjIgYXQgZGV2 aWNlIDAuMCBvbiBwY2kxCnBjaTI6IDxBQ1BJIFBDSSBidXM+IG9uIHBjaWIyCnBjaWIzOiA8 QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQyMTMwMDAtMHhmZDIxM2ZmZiBpcnEgMjIg YXQgZGV2aWNlIDIuMSBvbiBwY2kwCnBjaTM6IDxBQ1BJIFBDSSBidXM+IG9uIHBjaWIzCnZp cnRpb19wY2kwOiA8VmlydElPIFBDSSAobW9kZXJuKSBOZXR3b3JrIGFkYXB0ZXI+IG1lbSAw eGZkMDQwMDAwLTB4ZmQwNDBmZmYsMHhmZTgwMDAwMC0weGZlODAzZmZmIGlycSAyMiBhdCBk ZXZpY2UgMC4wIG9uIHBjaTMKdnRuZXQwOiA8VmlydElPIE5ldHdvcmtpbmcgQWRhcHRlcj4g b24gdmlydGlvX3BjaTAKdnRuZXQwOiBFdGhlcm5ldCBhZGRyZXNzOiA1Mjo1NDo1ODo5Mzpj NzplZgp2dG5ldDA6IG5ldG1hcCBxdWV1ZXMvc2xvdHM6IFRYIDEvMjU2LCBSWCAxLzEyOAow MDAuMDAwMDc3IFsgNDUyXSB2dG5ldF9uZXRtYXBfYXR0YWNoICAgICAgIHZ0bmV0IGF0dGFj aGVkIHR4cT0xLCB0eGQ9MjU2IHJ4cT0xLCByeGQ9MTI4CnBjaWI0OiA8QUNQSSBQQ0ktUENJ IGJyaWRnZT4gbWVtIDB4ZmQyMTQwMDAtMHhmZDIxNGZmZiBpcnEgMjIgYXQgZGV2aWNlIDIu MiBvbiBwY2kwCnBjaTQ6IDxBQ1BJIFBDSSBidXM+IG9uIHBjaWI0CnhoY2kwOiA8WEhDSSAo Z2VuZXJpYykgVVNCIDMuMCBjb250cm9sbGVyPiBtZW0gMHhmY2UwMDAwMC0weGZjZTAzZmZm IGlycSAyMiBhdCBkZXZpY2UgMC4wIG9uIHBjaTQKeGhjaTA6IDMyIGJ5dGVzIGNvbnRleHQg c2l6ZSwgNjQtYml0IERNQQp1c2J1czAgb24geGhjaTAKdXNidXMwOiA1LjBHYnBzIFN1cGVy IFNwZWVkIFVTQiB2My4wCnBjaWI1OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQy MTUwMDAtMHhmZDIxNWZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuMyBvbiBwY2kwCnBjaTU6IDxB Q1BJIFBDSSBidXM+IG9uIHBjaWI1CnZpcnRpb19wY2kxOiA8VmlydElPIFBDSSAobW9kZXJu KSBTQ1NJIGFkYXB0ZXI+IG1lbSAweGZjYzAwMDAwLTB4ZmNjMDBmZmYsMHhmZTQwMDAwMC0w eGZlNDAzZmZmIGlycSAyMiBhdCBkZXZpY2UgMC4wIG9uIHBjaTUKdnRzY3NpMDogPFZpcnRJ TyBTQ1NJIEFkYXB0ZXI+IG9uIHZpcnRpb19wY2kxCnBjaWI2OiA8QUNQSSBQQ0ktUENJIGJy aWRnZT4gbWVtIDB4ZmQyMTYwMDAtMHhmZDIxNmZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNCBv biBwY2kwCnBjaTY6IDxBQ1BJIFBDSSBidXM+IG9uIHBjaWI2CnZpcnRpb19wY2kyOiA8Vmly dElPIFBDSSAobW9kZXJuKSBDb25zb2xlIGFkYXB0ZXI+IG1lbSAweGZjYTAwMDAwLTB4ZmNh MDBmZmYsMHhmZTIwMDAwMC0weGZlMjAzZmZmIGlycSAyMiBhdCBkZXZpY2UgMC4wIG9uIHBj aTYKcGNpYjc6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxNzAwMC0weGZkMjE3 ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi41IG9uIHBjaTAKcGNpNzogPEFDUEkgUENJIGJ1cz4g b24gcGNpYjcKdmlydGlvX3BjaTM6IDxWaXJ0SU8gUENJIChtb2Rlcm4pIEJhbGxvb24gYWRh cHRlcj4gbWVtIDB4ZmUwMDAwMDAtMHhmZTAwM2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDAuMCBv biBwY2k3CnZ0YmFsbG9vbjA6IDxWaXJ0SU8gQmFsbG9vbiBBZGFwdGVyPiBvbiB2aXJ0aW9f cGNpMwpwY2liODogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjE4MDAwLTB4ZmQy MThmZmYgaXJxIDIyIGF0IGRldmljZSAyLjYgb24gcGNpMApwY2k4OiA8QUNQSSBQQ0kgYnVz PiBvbiBwY2liOAp2aXJ0aW9fcGNpNDogPFZpcnRJTyBQQ0kgKG1vZGVybikgRW50cm9weSBh ZGFwdGVyPiBtZW0gMHhmZGUwMDAwMC0weGZkZTAzZmZmIGlycSAyMiBhdCBkZXZpY2UgMC4w IG9uIHBjaTgKcGNpYjk6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxOTAwMC0w eGZkMjE5ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi43IG9uIHBjaTAKcGNpOTogPEFDUEkgUENJ IGJ1cz4gb24gcGNpYjkKaXNhYjA6IDxQQ0ktSVNBIGJyaWRnZT4gYXQgZGV2aWNlIDMxLjAg b24gcGNpMAppc2EwOiA8SVNBIGJ1cz4gb24gaXNhYjAKYWhjaTA6IDxJbnRlbCBJQ0g5IEFI Q0kgU0FUQSBjb250cm9sbGVyPiBwb3J0IDB4ZDA2MC0weGQwN2YgbWVtIDB4ZmQyMWEwMDAt MHhmZDIxYWZmZiBpcnEgMTYgYXQgZGV2aWNlIDMxLjIgb24gcGNpMAphaGNpMDogQUhDSSB2 MS4wMCB3aXRoIDYgMS41R2JwcyBwb3J0cywgUG9ydCBNdWx0aXBsaWVyIG5vdCBzdXBwb3J0 ZWQKYWhjaWNoMDogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5lbCAwIG9uIGFoY2kwCmFoY2lj aDE6IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgMSBvbiBhaGNpMAphaGNpY2gyOiA8QUhD SSBjaGFubmVsPiBhdCBjaGFubmVsIDIgb24gYWhjaTAKYWhjaWNoMzogPEFIQ0kgY2hhbm5l bD4gYXQgY2hhbm5lbCAzIG9uIGFoY2kwCmFoY2ljaDQ6IDxBSENJIGNoYW5uZWw+IGF0IGNo YW5uZWwgNCBvbiBhaGNpMAphaGNpY2g1OiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDUg b24gYWhjaTAKYWNwaV9zeXNjb250YWluZXIwOiA8U3lzdGVtIENvbnRhaW5lcj4gb24gYWNw aTAKYWNwaV9zeXNjb250YWluZXIxOiA8U3lzdGVtIENvbnRhaW5lcj4gcG9ydCAweGNkOC0w eGNlMyBvbiBhY3BpMAphY3BpX3N5c2NvbnRhaW5lcjI6IDxTeXN0ZW0gQ29udGFpbmVyPiBw b3J0IDB4NjIwLTB4NjJmIG9uIGFjcGkwCmFjcGlfc3lzY29udGFpbmVyMzogPFN5c3RlbSBD b250YWluZXI+IHBvcnQgMHhjYzAtMHhjZDcgb24gYWNwaTAKdWFydDA6IDwxNjU1MCBvciBj b21wYXRpYmxlPiBwb3J0IDB4M2Y4LTB4M2ZmIGlycSA0IGZsYWdzIDB4MTAgb24gYWNwaTAK YXRrYmRjMDogPEtleWJvYXJkIGNvbnRyb2xsZXIgKGk4MDQyKT4gcG9ydCAweDYwLDB4NjQg aXJxIDEgb24gYWNwaTAKYXRrYmQwOiA8QVQgS2V5Ym9hcmQ+IGlycSAxIG9uIGF0a2JkYzAK a2JkMCBhdCBhdGtiZDAKYXRrYmQwOiBbR0lBTlQtTE9DS0VEXQpwc20wOiA8UFMvMiBNb3Vz ZT4gaXJxIDEyIG9uIGF0a2JkYzAKcHNtMDogW0dJQU5ULUxPQ0tFRF0KV0FSTklORzogRGV2 aWNlICJwc20iIGlzIEdpYW50IGxvY2tlZCBhbmQgbWF5IGJlIGRlbGV0ZWQgYmVmb3JlIEZy ZWVCU0QgMTUuMC4KcHNtMDogbW9kZWwgSW50ZWxsaU1vdXNlIEV4cGxvcmVyLCBkZXZpY2Ug SUQgNApvcm0wOiA8SVNBIE9wdGlvbiBST00+IGF0IGlvbWVtIDB4ZTkwMDAtMHhlZmZmZiBw bnBpZCBPUk0wMDAwIG9uIGlzYTAKdmdhMDogPEdlbmVyaWMgSVNBIFZHQT4gYXQgcG9ydCAw eDNjMC0weDNkZiBpb21lbSAweGEwMDAwLTB4YmZmZmYgcG5waWQgUE5QMDkwMCBvbiBpc2Ew CmF0dGltZXIwOiA8QVQgdGltZXI+IGF0IHBvcnQgMHg0MCBvbiBpc2EwClRpbWVjb3VudGVy ICJpODI1NCIgZnJlcXVlbmN5IDExOTMxODIgSHogcXVhbGl0eSAwCkV2ZW50IHRpbWVyICJp ODI1NCIgZnJlcXVlbmN5IDExOTMxODIgSHogcXVhbGl0eSAxMDAKVGltZWNvdW50ZXJzIHRp Y2sgZXZlcnkgMTAuMDAwIG1zZWMKdWdlbjAuMTogPCgweDFiMzYpIFhIQ0kgcm9vdCBIVUI+ IGF0IHVzYnVzMAp1aHViMCBvbiB1c2J1czAKdWh1YjA6IDwoMHgxYjM2KSBYSENJIHJvb3Qg SFVCLCBjbGFzcyA5LzAsIHJldiAzLjAwLzEuMDAsIGFkZHIgMT4gb24gdXNidXMwClpGUyBm aWxlc3lzdGVtIHZlcnNpb246IDUKWkZTIHN0b3JhZ2UgcG9vbCB2ZXJzaW9uOiBmZWF0dXJl cyBzdXBwb3J0ICg1MDAwKQpUcnlpbmcgdG8gbW91bnQgcm9vdCBmcm9tIHpmczp6cm9vdC9S T09ULzIwMjQtMTItMjYtMTgtMDkgW10uLi4KZGEwIGF0IHZ0c2NzaTAgYnVzIDAgc2NidXMw IHRhcmdldCAwIGx1biAwCmRhMDogPFFFTVUgUUVNVSBIQVJERElTSyAyLjUrPiBGaXhlZCBE aXJlY3QgQWNjZXNzIFNQQy0zIFNDU0kgZGV2aWNlCmRhMDogMzAwLjAwME1CL3MgdHJhbnNm ZXJzCmRhMDogQ29tbWFuZCBRdWV1ZWluZyBlbmFibGVkCmRhMDogNzM3MjgwTUIgKDE1MDk5 NDk0NDAgNTEyIGJ5dGUgc2VjdG9ycykKUm9vdCBtb3VudCB3YWl0aW5nIGZvcjogdXNidXMw CnVodWIwOiAzMCBwb3J0cyB3aXRoIDMwIHJlbW92YWJsZSwgc2VsZiBwb3dlcmVkCkdFT01f RUxJOiBEZXZpY2UgZGEwcDIuZWxpIGNyZWF0ZWQuCkdFT01fRUxJOiBFbmNyeXB0aW9uOiBB RVMtWFRTIDEyOApHRU9NX0VMSTogICAgIENyeXB0bzogYWNjZWxlcmF0ZWQgc29mdHdhcmUK aWNoc21iMDogPEludGVsIDgyODAxSSAoSUNIOSkgU01CdXMgY29udHJvbGxlcj4gcG9ydCAw eDcwMC0weDczZiBpcnEgMTYgYXQgZGV2aWNlIDMxLjMgb24gcGNpMApzbWJ1czA6IDxTeXN0 ZW0gTWFuYWdlbWVudCBCdXM+IG9uIGljaHNtYjAKdnRjb24wOiA8VmlydElPIENvbnNvbGUg QWRhcHRlcj4gb24gdmlydGlvX3BjaTIKdnRybmQwOiA8VmlydElPIEVudHJvcHkgQWRhcHRl cj4gb24gdmlydGlvX3BjaTQKcmFuZG9tOiByZWdpc3RlcmluZyBmYXN0IHNvdXJjZSBWaXJ0 SU8gRW50cm9weSBBZGFwdGVyCmxvMDogbGluayBzdGF0ZSBjaGFuZ2VkIHRvIFVQCnZ0bmV0 MDogbGluayBzdGF0ZSBjaGFuZ2VkIHRvIFVQClNlY3VyaXR5IHBvbGljeSBsb2FkZWQ6IE1B Qy9udHBkIChtYWNfbnRwZCkKV2FpdGluZyAobWF4IDYwIHNlY29uZHMpIGZvciBzeXN0ZW0g cHJvY2VzcyBgdm5scnUnIHRvIHN0b3AuLi4gZG9uZQpXYWl0aW5nIChtYXggNjAgc2Vjb25k cykgZm9yIHN5c3RlbSBwcm9jZXNzIGBzeW5jZXInIHRvIHN0b3AuLi4gClN5bmNpbmcgZGlz a3MsIHZub2RlcyByZW1haW5pbmcuLi4gMCAwIGRvbmUKQWxsIGJ1ZmZlcnMgc3luY2VkLgpH RU9NX0VMSTogRGV2aWNlIGRhMHAyLmVsaSBkZXN0cm95ZWQuCkdFT01fRUxJOiBEZXRhY2hl ZCBkYTBwMi5lbGkgb24gbGFzdCBjbG9zZS4KVXB0aW1lOiAxbTQ1cwp1aHViMDogZGV0YWNo ZWQKLS0tPDxCT09UPj4tLS0KQ29weXJpZ2h0IChjKSAxOTkyLTIwMjQgVGhlIEZyZWVCU0Qg UHJvamVjdC4KQ29weXJpZ2h0IChjKSAxOTc5LCAxOTgwLCAxOTgzLCAxOTg2LCAxOTg4LCAx OTg5LCAxOTkxLCAxOTkyLCAxOTkzLCAxOTk0CglUaGUgUmVnZW50cyBvZiB0aGUgVW5pdmVy c2l0eSBvZiBDYWxpZm9ybmlhLiBBbGwgcmlnaHRzIHJlc2VydmVkLgpGcmVlQlNEIGlzIGEg cmVnaXN0ZXJlZCB0cmFkZW1hcmsgb2YgVGhlIEZyZWVCU0QgRm91bmRhdGlvbi4KRnJlZUJT RCAxNS4wLUNVUlJFTlQgIzIzIG4yNzQxODQtZmFmYjQzYWJkMGQ6IFRodSBEZWMgMjYgMTg6 MTI6MDUgLTAzIDIwMjQKICAgIHJvb3RAaWRhaG8uYXJyYWtpcy5jb20uYnI6L3Vzci9vYmov dXNyL3NyYy9hbWQ2NC5hbWQ2NC9zeXMvR0VORVJJQy1OT0RFQlVHIGFtZDY0CkZyZWVCU0Qg Y2xhbmcgdmVyc2lvbiAxOS4xLjUgKGh0dHBzOi8vZ2l0aHViLmNvbS9sbHZtL2xsdm0tcHJv amVjdC5naXQgbGx2bW9yZy0xOS4xLjUtMC1nYWI0YjVhMmRiNTgyKQpWVCh2Z2EpOiB0ZXh0 IDgweDI1CkNQVTogSW50ZWwoUikgWGVvbihSKSBDUFUgRTUtMjY5NyB2MyBAIDIuNjBHSHog KDI2MDAuMTYtTUh6IEs4LWNsYXNzIENQVSkKICBPcmlnaW49IkdlbnVpbmVJbnRlbCIgIElk PTB4MzA2ZjIgIEZhbWlseT0weDYgIE1vZGVsPTB4M2YgIFN0ZXBwaW5nPTIKICBGZWF0dXJl cz0weGY4M2ZiZmY8RlBVLFZNRSxERSxQU0UsVFNDLE1TUixQQUUsTUNFLENYOCxBUElDLFNF UCxNVFJSLFBHRSxNQ0EsQ01PVixQQVQsUFNFMzYsTU1YLEZYU1IsU1NFLFNTRTIsU1M+CiAg RmVhdHVyZXMyPTB4ZmZmYTMyMDM8U1NFMyxQQ0xNVUxRRFEsU1NTRTMsRk1BLENYMTYsUENJ RCxTU0U0LjEsU1NFNC4yLHgyQVBJQyxNT1ZCRSxQT1BDTlQsVFNDRExULEFFU05JLFhTQVZF LE9TWFNBVkUsQVZYLEYxNkMsUkRSQU5ELEhWPgogIEFNRCBGZWF0dXJlcz0weDJjMTAwODAw PFNZU0NBTEwsTlgsUGFnZTFHQixSRFRTQ1AsTE0+CiAgQU1EIEZlYXR1cmVzMj0weDIxPExB SEYsQUJNPgogIFN0cnVjdHVyZWQgRXh0ZW5kZWQgRmVhdHVyZXM9MHg3YWI8RlNHU0JBU0Us VFNDQURKLEJNSTEsQVZYMixTTUVQLEJNSTIsRVJNUyxJTlZQQ0lEPgogIFN0cnVjdHVyZWQg RXh0ZW5kZWQgRmVhdHVyZXMyPTB4NDxVTUlQPgogIFN0cnVjdHVyZWQgRXh0ZW5kZWQgRmVh dHVyZXMzPTB4YWMwMDA0MDA8TURfQ0xFQVIsSUJQQixTVElCUCxBUkNIX0NBUCxTU0JEPgog IFhTQVZFIEZlYXR1cmVzPTB4MTxYU0FWRU9QVD4KICBJQTMyX0FSQ0hfQ0FQUz0weDQ4PFNL SVBfTDFERkxfVk1FPgogIEFNRCBFeHRlbmRlZCBGZWF0dXJlIEV4dGVuc2lvbnMgSUQgRUJY PTB4MTAwZDAwMDxJQlBCLElCUlMsU1RJQlAsU1NCRD4KSHlwZXJ2aXNvcjogT3JpZ2luID0g IktWTUtWTUtWTSIKcmVhbCBtZW1vcnkgID0gNTE1Mzk2MDc1NTIgKDQ5MTUyIE1CKQphdmFp bCBtZW1vcnkgPSA1MDA2NzgwNDE2MCAoNDc3NDggTUIpCkV2ZW50IHRpbWVyICJMQVBJQyIg cXVhbGl0eSA2MDAKQUNQSSBBUElDIFRhYmxlOiA8Qk9DSFMgIEJYUEMgICAgPgpGcmVlQlNE L1NNUDogTXVsdGlwcm9jZXNzb3IgU3lzdGVtIERldGVjdGVkOiAxMiBDUFVzCkZyZWVCU0Qv U01QOiAxMiBwYWNrYWdlKHMpIHggMSBjb3JlKHMpCnJhbmRvbTogcmVnaXN0ZXJpbmcgZmFz dCBzb3VyY2UgSW50ZWwgU2VjdXJlIEtleSBSTkcKcmFuZG9tOiBmYXN0IHByb3ZpZGVyOiAi SW50ZWwgU2VjdXJlIEtleSBSTkciCnJhbmRvbTogdW5ibG9ja2luZyBkZXZpY2UuCmlvYXBp YzAgPFZlcnNpb24gMS4xPiBpcnFzIDAtMjMKTGF1bmNoaW5nIEFQczogNCA2IDEwIDUgMTEg OCAyIDEgMyA5IDcKcmFuZG9tOiBlbnRyb3B5IGRldmljZSBleHRlcm5hbCBpbnRlcmZhY2UK a2JkMSBhdCBrYmRtdXgwCnZ0dmdhMDogPFZUIFZHQSBkcml2ZXI+Cmt2bWNsb2NrMDogPEtW TSBwYXJhdmlydHVhbCBjbG9jaz4KVGltZWNvdW50ZXIgImt2bWNsb2NrIiBmcmVxdWVuY3kg MTAwMDAwMDAwMCBIeiBxdWFsaXR5IDk3NQprdm1jbG9jazA6IHJlZ2lzdGVyZWQgYXMgYSB0 aW1lLW9mLWRheSBjbG9jaywgcmVzb2x1dGlvbiAwLjAwMDAwMXMKc21iaW9zMDogPFN5c3Rl bSBNYW5hZ2VtZW50IEJJT1M+IGF0IGlvbWVtIDB4ZjVhNTAtMHhmNWE2ZQpzbWJpb3MwOiBW ZXJzaW9uOiAyLjgsIEJDRCBSZXZpc2lvbjogMi44CmFlc25pMDogPEFFUy1DQkMsQUVTLUND TSxBRVMtR0NNLEFFUy1JQ00sQUVTLVhUUz4KYWNwaTA6IDxCT0NIUyBCWFBDPgphY3BpMDog UG93ZXIgQnV0dG9uIChmaXhlZCkKY3B1MDogPEFDUEkgQ1BVPiBvbiBhY3BpMAphdHJ0YzA6 IDxBVCByZWFsdGltZSBjbG9jaz4gcG9ydCAweDcwLTB4NzcgaXJxIDggb24gYWNwaTAKYXRy dGMwOiByZWdpc3RlcmVkIGFzIGEgdGltZS1vZi1kYXkgY2xvY2ssIHJlc29sdXRpb24gMS4w MDAwMDBzCkV2ZW50IHRpbWVyICJSVEMiIGZyZXF1ZW5jeSAzMjc2OCBIeiBxdWFsaXR5IDAK VGltZWNvdW50ZXIgIkFDUEktZmFzdCIgZnJlcXVlbmN5IDM1Nzk1NDUgSHogcXVhbGl0eSA5 MDAKYWNwaV90aW1lcjA6IDwyNC1iaXQgdGltZXIgYXQgMy41Nzk1NDVNSHo+IHBvcnQgMHg2 MDgtMHg2MGIgb24gYWNwaTAKcGNpYjA6IDxBQ1BJIEhvc3QtUENJIGJyaWRnZT4gcG9ydCAw eGNmOC0weGNmZiBvbiBhY3BpMApwY2kwOiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liMAp2Z2Fw Y2kwOiA8VkdBLWNvbXBhdGlibGUgZGlzcGxheT4gcG9ydCAweGQwNDAtMHhkMDVmIG1lbSAw eGY0MDAwMDAwLTB4ZjdmZmZmZmYsMHhmODAwMDAwMC0weGZiZmZmZmZmLDB4ZmQyMTAwMDAt MHhmZDIxMWZmZiBpcnEgMjEgYXQgZGV2aWNlIDEuMCBvbiBwY2kwCnZnYXBjaTA6IEJvb3Qg dmlkZW8gZGV2aWNlCnBjaWIxOiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQyMTIw MDAtMHhmZDIxMmZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuMCBvbiBwY2kwCnBjaWIyOiA8QUNQ SSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQyMTMwMDAtMHhmZDIxM2ZmZiBpcnEgMjIgYXQg ZGV2aWNlIDIuMSBvbiBwY2kwCnBjaWIzOiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4 ZmQyMTQwMDAtMHhmZDIxNGZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuMiBvbiBwY2kwCnBjaWI0 OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQyMTUwMDAtMHhmZDIxNWZmZiBpcnEg MjIgYXQgZGV2aWNlIDIuMyBvbiBwY2kwCnBjaWI1OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4g bWVtIDB4ZmQyMTYwMDAtMHhmZDIxNmZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNCBvbiBwY2kw CnBjaWI2OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQyMTcwMDAtMHhmZDIxN2Zm ZiBpcnEgMjIgYXQgZGV2aWNlIDIuNSBvbiBwY2kwCnBjaWI3OiA8QUNQSSBQQ0ktUENJIGJy aWRnZT4gbWVtIDB4ZmQyMTgwMDAtMHhmZDIxOGZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNiBv biBwY2kwCnBjaWI4OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQyMTkwMDAtMHhm ZDIxOWZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNyBvbiBwY2kwCmlzYWIwOiA8UENJLUlTQSBi cmlkZ2U+IGF0IGRldmljZSAzMS4wIG9uIHBjaTAKaXNhMDogPElTQSBidXM+IG9uIGlzYWIw CmFoY2kwOiA8SW50ZWwgSUNIOSBBSENJIFNBVEEgY29udHJvbGxlcj4gcG9ydCAweGQwNjAt MHhkMDdmIG1lbSAweGZkMjFhMDAwLTB4ZmQyMWFmZmYgaXJxIDE2IGF0IGRldmljZSAzMS4y IG9uIHBjaTAKYWhjaTA6IEFIQ0kgdjEuMDAgd2l0aCA2IDEuNUdicHMgcG9ydHMsIFBvcnQg TXVsdGlwbGllciBub3Qgc3VwcG9ydGVkCmFoY2ljaDA6IDxBSENJIGNoYW5uZWw+IGF0IGNo YW5uZWwgMCBvbiBhaGNpMAphaGNpY2gxOiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDEg b24gYWhjaTAKYWhjaWNoMjogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5lbCAyIG9uIGFoY2kw CmFoY2ljaDM6IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgMyBvbiBhaGNpMAphaGNpY2g0 OiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDQgb24gYWhjaTAKYWhjaWNoNTogPEFIQ0kg Y2hhbm5lbD4gYXQgY2hhbm5lbCA1IG9uIGFoY2kwCmFjcGlfc3lzY29udGFpbmVyMDogPFN5 c3RlbSBDb250YWluZXI+IG9uIGFjcGkwCmFjcGlfc3lzY29udGFpbmVyMTogPFN5c3RlbSBD b250YWluZXI+IHBvcnQgMHhjZDgtMHhjZTMgb24gYWNwaTAKYWNwaV9zeXNjb250YWluZXIy OiA8U3lzdGVtIENvbnRhaW5lcj4gcG9ydCAweDYyMC0weDYyZiBvbiBhY3BpMAphY3BpX3N5 c2NvbnRhaW5lcjM6IDxTeXN0ZW0gQ29udGFpbmVyPiBwb3J0IDB4Y2MwLTB4Y2Q3IG9uIGFj cGkwCnVhcnQwOiA8MTY1NTAgb3IgY29tcGF0aWJsZT4gcG9ydCAweDNmOC0weDNmZiBpcnEg NCBmbGFncyAweDEwIG9uIGFjcGkwCmF0a2JkYzA6IDxLZXlib2FyZCBjb250cm9sbGVyIChp ODA0Mik+IHBvcnQgMHg2MCwweDY0IGlycSAxIG9uIGFjcGkwCmF0a2JkMDogPEFUIEtleWJv YXJkPiBpcnEgMSBvbiBhdGtiZGMwCmtiZDAgYXQgYXRrYmQwCmF0a2JkMDogW0dJQU5ULUxP Q0tFRF0KcHNtMDogPFBTLzIgTW91c2U+IGlycSAxMiBvbiBhdGtiZGMwCnBzbTA6IFtHSUFO VC1MT0NLRURdCldBUk5JTkc6IERldmljZSAicHNtIiBpcyBHaWFudCBsb2NrZWQgYW5kIG1h eSBiZSBkZWxldGVkIGJlZm9yZSBGcmVlQlNEIDE1LjAuCnBzbTA6IG1vZGVsIEludGVsbGlN b3VzZSBFeHBsb3JlciwgZGV2aWNlIElEIDQKb3JtMDogPElTQSBPcHRpb24gUk9NPiBhdCBp b21lbSAweGU5MDAwLTB4ZWZmZmYgcG5waWQgT1JNMDAwMCBvbiBpc2EwCnZnYTA6IDxHZW5l cmljIElTQSBWR0E+IGF0IHBvcnQgMHgzYzAtMHgzZGYgaW9tZW0gMHhhMDAwMC0weGJmZmZm IHBucGlkIFBOUDA5MDAgb24gaXNhMAphdHRpbWVyMDogPEFUIHRpbWVyPiBhdCBwb3J0IDB4 NDAgb24gaXNhMApUaW1lY291bnRlciAiaTgyNTQiIGZyZXF1ZW5jeSAxMTkzMTgyIEh6IHF1 YWxpdHkgMApFdmVudCB0aW1lciAiaTgyNTQiIGZyZXF1ZW5jeSAxMTkzMTgyIEh6IHF1YWxp dHkgMTAwClRpbWVjb3VudGVycyB0aWNrIGV2ZXJ5IDEwLjAwMCBtc2VjClpGUyBmaWxlc3lz dGVtIHZlcnNpb246IDUKWkZTIHN0b3JhZ2UgcG9vbCB2ZXJzaW9uOiBmZWF0dXJlcyBzdXBw b3J0ICg1MDAwKQpUcnlpbmcgdG8gbW91bnQgcm9vdCBmcm9tIHpmczp6cm9vdC9ST09ULzIw MjQtMTItMjYtMTgtMTEgW10uLi4KU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUg cG9vbCBsYWJlbCBmb3IgJ3pyb290JwpNb3VudGluZyBmcm9tIHpmczp6cm9vdC9ST09ULzIw MjQtMTItMjYtMTgtMTEgZmFpbGVkIHdpdGggZXJyb3IgNTsgcmV0cnlpbmcgZm9yIDMgbW9y ZSBzZWNvbmRzClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwg Zm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJl bCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxh YmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wg bGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9v bCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBw b29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhl IHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0 aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5k IHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZp bmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3Qg ZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5v dCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fu bm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBD YW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6 IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElD RTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9U SUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBO T1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6 IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJp czogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xh cmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNv bGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcK U29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290 JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJv b3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6 cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3Ig J3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZv ciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwg Zm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJl bCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxh YmVsIGZvciAnenJvb3QnCk1vdW50aW5nIGZyb20gemZzOnpyb290L1JPT1QvMjAyNC0xMi0y Ni0xOC0xMSBmYWlsZWQgd2l0aCBlcnJvciA1LgoKTG9hZGVyIHZhcmlhYmxlczoKICB2ZnMu cm9vdC5tb3VudGZyb209emZzOnpyb290L1JPT1QvMjAyNC0xMi0yNi0xOC0xMQoKTWFudWFs IHJvb3QgZmlsZXN5c3RlbSBzcGVjaWZpY2F0aW9uOgogIDxmc3R5cGU+OjxkZXZpY2U+IFtv cHRpb25zXQogICAgICBNb3VudCA8ZGV2aWNlPiB1c2luZyBmaWxlc3lzdGVtIDxmc3R5cGU+ CiAgICAgIGFuZCB3aXRoIHRoZSBzcGVjaWZpZWQgKG9wdGlvbmFsKSBvcHRpb24gbGlzdC4K CiAgICBlZy4gdWZzOi9kZXYvZGEwczFhCiAgICAgICAgemZzOnpyb290L1JPT1QvZGVmYXVs dAogICAgICAgIGNkOTY2MDovZGV2L2NkMCBybwogICAgICAgICAgKHdoaWNoIGlzIGVxdWl2 YWxlbnQgdG86IG1vdW50IC10IGNkOTY2MCAtbyBybyAvZGV2L2NkMCAvKQoKICA/ICAgICAg ICAgICAgICAgTGlzdCB2YWxpZCBkaXNrIGJvb3QgZGV2aWNlcwogIC4gICAgICAgICAgICAg ICBZaWVsZCAxIHNlY29uZCAoZm9yIGJhY2tncm91bmQgdGFza3MpCiAgPGVtcHR5IGxpbmU+ ICAgIEFib3J0IG1hbnVhbCBpbnB1dAoKbW91bnRyb290PiBwYW5pYzogbW91bnRyb290OiB1 bmFibGUgdG8gKHJlLSltb3VudCByb290LgpjcHVpZCA9IDUKdGltZSA9IDYKS0RCOiBzdGFj ayBiYWNrdHJhY2U6CmRiX3RyYWNlX3NlbGZfd3JhcHBlcigpIGF0IGRiX3RyYWNlX3NlbGZf d3JhcHBlcisweDJiL2ZyYW1lIDB4ZmZmZmZlMDEyZjYwNWI2MAp2cGFuaWMoKSBhdCB2cGFu aWMrMHgxMzYvZnJhbWUgMHhmZmZmZmUwMTJmNjA1YzkwCnBhbmljKCkgYXQgcGFuaWMrMHg0 My9mcmFtZSAweGZmZmZmZTAxMmY2MDVjZjAKdmZzX21vdW50cm9vdCgpIGF0IHZmc19tb3Vu dHJvb3QrMHgxY2JjL2ZyYW1lIDB4ZmZmZmZlMDEyZjYwNWU2MApzdGFydF9pbml0KCkgYXQg c3RhcnRfaW5pdCsweDIzL2ZyYW1lIDB4ZmZmZmZlMDEyZjYwNWVmMApmb3JrX2V4aXQoKSBh dCBmb3JrX2V4aXQrMHg3Yi9mcmFtZSAweGZmZmZmZTAxMmY2MDVmMzAKZm9ya190cmFtcG9s aW5lKCkgYXQgZm9ya190cmFtcG9saW5lKzB4ZS9mcmFtZSAweGZmZmZmZTAxMmY2MDVmMzAK LS0tIHRyYXAgMHgzZjU5MDM4LCByaXAgPSAweGZmZmZmZmZmODAzOGE2ZDgsIHJzcCA9IDB4 ZmZmZmY4MDEwMjkwMjAwMCwgcmJwID0gMHhmZmZmZmZmZjgwOTc4MTIwIC0tLQp4cHRfYWN0 aW9uX2RlZmF1bHQoKSBhdCB4cHRfYWN0aW9uX2RlZmF1bHQrMHgzZDgvZnJhbWUgMHhmZmZm ZmZmZjgwOTc4MTIwCktEQjogZW50ZXI6IHBhbmljCi0tLTw8Qk9PVD4+LS0tCkNvcHlyaWdo dCAoYykgMTk5Mi0yMDI0IFRoZSBGcmVlQlNEIFByb2plY3QuCkNvcHlyaWdodCAoYykgMTk3 OSwgMTk4MCwgMTk4MywgMTk4NiwgMTk4OCwgMTk4OSwgMTk5MSwgMTk5MiwgMTk5MywgMTk5 NAoJVGhlIFJlZ2VudHMgb2YgdGhlIFVuaXZlcnNpdHkgb2YgQ2FsaWZvcm5pYS4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KRnJlZUJTRCBpcyBhIHJlZ2lzdGVyZWQgdHJhZGVtYXJrIG9mIFRo ZSBGcmVlQlNEIEZvdW5kYXRpb24uCkZyZWVCU0QgMTUuMC1DVVJSRU5UICMyMiBuMjc0MTgy LTkzOGU0YjEzMWM0OiBUaHUgRGVjIDI2IDE4OjEwOjEyIC0wMyAyMDI0CiAgICByb290QGlk YWhvLmFycmFraXMuY29tLmJyOi91c3Ivb2JqL3Vzci9zcmMvYW1kNjQuYW1kNjQvc3lzL0dF TkVSSUMtTk9ERUJVRyBhbWQ2NApGcmVlQlNEIGNsYW5nIHZlcnNpb24gMTkuMS41IChodHRw czovL2dpdGh1Yi5jb20vbGx2bS9sbHZtLXByb2plY3QuZ2l0IGxsdm1vcmctMTkuMS41LTAt Z2FiNGI1YTJkYjU4MikKVlQodmdhKTogdGV4dCA4MHgyNQpDUFU6IEludGVsKFIpIFhlb24o UikgQ1BVIEU1LTI2OTcgdjMgQCAyLjYwR0h6ICgyNjAwLjEwLU1IeiBLOC1jbGFzcyBDUFUp CiAgT3JpZ2luPSJHZW51aW5lSW50ZWwiICBJZD0weDMwNmYyICBGYW1pbHk9MHg2ICBNb2Rl bD0weDNmICBTdGVwcGluZz0yCiAgRmVhdHVyZXM9MHhmODNmYmZmPEZQVSxWTUUsREUsUFNF LFRTQyxNU1IsUEFFLE1DRSxDWDgsQVBJQyxTRVAsTVRSUixQR0UsTUNBLENNT1YsUEFULFBT RTM2LE1NWCxGWFNSLFNTRSxTU0UyLFNTPgogIEZlYXR1cmVzMj0weGZmZmEzMjAzPFNTRTMs UENMTVVMUURRLFNTU0UzLEZNQSxDWDE2LFBDSUQsU1NFNC4xLFNTRTQuMix4MkFQSUMsTU9W QkUsUE9QQ05ULFRTQ0RMVCxBRVNOSSxYU0FWRSxPU1hTQVZFLEFWWCxGMTZDLFJEUkFORCxI Vj4KICBBTUQgRmVhdHVyZXM9MHgyYzEwMDgwMDxTWVNDQUxMLE5YLFBhZ2UxR0IsUkRUU0NQ LExNPgogIEFNRCBGZWF0dXJlczI9MHgyMTxMQUhGLEFCTT4KICBTdHJ1Y3R1cmVkIEV4dGVu ZGVkIEZlYXR1cmVzPTB4N2FiPEZTR1NCQVNFLFRTQ0FESixCTUkxLEFWWDIsU01FUCxCTUky LEVSTVMsSU5WUENJRD4KICBTdHJ1Y3R1cmVkIEV4dGVuZGVkIEZlYXR1cmVzMj0weDQ8VU1J UD4KICBTdHJ1Y3R1cmVkIEV4dGVuZGVkIEZlYXR1cmVzMz0weGFjMDAwNDAwPE1EX0NMRUFS LElCUEIsU1RJQlAsQVJDSF9DQVAsU1NCRD4KICBYU0FWRSBGZWF0dXJlcz0weDE8WFNBVkVP UFQ+CiAgSUEzMl9BUkNIX0NBUFM9MHg0ODxTS0lQX0wxREZMX1ZNRT4KICBBTUQgRXh0ZW5k ZWQgRmVhdHVyZSBFeHRlbnNpb25zIElEIEVCWD0weDEwMGQwMDA8SUJQQixJQlJTLFNUSUJQ LFNTQkQ+Ckh5cGVydmlzb3I6IE9yaWdpbiA9ICJLVk1LVk1LVk0iCnJlYWwgbWVtb3J5ICA9 IDUxNTM5NjA3NTUyICg0OTE1MiBNQikKYXZhaWwgbWVtb3J5ID0gNTAwNjc4MDAwNjQgKDQ3 NzQ4IE1CKQpFdmVudCB0aW1lciAiTEFQSUMiIHF1YWxpdHkgNjAwCkFDUEkgQVBJQyBUYWJs ZTogPEJPQ0hTICBCWFBDICAgID4KRnJlZUJTRC9TTVA6IE11bHRpcHJvY2Vzc29yIFN5c3Rl bSBEZXRlY3RlZDogMTIgQ1BVcwpGcmVlQlNEL1NNUDogMTIgcGFja2FnZShzKSB4IDEgY29y ZShzKQpyYW5kb206IHJlZ2lzdGVyaW5nIGZhc3Qgc291cmNlIEludGVsIFNlY3VyZSBLZXkg Uk5HCnJhbmRvbTogZmFzdCBwcm92aWRlcjogIkludGVsIFNlY3VyZSBLZXkgUk5HIgpyYW5k b206IHVuYmxvY2tpbmcgZGV2aWNlLgppb2FwaWMwIDxWZXJzaW9uIDEuMT4gaXJxcyAwLTIz CkxhdW5jaGluZyBBUHM6IDcgOSAzIDEwIDEgMiA1IDQgNiAxMSA4CnJhbmRvbTogZW50cm9w eSBkZXZpY2UgZXh0ZXJuYWwgaW50ZXJmYWNlCmtiZDEgYXQga2JkbXV4MAp2dHZnYTA6IDxW VCBWR0EgZHJpdmVyPgprdm1jbG9jazA6IDxLVk0gcGFyYXZpcnR1YWwgY2xvY2s+ClRpbWVj b3VudGVyICJrdm1jbG9jayIgZnJlcXVlbmN5IDEwMDAwMDAwMDAgSHogcXVhbGl0eSA5NzUK a3ZtY2xvY2swOiByZWdpc3RlcmVkIGFzIGEgdGltZS1vZi1kYXkgY2xvY2ssIHJlc29sdXRp b24gMC4wMDAwMDFzCnNtYmlvczA6IDxTeXN0ZW0gTWFuYWdlbWVudCBCSU9TPiBhdCBpb21l bSAweGY1YTUwLTB4ZjVhNmUKc21iaW9zMDogVmVyc2lvbjogMi44LCBCQ0QgUmV2aXNpb246 IDIuOAphZXNuaTA6IDxBRVMtQ0JDLEFFUy1DQ00sQUVTLUdDTSxBRVMtSUNNLEFFUy1YVFM+ CmFjcGkwOiA8Qk9DSFMgQlhQQz4KYWNwaTA6IFBvd2VyIEJ1dHRvbiAoZml4ZWQpCmNwdTA6 IDxBQ1BJIENQVT4gb24gYWNwaTAKYXRydGMwOiA8QVQgcmVhbHRpbWUgY2xvY2s+IHBvcnQg MHg3MC0weDc3IGlycSA4IG9uIGFjcGkwCmF0cnRjMDogcmVnaXN0ZXJlZCBhcyBhIHRpbWUt b2YtZGF5IGNsb2NrLCByZXNvbHV0aW9uIDEuMDAwMDAwcwpFdmVudCB0aW1lciAiUlRDIiBm cmVxdWVuY3kgMzI3NjggSHogcXVhbGl0eSAwClRpbWVjb3VudGVyICJBQ1BJLWZhc3QiIGZy ZXF1ZW5jeSAzNTc5NTQ1IEh6IHF1YWxpdHkgOTAwCmFjcGlfdGltZXIwOiA8MjQtYml0IHRp bWVyIGF0IDMuNTc5NTQ1TUh6PiBwb3J0IDB4NjA4LTB4NjBiIG9uIGFjcGkwCnBjaWIwOiA8 QUNQSSBIb3N0LVBDSSBicmlkZ2U+IHBvcnQgMHhjZjgtMHhjZmYgb24gYWNwaTAKcGNpMDog PEFDUEkgUENJIGJ1cz4gb24gcGNpYjAKdmdhcGNpMDogPFZHQS1jb21wYXRpYmxlIGRpc3Bs YXk+IHBvcnQgMHhkMDQwLTB4ZDA1ZiBtZW0gMHhmNDAwMDAwMC0weGY3ZmZmZmZmLDB4Zjgw MDAwMDAtMHhmYmZmZmZmZiwweGZkMjEwMDAwLTB4ZmQyMTFmZmYgaXJxIDIxIGF0IGRldmlj ZSAxLjAgb24gcGNpMAp2Z2FwY2kwOiBCb290IHZpZGVvIGRldmljZQpwY2liMTogPEFDUEkg UENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjEyMDAwLTB4ZmQyMTJmZmYgaXJxIDIyIGF0IGRl dmljZSAyLjAgb24gcGNpMApwY2kxOiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liMQpwY2liMjog PEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZjMjAwMDAwLTB4ZmMyMDAwZmYgaXJxIDIy IGF0IGRldmljZSAwLjAgb24gcGNpMQpwY2kyOiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liMgpw Y2liMzogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjEzMDAwLTB4ZmQyMTNmZmYg aXJxIDIyIGF0IGRldmljZSAyLjEgb24gcGNpMApwY2kzOiA8QUNQSSBQQ0kgYnVzPiBvbiBw Y2liMwp2aXJ0aW9fcGNpMDogPFZpcnRJTyBQQ0kgKG1vZGVybikgTmV0d29yayBhZGFwdGVy PiBtZW0gMHhmZDA0MDAwMC0weGZkMDQwZmZmLDB4ZmU4MDAwMDAtMHhmZTgwM2ZmZiBpcnEg MjIgYXQgZGV2aWNlIDAuMCBvbiBwY2kzCnZ0bmV0MDogPFZpcnRJTyBOZXR3b3JraW5nIEFk YXB0ZXI+IG9uIHZpcnRpb19wY2kwCnZ0bmV0MDogRXRoZXJuZXQgYWRkcmVzczogNTI6NTQ6 NTg6OTM6Yzc6ZWYKdnRuZXQwOiBuZXRtYXAgcXVldWVzL3Nsb3RzOiBUWCAxLzI1NiwgUlgg MS8xMjgKMDAwLjAwMDA3NyBbIDQ1Ml0gdnRuZXRfbmV0bWFwX2F0dGFjaCAgICAgICB2dG5l dCBhdHRhY2hlZCB0eHE9MSwgdHhkPTI1NiByeHE9MSwgcnhkPTEyOApwY2liNDogPEFDUEkg UENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjE0MDAwLTB4ZmQyMTRmZmYgaXJxIDIyIGF0IGRl dmljZSAyLjIgb24gcGNpMApwY2k0OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liNAp4aGNpMDog PFhIQ0kgKGdlbmVyaWMpIFVTQiAzLjAgY29udHJvbGxlcj4gbWVtIDB4ZmNlMDAwMDAtMHhm Y2UwM2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDAuMCBvbiBwY2k0CnhoY2kwOiAzMiBieXRlcyBj b250ZXh0IHNpemUsIDY0LWJpdCBETUEKdXNidXMwIG9uIHhoY2kwCnVzYnVzMDogNS4wR2Jw cyBTdXBlciBTcGVlZCBVU0IgdjMuMApwY2liNTogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1l bSAweGZkMjE1MDAwLTB4ZmQyMTVmZmYgaXJxIDIyIGF0IGRldmljZSAyLjMgb24gcGNpMApw Y2k1OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liNQp2aXJ0aW9fcGNpMTogPFZpcnRJTyBQQ0kg KG1vZGVybikgU0NTSSBhZGFwdGVyPiBtZW0gMHhmY2MwMDAwMC0weGZjYzAwZmZmLDB4ZmU0 MDAwMDAtMHhmZTQwM2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDAuMCBvbiBwY2k1CnZ0c2NzaTA6 IDxWaXJ0SU8gU0NTSSBBZGFwdGVyPiBvbiB2aXJ0aW9fcGNpMQpwY2liNjogPEFDUEkgUENJ LVBDSSBicmlkZ2U+IG1lbSAweGZkMjE2MDAwLTB4ZmQyMTZmZmYgaXJxIDIyIGF0IGRldmlj ZSAyLjQgb24gcGNpMApwY2k2OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liNgp2aXJ0aW9fcGNp MjogPFZpcnRJTyBQQ0kgKG1vZGVybikgQ29uc29sZSBhZGFwdGVyPiBtZW0gMHhmY2EwMDAw MC0weGZjYTAwZmZmLDB4ZmUyMDAwMDAtMHhmZTIwM2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDAu MCBvbiBwY2k2CnBjaWI3OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQyMTcwMDAt MHhmZDIxN2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNSBvbiBwY2kwCnBjaTc6IDxBQ1BJIFBD SSBidXM+IG9uIHBjaWI3CnZpcnRpb19wY2kzOiA8VmlydElPIFBDSSAobW9kZXJuKSBCYWxs b29uIGFkYXB0ZXI+IG1lbSAweGZlMDAwMDAwLTB4ZmUwMDNmZmYgaXJxIDIyIGF0IGRldmlj ZSAwLjAgb24gcGNpNwp2dGJhbGxvb24wOiA8VmlydElPIEJhbGxvb24gQWRhcHRlcj4gb24g dmlydGlvX3BjaTMKcGNpYjg6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxODAw MC0weGZkMjE4ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi42IG9uIHBjaTAKcGNpODogPEFDUEkg UENJIGJ1cz4gb24gcGNpYjgKdmlydGlvX3BjaTQ6IDxWaXJ0SU8gUENJIChtb2Rlcm4pIEVu dHJvcHkgYWRhcHRlcj4gbWVtIDB4ZmRlMDAwMDAtMHhmZGUwM2ZmZiBpcnEgMjIgYXQgZGV2 aWNlIDAuMCBvbiBwY2k4CnBjaWI5OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQy MTkwMDAtMHhmZDIxOWZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNyBvbiBwY2kwCnBjaTk6IDxB Q1BJIFBDSSBidXM+IG9uIHBjaWI5CmlzYWIwOiA8UENJLUlTQSBicmlkZ2U+IGF0IGRldmlj ZSAzMS4wIG9uIHBjaTAKaXNhMDogPElTQSBidXM+IG9uIGlzYWIwCmFoY2kwOiA8SW50ZWwg SUNIOSBBSENJIFNBVEEgY29udHJvbGxlcj4gcG9ydCAweGQwNjAtMHhkMDdmIG1lbSAweGZk MjFhMDAwLTB4ZmQyMWFmZmYgaXJxIDE2IGF0IGRldmljZSAzMS4yIG9uIHBjaTAKYWhjaTA6 IEFIQ0kgdjEuMDAgd2l0aCA2IDEuNUdicHMgcG9ydHMsIFBvcnQgTXVsdGlwbGllciBub3Qg c3VwcG9ydGVkCmFoY2ljaDA6IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgMCBvbiBhaGNp MAphaGNpY2gxOiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDEgb24gYWhjaTAKYWhjaWNo MjogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5lbCAyIG9uIGFoY2kwCmFoY2ljaDM6IDxBSENJ IGNoYW5uZWw+IGF0IGNoYW5uZWwgMyBvbiBhaGNpMAphaGNpY2g0OiA8QUhDSSBjaGFubmVs PiBhdCBjaGFubmVsIDQgb24gYWhjaTAKYWhjaWNoNTogPEFIQ0kgY2hhbm5lbD4gYXQgY2hh bm5lbCA1IG9uIGFoY2kwCmFjcGlfc3lzY29udGFpbmVyMDogPFN5c3RlbSBDb250YWluZXI+ IG9uIGFjcGkwCmFjcGlfc3lzY29udGFpbmVyMTogPFN5c3RlbSBDb250YWluZXI+IHBvcnQg MHhjZDgtMHhjZTMgb24gYWNwaTAKYWNwaV9zeXNjb250YWluZXIyOiA8U3lzdGVtIENvbnRh aW5lcj4gcG9ydCAweDYyMC0weDYyZiBvbiBhY3BpMAphY3BpX3N5c2NvbnRhaW5lcjM6IDxT eXN0ZW0gQ29udGFpbmVyPiBwb3J0IDB4Y2MwLTB4Y2Q3IG9uIGFjcGkwCnVhcnQwOiA8MTY1 NTAgb3IgY29tcGF0aWJsZT4gcG9ydCAweDNmOC0weDNmZiBpcnEgNCBmbGFncyAweDEwIG9u IGFjcGkwCmF0a2JkYzA6IDxLZXlib2FyZCBjb250cm9sbGVyIChpODA0Mik+IHBvcnQgMHg2 MCwweDY0IGlycSAxIG9uIGFjcGkwCmF0a2JkMDogPEFUIEtleWJvYXJkPiBpcnEgMSBvbiBh dGtiZGMwCmtiZDAgYXQgYXRrYmQwCmF0a2JkMDogW0dJQU5ULUxPQ0tFRF0KcHNtMDogPFBT LzIgTW91c2U+IGlycSAxMiBvbiBhdGtiZGMwCnBzbTA6IFtHSUFOVC1MT0NLRURdCldBUk5J Tkc6IERldmljZSAicHNtIiBpcyBHaWFudCBsb2NrZWQgYW5kIG1heSBiZSBkZWxldGVkIGJl Zm9yZSBGcmVlQlNEIDE1LjAuCnBzbTA6IG1vZGVsIEludGVsbGlNb3VzZSBFeHBsb3Jlciwg ZGV2aWNlIElEIDQKb3JtMDogPElTQSBPcHRpb24gUk9NPiBhdCBpb21lbSAweGU5MDAwLTB4 ZWZmZmYgcG5waWQgT1JNMDAwMCBvbiBpc2EwCnZnYTA6IDxHZW5lcmljIElTQSBWR0E+IGF0 IHBvcnQgMHgzYzAtMHgzZGYgaW9tZW0gMHhhMDAwMC0weGJmZmZmIHBucGlkIFBOUDA5MDAg b24gaXNhMAphdHRpbWVyMDogPEFUIHRpbWVyPiBhdCBwb3J0IDB4NDAgb24gaXNhMApUaW1l Y291bnRlciAiaTgyNTQiIGZyZXF1ZW5jeSAxMTkzMTgyIEh6IHF1YWxpdHkgMApFdmVudCB0 aW1lciAiaTgyNTQiIGZyZXF1ZW5jeSAxMTkzMTgyIEh6IHF1YWxpdHkgMTAwClRpbWVjb3Vu dGVycyB0aWNrIGV2ZXJ5IDEwLjAwMCBtc2VjCnVnZW4wLjE6IDwoMHgxYjM2KSBYSENJIHJv b3QgSFVCPiBhdCB1c2J1czAKdWh1YjAgb24gdXNidXMwCnVodWIwOiA8KDB4MWIzNikgWEhD SSByb290IEhVQiwgY2xhc3MgOS8wLCByZXYgMy4wMC8xLjAwLCBhZGRyIDE+IG9uIHVzYnVz MApaRlMgZmlsZXN5c3RlbSB2ZXJzaW9uOiA1ClpGUyBzdG9yYWdlIHBvb2wgdmVyc2lvbjog ZmVhdHVyZXMgc3VwcG9ydCAoNTAwMCkKVHJ5aW5nIHRvIG1vdW50IHJvb3QgZnJvbSB6ZnM6 enJvb3QvUk9PVC8yMDI0LTEyLTI2LTE4LTA5IFtdLi4uCmRhMCBhdCB2dHNjc2kwIGJ1cyAw IHNjYnVzMCB0YXJnZXQgMCBsdW4gMApkYTA6IDxRRU1VIFFFTVUgSEFSRERJU0sgMi41Kz4g Rml4ZWQgRGlyZWN0IEFjY2VzcyBTUEMtMyBTQ1NJIGRldmljZQpkYTA6IDMwMC4wMDBNQi9z IHRyYW5zZmVycwpkYTA6IENvbW1hbmQgUXVldWVpbmcgZW5hYmxlZApkYTA6IDczNzI4ME1C ICgxNTA5OTQ5NDQwIDUxMiBieXRlIHNlY3RvcnMpClJvb3QgbW91bnQgd2FpdGluZyBmb3I6 IHVzYnVzMAp1aHViMDogMzAgcG9ydHMgd2l0aCAzMCByZW1vdmFibGUsIHNlbGYgcG93ZXJl ZApHRU9NX0VMSTogRGV2aWNlIGRhMHAyLmVsaSBjcmVhdGVkLgpHRU9NX0VMSTogRW5jcnlw dGlvbjogQUVTLVhUUyAxMjgKR0VPTV9FTEk6ICAgICBDcnlwdG86IGFjY2VsZXJhdGVkIHNv ZnR3YXJlCmljaHNtYjA6IDxJbnRlbCA4MjgwMUkgKElDSDkpIFNNQnVzIGNvbnRyb2xsZXI+ IHBvcnQgMHg3MDAtMHg3M2YgaXJxIDE2IGF0IGRldmljZSAzMS4zIG9uIHBjaTAKc21idXMw OiA8U3lzdGVtIE1hbmFnZW1lbnQgQnVzPiBvbiBpY2hzbWIwCnZ0Y29uMDogPFZpcnRJTyBD b25zb2xlIEFkYXB0ZXI+IG9uIHZpcnRpb19wY2kyCnZ0cm5kMDogPFZpcnRJTyBFbnRyb3B5 IEFkYXB0ZXI+IG9uIHZpcnRpb19wY2k0CnJhbmRvbTogcmVnaXN0ZXJpbmcgZmFzdCBzb3Vy Y2UgVmlydElPIEVudHJvcHkgQWRhcHRlcgpsbzA6IGxpbmsgc3RhdGUgY2hhbmdlZCB0byBV UAp2dG5ldDA6IGxpbmsgc3RhdGUgY2hhbmdlZCB0byBVUApTZWN1cml0eSBwb2xpY3kgbG9h ZGVkOiBNQUMvbnRwZCAobWFjX250cGQpCldhaXRpbmcgKG1heCA2MCBzZWNvbmRzKSBmb3Ig c3lzdGVtIHByb2Nlc3MgYHZubHJ1JyB0byBzdG9wLi4uIGRvbmUKV2FpdGluZyAobWF4IDYw IHNlY29uZHMpIGZvciBzeXN0ZW0gcHJvY2VzcyBgc3luY2VyJyB0byBzdG9wLi4uIApTeW5j aW5nIGRpc2tzLCB2bm9kZXMgcmVtYWluaW5nLi4uIDAgMCBkb25lCkFsbCBidWZmZXJzIHN5 bmNlZC4KR0VPTV9FTEk6IERldmljZSBkYTBwMi5lbGkgZGVzdHJveWVkLgpHRU9NX0VMSTog RGV0YWNoZWQgZGEwcDIuZWxpIG9uIGxhc3QgY2xvc2UuClVwdGltZTogMW0zMHMKdWh1YjA6 IGRldGFjaGVkCi0tLTw8Qk9PVD4+LS0tCkNvcHlyaWdodCAoYykgMTk5Mi0yMDI0IFRoZSBG cmVlQlNEIFByb2plY3QuCkNvcHlyaWdodCAoYykgMTk3OSwgMTk4MCwgMTk4MywgMTk4Niwg MTk4OCwgMTk4OSwgMTk5MSwgMTk5MiwgMTk5MywgMTk5NAoJVGhlIFJlZ2VudHMgb2YgdGhl IFVuaXZlcnNpdHkgb2YgQ2FsaWZvcm5pYS4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KRnJlZUJT RCBpcyBhIHJlZ2lzdGVyZWQgdHJhZGVtYXJrIG9mIFRoZSBGcmVlQlNEIEZvdW5kYXRpb24u CkZyZWVCU0QgMTUuMC1DVVJSRU5UICMyMyBuMjc0MTgzLWJhMTkwNDkzN2Q5OiBUaHUgRGVj IDI2IDE4OjE0OjAzIC0wMyAyMDI0CiAgICByb290QGlkYWhvLmFycmFraXMuY29tLmJyOi91 c3Ivb2JqL3Vzci9zcmMvYW1kNjQuYW1kNjQvc3lzL0dFTkVSSUMtTk9ERUJVRyBhbWQ2NApG cmVlQlNEIGNsYW5nIHZlcnNpb24gMTkuMS41IChodHRwczovL2dpdGh1Yi5jb20vbGx2bS9s bHZtLXByb2plY3QuZ2l0IGxsdm1vcmctMTkuMS41LTAtZ2FiNGI1YTJkYjU4MikKVlQodmdh KTogdGV4dCA4MHgyNQpDUFU6IEludGVsKFIpIFhlb24oUikgQ1BVIEU1LTI2OTcgdjMgQCAy LjYwR0h6ICgyNjAwLjE1LU1IeiBLOC1jbGFzcyBDUFUpCiAgT3JpZ2luPSJHZW51aW5lSW50 ZWwiICBJZD0weDMwNmYyICBGYW1pbHk9MHg2ICBNb2RlbD0weDNmICBTdGVwcGluZz0yCiAg RmVhdHVyZXM9MHhmODNmYmZmPEZQVSxWTUUsREUsUFNFLFRTQyxNU1IsUEFFLE1DRSxDWDgs QVBJQyxTRVAsTVRSUixQR0UsTUNBLENNT1YsUEFULFBTRTM2LE1NWCxGWFNSLFNTRSxTU0Uy LFNTPgogIEZlYXR1cmVzMj0weGZmZmEzMjAzPFNTRTMsUENMTVVMUURRLFNTU0UzLEZNQSxD WDE2LFBDSUQsU1NFNC4xLFNTRTQuMix4MkFQSUMsTU9WQkUsUE9QQ05ULFRTQ0RMVCxBRVNO SSxYU0FWRSxPU1hTQVZFLEFWWCxGMTZDLFJEUkFORCxIVj4KICBBTUQgRmVhdHVyZXM9MHgy YzEwMDgwMDxTWVNDQUxMLE5YLFBhZ2UxR0IsUkRUU0NQLExNPgogIEFNRCBGZWF0dXJlczI9 MHgyMTxMQUhGLEFCTT4KICBTdHJ1Y3R1cmVkIEV4dGVuZGVkIEZlYXR1cmVzPTB4N2FiPEZT R1NCQVNFLFRTQ0FESixCTUkxLEFWWDIsU01FUCxCTUkyLEVSTVMsSU5WUENJRD4KICBTdHJ1 Y3R1cmVkIEV4dGVuZGVkIEZlYXR1cmVzMj0weDQ8VU1JUD4KICBTdHJ1Y3R1cmVkIEV4dGVu ZGVkIEZlYXR1cmVzMz0weGFjMDAwNDAwPE1EX0NMRUFSLElCUEIsU1RJQlAsQVJDSF9DQVAs U1NCRD4KICBYU0FWRSBGZWF0dXJlcz0weDE8WFNBVkVPUFQ+CiAgSUEzMl9BUkNIX0NBUFM9 MHg0ODxTS0lQX0wxREZMX1ZNRT4KICBBTUQgRXh0ZW5kZWQgRmVhdHVyZSBFeHRlbnNpb25z IElEIEVCWD0weDEwMGQwMDA8SUJQQixJQlJTLFNUSUJQLFNTQkQ+Ckh5cGVydmlzb3I6IE9y aWdpbiA9ICJLVk1LVk1LVk0iCnJlYWwgbWVtb3J5ICA9IDUxNTM5NjA3NTUyICg0OTE1MiBN QikKYXZhaWwgbWVtb3J5ID0gNTAwNjc4MDQxNjAgKDQ3NzQ4IE1CKQpFdmVudCB0aW1lciAi TEFQSUMiIHF1YWxpdHkgNjAwCkFDUEkgQVBJQyBUYWJsZTogPEJPQ0hTICBCWFBDICAgID4K RnJlZUJTRC9TTVA6IE11bHRpcHJvY2Vzc29yIFN5c3RlbSBEZXRlY3RlZDogMTIgQ1BVcwpG cmVlQlNEL1NNUDogMTIgcGFja2FnZShzKSB4IDEgY29yZShzKQpyYW5kb206IHJlZ2lzdGVy aW5nIGZhc3Qgc291cmNlIEludGVsIFNlY3VyZSBLZXkgUk5HCnJhbmRvbTogZmFzdCBwcm92 aWRlcjogIkludGVsIFNlY3VyZSBLZXkgUk5HIgpyYW5kb206IHVuYmxvY2tpbmcgZGV2aWNl Lgppb2FwaWMwIDxWZXJzaW9uIDEuMT4gaXJxcyAwLTIzCkxhdW5jaGluZyBBUHM6IDEgNCA2 IDIgNyA5IDMgMTEgOCA1IDEwCnJhbmRvbTogZW50cm9weSBkZXZpY2UgZXh0ZXJuYWwgaW50 ZXJmYWNlCmtiZDEgYXQga2JkbXV4MAp2dHZnYTA6IDxWVCBWR0EgZHJpdmVyPgprdm1jbG9j azA6IDxLVk0gcGFyYXZpcnR1YWwgY2xvY2s+ClRpbWVjb3VudGVyICJrdm1jbG9jayIgZnJl cXVlbmN5IDEwMDAwMDAwMDAgSHogcXVhbGl0eSA5NzUKa3ZtY2xvY2swOiByZWdpc3RlcmVk IGFzIGEgdGltZS1vZi1kYXkgY2xvY2ssIHJlc29sdXRpb24gMC4wMDAwMDFzCnNtYmlvczA6 IDxTeXN0ZW0gTWFuYWdlbWVudCBCSU9TPiBhdCBpb21lbSAweGY1YTUwLTB4ZjVhNmUKc21i aW9zMDogVmVyc2lvbjogMi44LCBCQ0QgUmV2aXNpb246IDIuOAphZXNuaTA6IDxBRVMtQ0JD LEFFUy1DQ00sQUVTLUdDTSxBRVMtSUNNLEFFUy1YVFM+CmFjcGkwOiA8Qk9DSFMgQlhQQz4K YWNwaTA6IFBvd2VyIEJ1dHRvbiAoZml4ZWQpCmNwdTA6IDxBQ1BJIENQVT4gb24gYWNwaTAK YXRydGMwOiA8QVQgcmVhbHRpbWUgY2xvY2s+IHBvcnQgMHg3MC0weDc3IGlycSA4IG9uIGFj cGkwCmF0cnRjMDogcmVnaXN0ZXJlZCBhcyBhIHRpbWUtb2YtZGF5IGNsb2NrLCByZXNvbHV0 aW9uIDEuMDAwMDAwcwpFdmVudCB0aW1lciAiUlRDIiBmcmVxdWVuY3kgMzI3NjggSHogcXVh bGl0eSAwClRpbWVjb3VudGVyICJBQ1BJLWZhc3QiIGZyZXF1ZW5jeSAzNTc5NTQ1IEh6IHF1 YWxpdHkgOTAwCmFjcGlfdGltZXIwOiA8MjQtYml0IHRpbWVyIGF0IDMuNTc5NTQ1TUh6PiBw b3J0IDB4NjA4LTB4NjBiIG9uIGFjcGkwCnBjaWIwOiA8QUNQSSBIb3N0LVBDSSBicmlkZ2U+ IHBvcnQgMHhjZjgtMHhjZmYgb24gYWNwaTAKcGNpMDogPEFDUEkgUENJIGJ1cz4gb24gcGNp YjAKdmdhcGNpMDogPFZHQS1jb21wYXRpYmxlIGRpc3BsYXk+IHBvcnQgMHhkMDQwLTB4ZDA1 ZiBtZW0gMHhmNDAwMDAwMC0weGY3ZmZmZmZmLDB4ZjgwMDAwMDAtMHhmYmZmZmZmZiwweGZk MjEwMDAwLTB4ZmQyMTFmZmYgaXJxIDIxIGF0IGRldmljZSAxLjAgb24gcGNpMAp2Z2FwY2kw OiBCb290IHZpZGVvIGRldmljZQpwY2liMTogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAw eGZkMjEyMDAwLTB4ZmQyMTJmZmYgaXJxIDIyIGF0IGRldmljZSAyLjAgb24gcGNpMApwY2li MjogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjEzMDAwLTB4ZmQyMTNmZmYgaXJx IDIyIGF0IGRldmljZSAyLjEgb24gcGNpMApwY2liMzogPEFDUEkgUENJLVBDSSBicmlkZ2U+ IG1lbSAweGZkMjE0MDAwLTB4ZmQyMTRmZmYgaXJxIDIyIGF0IGRldmljZSAyLjIgb24gcGNp MApwY2liNDogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjE1MDAwLTB4ZmQyMTVm ZmYgaXJxIDIyIGF0IGRldmljZSAyLjMgb24gcGNpMApwY2liNTogPEFDUEkgUENJLVBDSSBi cmlkZ2U+IG1lbSAweGZkMjE2MDAwLTB4ZmQyMTZmZmYgaXJxIDIyIGF0IGRldmljZSAyLjQg b24gcGNpMApwY2liNjogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjE3MDAwLTB4 ZmQyMTdmZmYgaXJxIDIyIGF0IGRldmljZSAyLjUgb24gcGNpMApwY2liNzogPEFDUEkgUENJ LVBDSSBicmlkZ2U+IG1lbSAweGZkMjE4MDAwLTB4ZmQyMThmZmYgaXJxIDIyIGF0IGRldmlj ZSAyLjYgb24gcGNpMApwY2liODogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjE5 MDAwLTB4ZmQyMTlmZmYgaXJxIDIyIGF0IGRldmljZSAyLjcgb24gcGNpMAppc2FiMDogPFBD SS1JU0EgYnJpZGdlPiBhdCBkZXZpY2UgMzEuMCBvbiBwY2kwCmlzYTA6IDxJU0EgYnVzPiBv biBpc2FiMAphaGNpMDogPEludGVsIElDSDkgQUhDSSBTQVRBIGNvbnRyb2xsZXI+IHBvcnQg MHhkMDYwLTB4ZDA3ZiBtZW0gMHhmZDIxYTAwMC0weGZkMjFhZmZmIGlycSAxNiBhdCBkZXZp Y2UgMzEuMiBvbiBwY2kwCmFoY2kwOiBBSENJIHYxLjAwIHdpdGggNiAxLjVHYnBzIHBvcnRz LCBQb3J0IE11bHRpcGxpZXIgbm90IHN1cHBvcnRlZAphaGNpY2gwOiA8QUhDSSBjaGFubmVs PiBhdCBjaGFubmVsIDAgb24gYWhjaTAKYWhjaWNoMTogPEFIQ0kgY2hhbm5lbD4gYXQgY2hh bm5lbCAxIG9uIGFoY2kwCmFoY2ljaDI6IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgMiBv biBhaGNpMAphaGNpY2gzOiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDMgb24gYWhjaTAK YWhjaWNoNDogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5lbCA0IG9uIGFoY2kwCmFoY2ljaDU6 IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgNSBvbiBhaGNpMAphY3BpX3N5c2NvbnRhaW5l cjA6IDxTeXN0ZW0gQ29udGFpbmVyPiBvbiBhY3BpMAphY3BpX3N5c2NvbnRhaW5lcjE6IDxT eXN0ZW0gQ29udGFpbmVyPiBwb3J0IDB4Y2Q4LTB4Y2UzIG9uIGFjcGkwCmFjcGlfc3lzY29u dGFpbmVyMjogPFN5c3RlbSBDb250YWluZXI+IHBvcnQgMHg2MjAtMHg2MmYgb24gYWNwaTAK YWNwaV9zeXNjb250YWluZXIzOiA8U3lzdGVtIENvbnRhaW5lcj4gcG9ydCAweGNjMC0weGNk NyBvbiBhY3BpMAp1YXJ0MDogPDE2NTUwIG9yIGNvbXBhdGlibGU+IHBvcnQgMHgzZjgtMHgz ZmYgaXJxIDQgZmxhZ3MgMHgxMCBvbiBhY3BpMAphdGtiZGMwOiA8S2V5Ym9hcmQgY29udHJv bGxlciAoaTgwNDIpPiBwb3J0IDB4NjAsMHg2NCBpcnEgMSBvbiBhY3BpMAphdGtiZDA6IDxB VCBLZXlib2FyZD4gaXJxIDEgb24gYXRrYmRjMAprYmQwIGF0IGF0a2JkMAphdGtiZDA6IFtH SUFOVC1MT0NLRURdCnBzbTA6IDxQUy8yIE1vdXNlPiBpcnEgMTIgb24gYXRrYmRjMApwc20w OiBbR0lBTlQtTE9DS0VEXQpXQVJOSU5HOiBEZXZpY2UgInBzbSIgaXMgR2lhbnQgbG9ja2Vk IGFuZCBtYXkgYmUgZGVsZXRlZCBiZWZvcmUgRnJlZUJTRCAxNS4wLgpwc20wOiBtb2RlbCBJ bnRlbGxpTW91c2UgRXhwbG9yZXIsIGRldmljZSBJRCA0Cm9ybTA6IDxJU0EgT3B0aW9uIFJP TT4gYXQgaW9tZW0gMHhlOTAwMC0weGVmZmZmIHBucGlkIE9STTAwMDAgb24gaXNhMAp2Z2Ew OiA8R2VuZXJpYyBJU0EgVkdBPiBhdCBwb3J0IDB4M2MwLTB4M2RmIGlvbWVtIDB4YTAwMDAt MHhiZmZmZiBwbnBpZCBQTlAwOTAwIG9uIGlzYTAKYXR0aW1lcjA6IDxBVCB0aW1lcj4gYXQg cG9ydCAweDQwIG9uIGlzYTAKVGltZWNvdW50ZXIgImk4MjU0IiBmcmVxdWVuY3kgMTE5MzE4 MiBIeiBxdWFsaXR5IDAKRXZlbnQgdGltZXIgImk4MjU0IiBmcmVxdWVuY3kgMTE5MzE4MiBI eiBxdWFsaXR5IDEwMApUaW1lY291bnRlcnMgdGljayBldmVyeSAxMC4wMDAgbXNlYwpaRlMg ZmlsZXN5c3RlbSB2ZXJzaW9uOiA1ClpGUyBzdG9yYWdlIHBvb2wgdmVyc2lvbjogZmVhdHVy ZXMgc3VwcG9ydCAoNTAwMCkKVHJ5aW5nIHRvIG1vdW50IHJvb3QgZnJvbSB6ZnM6enJvb3Qv Uk9PVC8yMDI0LTEyLTI2LTE4LTEzIFtdLi4uClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZp bmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKTW91bnRpbmcgZnJvbSB6ZnM6enJvb3Qv Uk9PVC8yMDI0LTEyLTI2LTE4LTEzIGZhaWxlZCB3aXRoIGVycm9yIDU7IHJldHJ5aW5nIGZv ciAzIG1vcmUgc2Vjb25kcwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29s IGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBv b2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUg cG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRo ZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQg dGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmlu ZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBm aW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90 IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5u b3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENh bm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTog Q2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNF OiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJ Q0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5P VElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczog Tk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlz OiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFy aXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29s YXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpT b2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3Qn ClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9v dCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3py b290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAn enJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9y ICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBm b3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVs IGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFi ZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBs YWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29s IGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBv b2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUg cG9vbCBsYWJlbCBmb3IgJ3pyb290JwpNb3VudGluZyBmcm9tIHpmczp6cm9vdC9ST09ULzIw MjQtMTItMjYtMTgtMTMgZmFpbGVkIHdpdGggZXJyb3IgNS4KCkxvYWRlciB2YXJpYWJsZXM6 CiAgdmZzLnJvb3QubW91bnRmcm9tPXpmczp6cm9vdC9ST09ULzIwMjQtMTItMjYtMTgtMTMK Ck1hbnVhbCByb290IGZpbGVzeXN0ZW0gc3BlY2lmaWNhdGlvbjoKICA8ZnN0eXBlPjo8ZGV2 aWNlPiBbb3B0aW9uc10KICAgICAgTW91bnQgPGRldmljZT4gdXNpbmcgZmlsZXN5c3RlbSA8 ZnN0eXBlPgogICAgICBhbmQgd2l0aCB0aGUgc3BlY2lmaWVkIChvcHRpb25hbCkgb3B0aW9u IGxpc3QuCgogICAgZWcuIHVmczovZGV2L2RhMHMxYQogICAgICAgIHpmczp6cm9vdC9ST09U L2RlZmF1bHQKICAgICAgICBjZDk2NjA6L2Rldi9jZDAgcm8KICAgICAgICAgICh3aGljaCBp cyBlcXVpdmFsZW50IHRvOiBtb3VudCAtdCBjZDk2NjAgLW8gcm8gL2Rldi9jZDAgLykKCiAg PyAgICAgICAgICAgICAgIExpc3QgdmFsaWQgZGlzayBib290IGRldmljZXMKICAuICAgICAg ICAgICAgICAgWWllbGQgMSBzZWNvbmQgKGZvciBiYWNrZ3JvdW5kIHRhc2tzKQogIDxlbXB0 eSBsaW5lPiAgICBBYm9ydCBtYW51YWwgaW5wdXQKCm1vdW50cm9vdD4gcGFuaWM6IG1vdW50 cm9vdDogdW5hYmxlIHRvIChyZS0pbW91bnQgcm9vdC4KY3B1aWQgPSA2CnRpbWUgPSA3CktE Qjogc3RhY2sgYmFja3RyYWNlOgpkYl90cmFjZV9zZWxmX3dyYXBwZXIoKSBhdCBkYl90cmFj ZV9zZWxmX3dyYXBwZXIrMHgyYi9mcmFtZSAweGZmZmZmZTAxMmY2MDViNjAKdnBhbmljKCkg YXQgdnBhbmljKzB4MTM2L2ZyYW1lIDB4ZmZmZmZlMDEyZjYwNWM5MApwYW5pYygpIGF0IHBh bmljKzB4NDMvZnJhbWUgMHhmZmZmZmUwMTJmNjA1Y2YwCnZmc19tb3VudHJvb3QoKSBhdCB2 ZnNfbW91bnRyb290KzB4MWNiYy9mcmFtZSAweGZmZmZmZTAxMmY2MDVlNjAKc3RhcnRfaW5p dCgpIGF0IHN0YXJ0X2luaXQrMHgyMy9mcmFtZSAweGZmZmZmZTAxMmY2MDVlZjAKZm9ya19l eGl0KCkgYXQgZm9ya19leGl0KzB4N2IvZnJhbWUgMHhmZmZmZmUwMTJmNjA1ZjMwCmZvcmtf dHJhbXBvbGluZSgpIGF0IGZvcmtfdHJhbXBvbGluZSsweGUvZnJhbWUgMHhmZmZmZmUwMTJm NjA1ZjMwCi0tLSB0cmFwIDB4Mzk4MjgzOCwgcmlwID0gMHhmZmZmZmZmZjgwMzhhNmQ4LCBy c3AgPSAweGZmZmZmODAxMDI5MDIwMDAsIHJicCA9IDB4ZmZmZmZmZmY4MDk3ODEyMCAtLS0K eHB0X2FjdGlvbl9kZWZhdWx0KCkgYXQgeHB0X2FjdGlvbl9kZWZhdWx0KzB4M2Q4L2ZyYW1l IDB4ZmZmZmZmZmY4MDk3ODEyMApLREI6IGVudGVyOiBwYW5pYwotLS08PEJPT1Q+Pi0tLQpD b3B5cmlnaHQgKGMpIDE5OTItMjAyNCBUaGUgRnJlZUJTRCBQcm9qZWN0LgpDb3B5cmlnaHQg KGMpIDE5NzksIDE5ODAsIDE5ODMsIDE5ODYsIDE5ODgsIDE5ODksIDE5OTEsIDE5OTIsIDE5 OTMsIDE5OTQKCVRoZSBSZWdlbnRzIG9mIHRoZSBVbml2ZXJzaXR5IG9mIENhbGlmb3JuaWEu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCkZyZWVCU0QgaXMgYSByZWdpc3RlcmVkIHRyYWRlbWFy ayBvZiBUaGUgRnJlZUJTRCBGb3VuZGF0aW9uLgpGcmVlQlNEIDE1LjAtQ1VSUkVOVCAjMjIg bjI3NDE4Mi05MzhlNGIxMzFjNDogVGh1IERlYyAyNiAxODoxMDoxMiAtMDMgMjAyNAogICAg cm9vdEBpZGFoby5hcnJha2lzLmNvbS5icjovdXNyL29iai91c3Ivc3JjL2FtZDY0LmFtZDY0 L3N5cy9HRU5FUklDLU5PREVCVUcgYW1kNjQKRnJlZUJTRCBjbGFuZyB2ZXJzaW9uIDE5LjEu NSAoaHR0cHM6Ly9naXRodWIuY29tL2xsdm0vbGx2bS1wcm9qZWN0LmdpdCBsbHZtb3JnLTE5 LjEuNS0wLWdhYjRiNWEyZGI1ODIpClZUKHZnYSk6IHRleHQgODB4MjUKQ1BVOiBJbnRlbChS KSBYZW9uKFIpIENQVSBFNS0yNjk3IHYzIEAgMi42MEdIeiAoMjYwMC4xOC1NSHogSzgtY2xh c3MgQ1BVKQogIE9yaWdpbj0iR2VudWluZUludGVsIiAgSWQ9MHgzMDZmMiAgRmFtaWx5PTB4 NiAgTW9kZWw9MHgzZiAgU3RlcHBpbmc9MgogIEZlYXR1cmVzPTB4ZjgzZmJmZjxGUFUsVk1F LERFLFBTRSxUU0MsTVNSLFBBRSxNQ0UsQ1g4LEFQSUMsU0VQLE1UUlIsUEdFLE1DQSxDTU9W LFBBVCxQU0UzNixNTVgsRlhTUixTU0UsU1NFMixTUz4KICBGZWF0dXJlczI9MHhmZmZhMzIw MzxTU0UzLFBDTE1VTFFEUSxTU1NFMyxGTUEsQ1gxNixQQ0lELFNTRTQuMSxTU0U0LjIseDJB UElDLE1PVkJFLFBPUENOVCxUU0NETFQsQUVTTkksWFNBVkUsT1NYU0FWRSxBVlgsRjE2QyxS RFJBTkQsSFY+CiAgQU1EIEZlYXR1cmVzPTB4MmMxMDA4MDA8U1lTQ0FMTCxOWCxQYWdlMUdC LFJEVFNDUCxMTT4KICBBTUQgRmVhdHVyZXMyPTB4MjE8TEFIRixBQk0+CiAgU3RydWN0dXJl ZCBFeHRlbmRlZCBGZWF0dXJlcz0weDdhYjxGU0dTQkFTRSxUU0NBREosQk1JMSxBVlgyLFNN RVAsQk1JMixFUk1TLElOVlBDSUQ+CiAgU3RydWN0dXJlZCBFeHRlbmRlZCBGZWF0dXJlczI9 MHg0PFVNSVA+CiAgU3RydWN0dXJlZCBFeHRlbmRlZCBGZWF0dXJlczM9MHhhYzAwMDQwMDxN RF9DTEVBUixJQlBCLFNUSUJQLEFSQ0hfQ0FQLFNTQkQ+CiAgWFNBVkUgRmVhdHVyZXM9MHgx PFhTQVZFT1BUPgogIElBMzJfQVJDSF9DQVBTPTB4NDg8U0tJUF9MMURGTF9WTUU+CiAgQU1E IEV4dGVuZGVkIEZlYXR1cmUgRXh0ZW5zaW9ucyBJRCBFQlg9MHgxMDBkMDAwPElCUEIsSUJS UyxTVElCUCxTU0JEPgpIeXBlcnZpc29yOiBPcmlnaW4gPSAiS1ZNS1ZNS1ZNIgpyZWFsIG1l bW9yeSAgPSA1MTUzOTYwNzU1MiAoNDkxNTIgTUIpCmF2YWlsIG1lbW9yeSA9IDUwMDY3ODAw MDY0ICg0Nzc0OCBNQikKRXZlbnQgdGltZXIgIkxBUElDIiBxdWFsaXR5IDYwMApBQ1BJIEFQ SUMgVGFibGU6IDxCT0NIUyAgQlhQQyAgICA+CkZyZWVCU0QvU01QOiBNdWx0aXByb2Nlc3Nv ciBTeXN0ZW0gRGV0ZWN0ZWQ6IDEyIENQVXMKRnJlZUJTRC9TTVA6IDEyIHBhY2thZ2Uocykg eCAxIGNvcmUocykKcmFuZG9tOiByZWdpc3RlcmluZyBmYXN0IHNvdXJjZSBJbnRlbCBTZWN1 cmUgS2V5IFJORwpyYW5kb206IGZhc3QgcHJvdmlkZXI6ICJJbnRlbCBTZWN1cmUgS2V5IFJO RyIKcmFuZG9tOiB1bmJsb2NraW5nIGRldmljZS4KaW9hcGljMCA8VmVyc2lvbiAxLjE+IGly cXMgMC0yMwpMYXVuY2hpbmcgQVBzOiAxMCA1IDkgNiA3IDQgOCAxMSAzIDIgMQpyYW5kb206 IGVudHJvcHkgZGV2aWNlIGV4dGVybmFsIGludGVyZmFjZQprYmQxIGF0IGtiZG11eDAKdnR2 Z2EwOiA8VlQgVkdBIGRyaXZlcj4Ka3ZtY2xvY2swOiA8S1ZNIHBhcmF2aXJ0dWFsIGNsb2Nr PgpUaW1lY291bnRlciAia3ZtY2xvY2siIGZyZXF1ZW5jeSAxMDAwMDAwMDAwIEh6IHF1YWxp dHkgOTc1Cmt2bWNsb2NrMDogcmVnaXN0ZXJlZCBhcyBhIHRpbWUtb2YtZGF5IGNsb2NrLCBy ZXNvbHV0aW9uIDAuMDAwMDAxcwpzbWJpb3MwOiA8U3lzdGVtIE1hbmFnZW1lbnQgQklPUz4g YXQgaW9tZW0gMHhmNWE1MC0weGY1YTZlCnNtYmlvczA6IFZlcnNpb246IDIuOCwgQkNEIFJl dmlzaW9uOiAyLjgKYWVzbmkwOiA8QUVTLUNCQyxBRVMtQ0NNLEFFUy1HQ00sQUVTLUlDTSxB RVMtWFRTPgphY3BpMDogPEJPQ0hTIEJYUEM+CmFjcGkwOiBQb3dlciBCdXR0b24gKGZpeGVk KQpjcHUwOiA8QUNQSSBDUFU+IG9uIGFjcGkwCmF0cnRjMDogPEFUIHJlYWx0aW1lIGNsb2Nr PiBwb3J0IDB4NzAtMHg3NyBpcnEgOCBvbiBhY3BpMAphdHJ0YzA6IHJlZ2lzdGVyZWQgYXMg YSB0aW1lLW9mLWRheSBjbG9jaywgcmVzb2x1dGlvbiAxLjAwMDAwMHMKRXZlbnQgdGltZXIg IlJUQyIgZnJlcXVlbmN5IDMyNzY4IEh6IHF1YWxpdHkgMApUaW1lY291bnRlciAiQUNQSS1m YXN0IiBmcmVxdWVuY3kgMzU3OTU0NSBIeiBxdWFsaXR5IDkwMAphY3BpX3RpbWVyMDogPDI0 LWJpdCB0aW1lciBhdCAzLjU3OTU0NU1Iej4gcG9ydCAweDYwOC0weDYwYiBvbiBhY3BpMApw Y2liMDogPEFDUEkgSG9zdC1QQ0kgYnJpZGdlPiBwb3J0IDB4Y2Y4LTB4Y2ZmIG9uIGFjcGkw CnBjaTA6IDxBQ1BJIFBDSSBidXM+IG9uIHBjaWIwCnZnYXBjaTA6IDxWR0EtY29tcGF0aWJs ZSBkaXNwbGF5PiBwb3J0IDB4ZDA0MC0weGQwNWYgbWVtIDB4ZjQwMDAwMDAtMHhmN2ZmZmZm ZiwweGY4MDAwMDAwLTB4ZmJmZmZmZmYsMHhmZDIxMDAwMC0weGZkMjExZmZmIGlycSAyMSBh dCBkZXZpY2UgMS4wIG9uIHBjaTAKdmdhcGNpMDogQm9vdCB2aWRlbyBkZXZpY2UKcGNpYjE6 IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxMjAwMC0weGZkMjEyZmZmIGlycSAy MiBhdCBkZXZpY2UgMi4wIG9uIHBjaTAKcGNpMTogPEFDUEkgUENJIGJ1cz4gb24gcGNpYjEK cGNpYjI6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmYzIwMDAwMC0weGZjMjAwMGZm IGlycSAyMiBhdCBkZXZpY2UgMC4wIG9uIHBjaTEKcGNpMjogPEFDUEkgUENJIGJ1cz4gb24g cGNpYjIKcGNpYjM6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxMzAwMC0weGZk MjEzZmZmIGlycSAyMiBhdCBkZXZpY2UgMi4xIG9uIHBjaTAKcGNpMzogPEFDUEkgUENJIGJ1 cz4gb24gcGNpYjMKdmlydGlvX3BjaTA6IDxWaXJ0SU8gUENJIChtb2Rlcm4pIE5ldHdvcmsg YWRhcHRlcj4gbWVtIDB4ZmQwNDAwMDAtMHhmZDA0MGZmZiwweGZlODAwMDAwLTB4ZmU4MDNm ZmYgaXJxIDIyIGF0IGRldmljZSAwLjAgb24gcGNpMwp2dG5ldDA6IDxWaXJ0SU8gTmV0d29y a2luZyBBZGFwdGVyPiBvbiB2aXJ0aW9fcGNpMAp2dG5ldDA6IEV0aGVybmV0IGFkZHJlc3M6 IDUyOjU0OjU4OjkzOmM3OmVmCnZ0bmV0MDogbmV0bWFwIHF1ZXVlcy9zbG90czogVFggMS8y NTYsIFJYIDEvMTI4CjAwMC4wMDAwNzcgWyA0NTJdIHZ0bmV0X25ldG1hcF9hdHRhY2ggICAg ICAgdnRuZXQgYXR0YWNoZWQgdHhxPTEsIHR4ZD0yNTYgcnhxPTEsIHJ4ZD0xMjgKcGNpYjQ6 IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxNDAwMC0weGZkMjE0ZmZmIGlycSAy MiBhdCBkZXZpY2UgMi4yIG9uIHBjaTAKcGNpNDogPEFDUEkgUENJIGJ1cz4gb24gcGNpYjQK eGhjaTA6IDxYSENJIChnZW5lcmljKSBVU0IgMy4wIGNvbnRyb2xsZXI+IG1lbSAweGZjZTAw MDAwLTB4ZmNlMDNmZmYgaXJxIDIyIGF0IGRldmljZSAwLjAgb24gcGNpNAp4aGNpMDogMzIg Ynl0ZXMgY29udGV4dCBzaXplLCA2NC1iaXQgRE1BCnVzYnVzMCBvbiB4aGNpMAp1c2J1czA6 IDUuMEdicHMgU3VwZXIgU3BlZWQgVVNCIHYzLjAKcGNpYjU6IDxBQ1BJIFBDSS1QQ0kgYnJp ZGdlPiBtZW0gMHhmZDIxNTAwMC0weGZkMjE1ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi4zIG9u IHBjaTAKcGNpNTogPEFDUEkgUENJIGJ1cz4gb24gcGNpYjUKdmlydGlvX3BjaTE6IDxWaXJ0 SU8gUENJIChtb2Rlcm4pIFNDU0kgYWRhcHRlcj4gbWVtIDB4ZmNjMDAwMDAtMHhmY2MwMGZm ZiwweGZlNDAwMDAwLTB4ZmU0MDNmZmYgaXJxIDIyIGF0IGRldmljZSAwLjAgb24gcGNpNQp2 dHNjc2kwOiA8VmlydElPIFNDU0kgQWRhcHRlcj4gb24gdmlydGlvX3BjaTEKcGNpYjY6IDxB Q1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxNjAwMC0weGZkMjE2ZmZmIGlycSAyMiBh dCBkZXZpY2UgMi40IG9uIHBjaTAKcGNpNjogPEFDUEkgUENJIGJ1cz4gb24gcGNpYjYKdmly dGlvX3BjaTI6IDxWaXJ0SU8gUENJIChtb2Rlcm4pIENvbnNvbGUgYWRhcHRlcj4gbWVtIDB4 ZmNhMDAwMDAtMHhmY2EwMGZmZiwweGZlMjAwMDAwLTB4ZmUyMDNmZmYgaXJxIDIyIGF0IGRl dmljZSAwLjAgb24gcGNpNgpwY2liNzogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZk MjE3MDAwLTB4ZmQyMTdmZmYgaXJxIDIyIGF0IGRldmljZSAyLjUgb24gcGNpMApwY2k3OiA8 QUNQSSBQQ0kgYnVzPiBvbiBwY2liNwp2aXJ0aW9fcGNpMzogPFZpcnRJTyBQQ0kgKG1vZGVy bikgQmFsbG9vbiBhZGFwdGVyPiBtZW0gMHhmZTAwMDAwMC0weGZlMDAzZmZmIGlycSAyMiBh dCBkZXZpY2UgMC4wIG9uIHBjaTcKdnRiYWxsb29uMDogPFZpcnRJTyBCYWxsb29uIEFkYXB0 ZXI+IG9uIHZpcnRpb19wY2kzCnBjaWI4OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4 ZmQyMTgwMDAtMHhmZDIxOGZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNiBvbiBwY2kwCnBjaTg6 IDxBQ1BJIFBDSSBidXM+IG9uIHBjaWI4CnZpcnRpb19wY2k0OiA8VmlydElPIFBDSSAobW9k ZXJuKSBFbnRyb3B5IGFkYXB0ZXI+IG1lbSAweGZkZTAwMDAwLTB4ZmRlMDNmZmYgaXJxIDIy IGF0IGRldmljZSAwLjAgb24gcGNpOApwY2liOTogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1l bSAweGZkMjE5MDAwLTB4ZmQyMTlmZmYgaXJxIDIyIGF0IGRldmljZSAyLjcgb24gcGNpMApw Y2k5OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liOQppc2FiMDogPFBDSS1JU0EgYnJpZGdlPiBh dCBkZXZpY2UgMzEuMCBvbiBwY2kwCmlzYTA6IDxJU0EgYnVzPiBvbiBpc2FiMAphaGNpMDog PEludGVsIElDSDkgQUhDSSBTQVRBIGNvbnRyb2xsZXI+IHBvcnQgMHhkMDYwLTB4ZDA3ZiBt ZW0gMHhmZDIxYTAwMC0weGZkMjFhZmZmIGlycSAxNiBhdCBkZXZpY2UgMzEuMiBvbiBwY2kw CmFoY2kwOiBBSENJIHYxLjAwIHdpdGggNiAxLjVHYnBzIHBvcnRzLCBQb3J0IE11bHRpcGxp ZXIgbm90IHN1cHBvcnRlZAphaGNpY2gwOiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDAg b24gYWhjaTAKYWhjaWNoMTogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5lbCAxIG9uIGFoY2kw CmFoY2ljaDI6IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgMiBvbiBhaGNpMAphaGNpY2gz OiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDMgb24gYWhjaTAKYWhjaWNoNDogPEFIQ0kg Y2hhbm5lbD4gYXQgY2hhbm5lbCA0IG9uIGFoY2kwCmFoY2ljaDU6IDxBSENJIGNoYW5uZWw+ IGF0IGNoYW5uZWwgNSBvbiBhaGNpMAphY3BpX3N5c2NvbnRhaW5lcjA6IDxTeXN0ZW0gQ29u dGFpbmVyPiBvbiBhY3BpMAphY3BpX3N5c2NvbnRhaW5lcjE6IDxTeXN0ZW0gQ29udGFpbmVy PiBwb3J0IDB4Y2Q4LTB4Y2UzIG9uIGFjcGkwCmFjcGlfc3lzY29udGFpbmVyMjogPFN5c3Rl bSBDb250YWluZXI+IHBvcnQgMHg2MjAtMHg2MmYgb24gYWNwaTAKYWNwaV9zeXNjb250YWlu ZXIzOiA8U3lzdGVtIENvbnRhaW5lcj4gcG9ydCAweGNjMC0weGNkNyBvbiBhY3BpMAp1YXJ0 MDogPDE2NTUwIG9yIGNvbXBhdGlibGU+IHBvcnQgMHgzZjgtMHgzZmYgaXJxIDQgZmxhZ3Mg MHgxMCBvbiBhY3BpMAphdGtiZGMwOiA8S2V5Ym9hcmQgY29udHJvbGxlciAoaTgwNDIpPiBw b3J0IDB4NjAsMHg2NCBpcnEgMSBvbiBhY3BpMAphdGtiZDA6IDxBVCBLZXlib2FyZD4gaXJx IDEgb24gYXRrYmRjMAprYmQwIGF0IGF0a2JkMAphdGtiZDA6IFtHSUFOVC1MT0NLRURdCnBz bTA6IDxQUy8yIE1vdXNlPiBpcnEgMTIgb24gYXRrYmRjMApwc20wOiBbR0lBTlQtTE9DS0VE XQpXQVJOSU5HOiBEZXZpY2UgInBzbSIgaXMgR2lhbnQgbG9ja2VkIGFuZCBtYXkgYmUgZGVs ZXRlZCBiZWZvcmUgRnJlZUJTRCAxNS4wLgpwc20wOiBtb2RlbCBJbnRlbGxpTW91c2UgRXhw bG9yZXIsIGRldmljZSBJRCA0Cm9ybTA6IDxJU0EgT3B0aW9uIFJPTT4gYXQgaW9tZW0gMHhl OTAwMC0weGVmZmZmIHBucGlkIE9STTAwMDAgb24gaXNhMAp2Z2EwOiA8R2VuZXJpYyBJU0Eg VkdBPiBhdCBwb3J0IDB4M2MwLTB4M2RmIGlvbWVtIDB4YTAwMDAtMHhiZmZmZiBwbnBpZCBQ TlAwOTAwIG9uIGlzYTAKYXR0aW1lcjA6IDxBVCB0aW1lcj4gYXQgcG9ydCAweDQwIG9uIGlz YTAKVGltZWNvdW50ZXIgImk4MjU0IiBmcmVxdWVuY3kgMTE5MzE4MiBIeiBxdWFsaXR5IDAK RXZlbnQgdGltZXIgImk4MjU0IiBmcmVxdWVuY3kgMTE5MzE4MiBIeiBxdWFsaXR5IDEwMApU aW1lY291bnRlcnMgdGljayBldmVyeSAxMC4wMDAgbXNlYwp1Z2VuMC4xOiA8KDB4MWIzNikg WEhDSSByb290IEhVQj4gYXQgdXNidXMwCnVodWIwIG9uIHVzYnVzMAp1aHViMDogPCgweDFi MzYpIFhIQ0kgcm9vdCBIVUIsIGNsYXNzIDkvMCwgcmV2IDMuMDAvMS4wMCwgYWRkciAxPiBv biB1c2J1czAKWkZTIGZpbGVzeXN0ZW0gdmVyc2lvbjogNQpaRlMgc3RvcmFnZSBwb29sIHZl cnNpb246IGZlYXR1cmVzIHN1cHBvcnQgKDUwMDApClRyeWluZyB0byBtb3VudCByb290IGZy b20gemZzOnpyb290L1JPT1QvMjAyNC0xMi0yNi0xOC0wOSBbXS4uLgpkYTAgYXQgdnRzY3Np MCBidXMgMCBzY2J1czAgdGFyZ2V0IDAgbHVuIDAKZGEwOiA8UUVNVSBRRU1VIEhBUkRESVNL IDIuNSs+IEZpeGVkIERpcmVjdCBBY2Nlc3MgU1BDLTMgU0NTSSBkZXZpY2UKZGEwOiAzMDAu MDAwTUIvcyB0cmFuc2ZlcnMKZGEwOiBDb21tYW5kIFF1ZXVlaW5nIGVuYWJsZWQKZGEwOiA3 MzcyODBNQiAoMTUwOTk0OTQ0MCA1MTIgYnl0ZSBzZWN0b3JzKQpSb290IG1vdW50IHdhaXRp bmcgZm9yOiB1c2J1czAKdWh1YjA6IDMwIHBvcnRzIHdpdGggMzAgcmVtb3ZhYmxlLCBzZWxm IHBvd2VyZWQKR0VPTV9FTEk6IERldmljZSBkYTBwMi5lbGkgY3JlYXRlZC4KR0VPTV9FTEk6 IEVuY3J5cHRpb246IEFFUy1YVFMgMTI4CkdFT01fRUxJOiAgICAgQ3J5cHRvOiBhY2NlbGVy YXRlZCBzb2Z0d2FyZQppY2hzbWIwOiA8SW50ZWwgODI4MDFJIChJQ0g5KSBTTUJ1cyBjb250 cm9sbGVyPiBwb3J0IDB4NzAwLTB4NzNmIGlycSAxNiBhdCBkZXZpY2UgMzEuMyBvbiBwY2kw CnNtYnVzMDogPFN5c3RlbSBNYW5hZ2VtZW50IEJ1cz4gb24gaWNoc21iMAp2dGNvbjA6IDxW aXJ0SU8gQ29uc29sZSBBZGFwdGVyPiBvbiB2aXJ0aW9fcGNpMgp2dHJuZDA6IDxWaXJ0SU8g RW50cm9weSBBZGFwdGVyPiBvbiB2aXJ0aW9fcGNpNApyYW5kb206IHJlZ2lzdGVyaW5nIGZh c3Qgc291cmNlIFZpcnRJTyBFbnRyb3B5IEFkYXB0ZXIKbG8wOiBsaW5rIHN0YXRlIGNoYW5n ZWQgdG8gVVAKdnRuZXQwOiBsaW5rIHN0YXRlIGNoYW5nZWQgdG8gVVAKU2VjdXJpdHkgcG9s aWN5IGxvYWRlZDogTUFDL250cGQgKG1hY19udHBkKQpXYWl0aW5nIChtYXggNjAgc2Vjb25k cykgZm9yIHN5c3RlbSBwcm9jZXNzIGB2bmxydScgdG8gc3RvcC4uLiBkb25lCldhaXRpbmcg KG1heCA2MCBzZWNvbmRzKSBmb3Igc3lzdGVtIHByb2Nlc3MgYHN5bmNlcicgdG8gc3RvcC4u LiAKU3luY2luZyBkaXNrcywgdm5vZGVzIHJlbWFpbmluZy4uLiAwIDAgZG9uZQpBbGwgYnVm ZmVycyBzeW5jZWQuCkdFT01fRUxJOiBEZXZpY2UgZGEwcDIuZWxpIGRlc3Ryb3llZC4KR0VP TV9FTEk6IERldGFjaGVkIGRhMHAyLmVsaSBvbiBsYXN0IGNsb3NlLgpVcHRpbWU6IDVtMzhz CnVodWIwOiBkZXRhY2hlZAotLS08PEJPT1Q+Pi0tLQpDb3B5cmlnaHQgKGMpIDE5OTItMjAy NCBUaGUgRnJlZUJTRCBQcm9qZWN0LgpDb3B5cmlnaHQgKGMpIDE5NzksIDE5ODAsIDE5ODMs IDE5ODYsIDE5ODgsIDE5ODksIDE5OTEsIDE5OTIsIDE5OTMsIDE5OTQKCVRoZSBSZWdlbnRz IG9mIHRoZSBVbml2ZXJzaXR5IG9mIENhbGlmb3JuaWEuIEFsbCByaWdodHMgcmVzZXJ2ZWQu CkZyZWVCU0QgaXMgYSByZWdpc3RlcmVkIHRyYWRlbWFyayBvZiBUaGUgRnJlZUJTRCBGb3Vu ZGF0aW9uLgpGcmVlQlNEIDE1LjAtQ1VSUkVOVCAjMjMgbjI3NDE4My1iYTE5MDQ5MzdkOTog VGh1IERlYyAyNiAxODoxODoyMiAtMDMgMjAyNAogICAgcm9vdEBpZGFoby5hcnJha2lzLmNv bS5icjovdXNyL29iai91c3Ivc3JjL2FtZDY0LmFtZDY0L3N5cy9HRU5FUklDLU5PREVCVUcg YW1kNjQKRnJlZUJTRCBjbGFuZyB2ZXJzaW9uIDE5LjEuNSAoaHR0cHM6Ly9naXRodWIuY29t L2xsdm0vbGx2bS1wcm9qZWN0LmdpdCBsbHZtb3JnLTE5LjEuNS0wLWdhYjRiNWEyZGI1ODIp ClZUKHZnYSk6IHRleHQgODB4MjUKQ1BVOiBJbnRlbChSKSBYZW9uKFIpIENQVSBFNS0yNjk3 IHYzIEAgMi42MEdIeiAoMjYwMC4xMi1NSHogSzgtY2xhc3MgQ1BVKQogIE9yaWdpbj0iR2Vu dWluZUludGVsIiAgSWQ9MHgzMDZmMiAgRmFtaWx5PTB4NiAgTW9kZWw9MHgzZiAgU3RlcHBp bmc9MgogIEZlYXR1cmVzPTB4ZjgzZmJmZjxGUFUsVk1FLERFLFBTRSxUU0MsTVNSLFBBRSxN Q0UsQ1g4LEFQSUMsU0VQLE1UUlIsUEdFLE1DQSxDTU9WLFBBVCxQU0UzNixNTVgsRlhTUixT U0UsU1NFMixTUz4KICBGZWF0dXJlczI9MHhmZmZhMzIwMzxTU0UzLFBDTE1VTFFEUSxTU1NF MyxGTUEsQ1gxNixQQ0lELFNTRTQuMSxTU0U0LjIseDJBUElDLE1PVkJFLFBPUENOVCxUU0NE TFQsQUVTTkksWFNBVkUsT1NYU0FWRSxBVlgsRjE2QyxSRFJBTkQsSFY+CiAgQU1EIEZlYXR1 cmVzPTB4MmMxMDA4MDA8U1lTQ0FMTCxOWCxQYWdlMUdCLFJEVFNDUCxMTT4KICBBTUQgRmVh dHVyZXMyPTB4MjE8TEFIRixBQk0+CiAgU3RydWN0dXJlZCBFeHRlbmRlZCBGZWF0dXJlcz0w eDdhYjxGU0dTQkFTRSxUU0NBREosQk1JMSxBVlgyLFNNRVAsQk1JMixFUk1TLElOVlBDSUQ+ CiAgU3RydWN0dXJlZCBFeHRlbmRlZCBGZWF0dXJlczI9MHg0PFVNSVA+CiAgU3RydWN0dXJl ZCBFeHRlbmRlZCBGZWF0dXJlczM9MHhhYzAwMDQwMDxNRF9DTEVBUixJQlBCLFNUSUJQLEFS Q0hfQ0FQLFNTQkQ+CiAgWFNBVkUgRmVhdHVyZXM9MHgxPFhTQVZFT1BUPgogIElBMzJfQVJD SF9DQVBTPTB4NDg8U0tJUF9MMURGTF9WTUU+CiAgQU1EIEV4dGVuZGVkIEZlYXR1cmUgRXh0 ZW5zaW9ucyBJRCBFQlg9MHgxMDBkMDAwPElCUEIsSUJSUyxTVElCUCxTU0JEPgpIeXBlcnZp c29yOiBPcmlnaW4gPSAiS1ZNS1ZNS1ZNIgpyZWFsIG1lbW9yeSAgPSA1MTUzOTYwNzU1MiAo NDkxNTIgTUIpCmF2YWlsIG1lbW9yeSA9IDUwMDY3ODAwMDY0ICg0Nzc0OCBNQikKRXZlbnQg dGltZXIgIkxBUElDIiBxdWFsaXR5IDYwMApBQ1BJIEFQSUMgVGFibGU6IDxCT0NIUyAgQlhQ QyAgICA+CkZyZWVCU0QvU01QOiBNdWx0aXByb2Nlc3NvciBTeXN0ZW0gRGV0ZWN0ZWQ6IDEy IENQVXMKRnJlZUJTRC9TTVA6IDEyIHBhY2thZ2UocykgeCAxIGNvcmUocykKcmFuZG9tOiBy ZWdpc3RlcmluZyBmYXN0IHNvdXJjZSBJbnRlbCBTZWN1cmUgS2V5IFJORwpyYW5kb206IGZh c3QgcHJvdmlkZXI6ICJJbnRlbCBTZWN1cmUgS2V5IFJORyIKcmFuZG9tOiB1bmJsb2NraW5n IGRldmljZS4KaW9hcGljMCA8VmVyc2lvbiAxLjE+IGlycXMgMC0yMwpMYXVuY2hpbmcgQVBz OiAzIDggMSAxMCA1IDIgOSA0IDYgMTEgNwpyYW5kb206IGVudHJvcHkgZGV2aWNlIGV4dGVy bmFsIGludGVyZmFjZQprYmQxIGF0IGtiZG11eDAKdnR2Z2EwOiA8VlQgVkdBIGRyaXZlcj4K a3ZtY2xvY2swOiA8S1ZNIHBhcmF2aXJ0dWFsIGNsb2NrPgpUaW1lY291bnRlciAia3ZtY2xv Y2siIGZyZXF1ZW5jeSAxMDAwMDAwMDAwIEh6IHF1YWxpdHkgOTc1Cmt2bWNsb2NrMDogcmVn aXN0ZXJlZCBhcyBhIHRpbWUtb2YtZGF5IGNsb2NrLCByZXNvbHV0aW9uIDAuMDAwMDAxcwpz bWJpb3MwOiA8U3lzdGVtIE1hbmFnZW1lbnQgQklPUz4gYXQgaW9tZW0gMHhmNWE1MC0weGY1 YTZlCnNtYmlvczA6IFZlcnNpb246IDIuOCwgQkNEIFJldmlzaW9uOiAyLjgKYWVzbmkwOiA8 QUVTLUNCQyxBRVMtQ0NNLEFFUy1HQ00sQUVTLUlDTSxBRVMtWFRTPgphY3BpMDogPEJPQ0hT IEJYUEM+CmFjcGkwOiBQb3dlciBCdXR0b24gKGZpeGVkKQpjcHUwOiA8QUNQSSBDUFU+IG9u IGFjcGkwCmF0cnRjMDogPEFUIHJlYWx0aW1lIGNsb2NrPiBwb3J0IDB4NzAtMHg3NyBpcnEg OCBvbiBhY3BpMAphdHJ0YzA6IHJlZ2lzdGVyZWQgYXMgYSB0aW1lLW9mLWRheSBjbG9jaywg cmVzb2x1dGlvbiAxLjAwMDAwMHMKRXZlbnQgdGltZXIgIlJUQyIgZnJlcXVlbmN5IDMyNzY4 IEh6IHF1YWxpdHkgMApUaW1lY291bnRlciAiQUNQSS1mYXN0IiBmcmVxdWVuY3kgMzU3OTU0 NSBIeiBxdWFsaXR5IDkwMAphY3BpX3RpbWVyMDogPDI0LWJpdCB0aW1lciBhdCAzLjU3OTU0 NU1Iej4gcG9ydCAweDYwOC0weDYwYiBvbiBhY3BpMApwY2liMDogPEFDUEkgSG9zdC1QQ0kg YnJpZGdlPiBwb3J0IDB4Y2Y4LTB4Y2ZmIG9uIGFjcGkwCnBjaTA6IDxBQ1BJIFBDSSBidXM+ IG9uIHBjaWIwCnZnYXBjaTA6IDxWR0EtY29tcGF0aWJsZSBkaXNwbGF5PiBwb3J0IDB4ZDA0 MC0weGQwNWYgbWVtIDB4ZjQwMDAwMDAtMHhmN2ZmZmZmZiwweGY4MDAwMDAwLTB4ZmJmZmZm ZmYsMHhmZDIxMDAwMC0weGZkMjExZmZmIGlycSAyMSBhdCBkZXZpY2UgMS4wIG9uIHBjaTAK dmdhcGNpMDogQm9vdCB2aWRlbyBkZXZpY2UKcGNpYjE6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdl PiBtZW0gMHhmZDIxMjAwMC0weGZkMjEyZmZmIGlycSAyMiBhdCBkZXZpY2UgMi4wIG9uIHBj aTAKcGNpYjI6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxMzAwMC0weGZkMjEz ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi4xIG9uIHBjaTAKcGNpYjM6IDxBQ1BJIFBDSS1QQ0kg YnJpZGdlPiBtZW0gMHhmZDIxNDAwMC0weGZkMjE0ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi4y IG9uIHBjaTAKcGNpYjQ6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxNTAwMC0w eGZkMjE1ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi4zIG9uIHBjaTAKcGNpYjU6IDxBQ1BJIFBD SS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxNjAwMC0weGZkMjE2ZmZmIGlycSAyMiBhdCBkZXZp Y2UgMi40IG9uIHBjaTAKcGNpYjY6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIx NzAwMC0weGZkMjE3ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi41IG9uIHBjaTAKcGNpYjc6IDxB Q1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxODAwMC0weGZkMjE4ZmZmIGlycSAyMiBh dCBkZXZpY2UgMi42IG9uIHBjaTAKcGNpYjg6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0g MHhmZDIxOTAwMC0weGZkMjE5ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi43IG9uIHBjaTAKaXNh YjA6IDxQQ0ktSVNBIGJyaWRnZT4gYXQgZGV2aWNlIDMxLjAgb24gcGNpMAppc2EwOiA8SVNB IGJ1cz4gb24gaXNhYjAKYWhjaTA6IDxJbnRlbCBJQ0g5IEFIQ0kgU0FUQSBjb250cm9sbGVy PiBwb3J0IDB4ZDA2MC0weGQwN2YgbWVtIDB4ZmQyMWEwMDAtMHhmZDIxYWZmZiBpcnEgMTYg YXQgZGV2aWNlIDMxLjIgb24gcGNpMAphaGNpMDogQUhDSSB2MS4wMCB3aXRoIDYgMS41R2Jw cyBwb3J0cywgUG9ydCBNdWx0aXBsaWVyIG5vdCBzdXBwb3J0ZWQKYWhjaWNoMDogPEFIQ0kg Y2hhbm5lbD4gYXQgY2hhbm5lbCAwIG9uIGFoY2kwCmFoY2ljaDE6IDxBSENJIGNoYW5uZWw+ IGF0IGNoYW5uZWwgMSBvbiBhaGNpMAphaGNpY2gyOiA8QUhDSSBjaGFubmVsPiBhdCBjaGFu bmVsIDIgb24gYWhjaTAKYWhjaWNoMzogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5lbCAzIG9u IGFoY2kwCmFoY2ljaDQ6IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgNCBvbiBhaGNpMAph aGNpY2g1OiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDUgb24gYWhjaTAKYWNwaV9zeXNj b250YWluZXIwOiA8U3lzdGVtIENvbnRhaW5lcj4gb24gYWNwaTAKYWNwaV9zeXNjb250YWlu ZXIxOiA8U3lzdGVtIENvbnRhaW5lcj4gcG9ydCAweGNkOC0weGNlMyBvbiBhY3BpMAphY3Bp X3N5c2NvbnRhaW5lcjI6IDxTeXN0ZW0gQ29udGFpbmVyPiBwb3J0IDB4NjIwLTB4NjJmIG9u IGFjcGkwCmFjcGlfc3lzY29udGFpbmVyMzogPFN5c3RlbSBDb250YWluZXI+IHBvcnQgMHhj YzAtMHhjZDcgb24gYWNwaTAKdWFydDA6IDwxNjU1MCBvciBjb21wYXRpYmxlPiBwb3J0IDB4 M2Y4LTB4M2ZmIGlycSA0IGZsYWdzIDB4MTAgb24gYWNwaTAKYXRrYmRjMDogPEtleWJvYXJk IGNvbnRyb2xsZXIgKGk4MDQyKT4gcG9ydCAweDYwLDB4NjQgaXJxIDEgb24gYWNwaTAKYXRr YmQwOiA8QVQgS2V5Ym9hcmQ+IGlycSAxIG9uIGF0a2JkYzAKa2JkMCBhdCBhdGtiZDAKYXRr YmQwOiBbR0lBTlQtTE9DS0VEXQpwc20wOiA8UFMvMiBNb3VzZT4gaXJxIDEyIG9uIGF0a2Jk YzAKcHNtMDogW0dJQU5ULUxPQ0tFRF0KV0FSTklORzogRGV2aWNlICJwc20iIGlzIEdpYW50 IGxvY2tlZCBhbmQgbWF5IGJlIGRlbGV0ZWQgYmVmb3JlIEZyZWVCU0QgMTUuMC4KcHNtMDog bW9kZWwgSW50ZWxsaU1vdXNlIEV4cGxvcmVyLCBkZXZpY2UgSUQgNApvcm0wOiA8SVNBIE9w dGlvbiBST00+IGF0IGlvbWVtIDB4ZTkwMDAtMHhlZmZmZiBwbnBpZCBPUk0wMDAwIG9uIGlz YTAKdmdhMDogPEdlbmVyaWMgSVNBIFZHQT4gYXQgcG9ydCAweDNjMC0weDNkZiBpb21lbSAw eGEwMDAwLTB4YmZmZmYgcG5waWQgUE5QMDkwMCBvbiBpc2EwCmF0dGltZXIwOiA8QVQgdGlt ZXI+IGF0IHBvcnQgMHg0MCBvbiBpc2EwClRpbWVjb3VudGVyICJpODI1NCIgZnJlcXVlbmN5 IDExOTMxODIgSHogcXVhbGl0eSAwCkV2ZW50IHRpbWVyICJpODI1NCIgZnJlcXVlbmN5IDEx OTMxODIgSHogcXVhbGl0eSAxMDAKVGltZWNvdW50ZXJzIHRpY2sgZXZlcnkgMTAuMDAwIG1z ZWMKWkZTIGZpbGVzeXN0ZW0gdmVyc2lvbjogNQpaRlMgc3RvcmFnZSBwb29sIHZlcnNpb246 IGZlYXR1cmVzIHN1cHBvcnQgKDUwMDApClRyeWluZyB0byBtb3VudCByb290IGZyb20gemZz Onpyb290L1JPT1QvMjAyNC0xMi0yNi0xOC0xOCBbXS4uLgpTb2xhcmlzOiBOT1RJQ0U6IENh bm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnCk1vdW50aW5nIGZyb20gemZz Onpyb290L1JPT1QvMjAyNC0xMi0yNi0xOC0xOCBmYWlsZWQgd2l0aCBlcnJvciA1OyByZXRy eWluZyBmb3IgMyBtb3JlIHNlY29uZHMKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0 aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5k IHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZp bmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3Qg ZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5v dCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fu bm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBD YW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6 IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElD RTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9U SUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBO T1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6 IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJp czogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xh cmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNv bGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcK U29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290 JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJv b3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6 cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3Ig J3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZv ciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwg Zm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJl bCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxh YmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wg bGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9v bCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBw b29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhl IHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0 aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5k IHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZp bmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKTW91bnRpbmcgZnJvbSB6ZnM6enJvb3Qv Uk9PVC8yMDI0LTEyLTI2LTE4LTE4IGZhaWxlZCB3aXRoIGVycm9yIDUuCgpMb2FkZXIgdmFy aWFibGVzOgogIHZmcy5yb290Lm1vdW50ZnJvbT16ZnM6enJvb3QvUk9PVC8yMDI0LTEyLTI2 LTE4LTE4CgpNYW51YWwgcm9vdCBmaWxlc3lzdGVtIHNwZWNpZmljYXRpb246CiAgPGZzdHlw ZT46PGRldmljZT4gW29wdGlvbnNdCiAgICAgIE1vdW50IDxkZXZpY2U+IHVzaW5nIGZpbGVz eXN0ZW0gPGZzdHlwZT4KICAgICAgYW5kIHdpdGggdGhlIHNwZWNpZmllZCAob3B0aW9uYWwp IG9wdGlvbiBsaXN0LgoKICAgIGVnLiB1ZnM6L2Rldi9kYTBzMWEKICAgICAgICB6ZnM6enJv b3QvUk9PVC9kZWZhdWx0CiAgICAgICAgY2Q5NjYwOi9kZXYvY2QwIHJvCiAgICAgICAgICAo d2hpY2ggaXMgZXF1aXZhbGVudCB0bzogbW91bnQgLXQgY2Q5NjYwIC1vIHJvIC9kZXYvY2Qw IC8pCgogID8gICAgICAgICAgICAgICBMaXN0IHZhbGlkIGRpc2sgYm9vdCBkZXZpY2VzCiAg LiAgICAgICAgICAgICAgIFlpZWxkIDEgc2Vjb25kIChmb3IgYmFja2dyb3VuZCB0YXNrcykK ICA8ZW1wdHkgbGluZT4gICAgQWJvcnQgbWFudWFsIGlucHV0Cgptb3VudHJvb3Q+IHBhbmlj OiBtb3VudHJvb3Q6IHVuYWJsZSB0byAocmUtKW1vdW50IHJvb3QuCmNwdWlkID0gMTEKdGlt ZSA9IDgKS0RCOiBzdGFjayBiYWNrdHJhY2U6CmRiX3RyYWNlX3NlbGZfd3JhcHBlcigpIGF0 IGRiX3RyYWNlX3NlbGZfd3JhcHBlcisweDJiL2ZyYW1lIDB4ZmZmZmZlMDEyZjYwNWI2MAp2 cGFuaWMoKSBhdCB2cGFuaWMrMHgxMzYvZnJhbWUgMHhmZmZmZmUwMTJmNjA1YzkwCnBhbmlj KCkgYXQgcGFuaWMrMHg0My9mcmFtZSAweGZmZmZmZTAxMmY2MDVjZjAKdmZzX21vdW50cm9v dCgpIGF0IHZmc19tb3VudHJvb3QrMHgxY2JjL2ZyYW1lIDB4ZmZmZmZlMDEyZjYwNWU2MApz dGFydF9pbml0KCkgYXQgc3RhcnRfaW5pdCsweDIzL2ZyYW1lIDB4ZmZmZmZlMDEyZjYwNWVm MApmb3JrX2V4aXQoKSBhdCBmb3JrX2V4aXQrMHg3Yi9mcmFtZSAweGZmZmZmZTAxMmY2MDVm MzAKZm9ya190cmFtcG9saW5lKCkgYXQgZm9ya190cmFtcG9saW5lKzB4ZS9mcmFtZSAweGZm ZmZmZTAxMmY2MDVmMzAKLS0tIHRyYXAgMHhjLCByaXAgPSAweDIzZTBjMCwgcnNwID0gMHg4 MjBjMGFlNjgsIHJicCA9IDB4ODIwYzBiNDkwIC0tLQpLREI6IGVudGVyOiBwYW5pYwotLS08 PEJPT1Q+Pi0tLQpDb3B5cmlnaHQgKGMpIDE5OTItMjAyNCBUaGUgRnJlZUJTRCBQcm9qZWN0 LgpDb3B5cmlnaHQgKGMpIDE5NzksIDE5ODAsIDE5ODMsIDE5ODYsIDE5ODgsIDE5ODksIDE5 OTEsIDE5OTIsIDE5OTMsIDE5OTQKCVRoZSBSZWdlbnRzIG9mIHRoZSBVbml2ZXJzaXR5IG9m IENhbGlmb3JuaWEuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCkZyZWVCU0QgaXMgYSByZWdpc3Rl cmVkIHRyYWRlbWFyayBvZiBUaGUgRnJlZUJTRCBGb3VuZGF0aW9uLgpGcmVlQlNEIDE1LjAt Q1VSUkVOVCAjMjIgbjI3NDE4Mi05MzhlNGIxMzFjNDogVGh1IERlYyAyNiAxODoxMDoxMiAt MDMgMjAyNAogICAgcm9vdEBpZGFoby5hcnJha2lzLmNvbS5icjovdXNyL29iai91c3Ivc3Jj L2FtZDY0LmFtZDY0L3N5cy9HRU5FUklDLU5PREVCVUcgYW1kNjQKRnJlZUJTRCBjbGFuZyB2 ZXJzaW9uIDE5LjEuNSAoaHR0cHM6Ly9naXRodWIuY29tL2xsdm0vbGx2bS1wcm9qZWN0Lmdp dCBsbHZtb3JnLTE5LjEuNS0wLWdhYjRiNWEyZGI1ODIpClZUKHZnYSk6IHRleHQgODB4MjUK Q1BVOiBJbnRlbChSKSBYZW9uKFIpIENQVSBFNS0yNjk3IHYzIEAgMi42MEdIeiAoMjYwMC4x NS1NSHogSzgtY2xhc3MgQ1BVKQogIE9yaWdpbj0iR2VudWluZUludGVsIiAgSWQ9MHgzMDZm MiAgRmFtaWx5PTB4NiAgTW9kZWw9MHgzZiAgU3RlcHBpbmc9MgogIEZlYXR1cmVzPTB4Zjgz ZmJmZjxGUFUsVk1FLERFLFBTRSxUU0MsTVNSLFBBRSxNQ0UsQ1g4LEFQSUMsU0VQLE1UUlIs UEdFLE1DQSxDTU9WLFBBVCxQU0UzNixNTVgsRlhTUixTU0UsU1NFMixTUz4KICBGZWF0dXJl czI9MHhmZmZhMzIwMzxTU0UzLFBDTE1VTFFEUSxTU1NFMyxGTUEsQ1gxNixQQ0lELFNTRTQu MSxTU0U0LjIseDJBUElDLE1PVkJFLFBPUENOVCxUU0NETFQsQUVTTkksWFNBVkUsT1NYU0FW RSxBVlgsRjE2QyxSRFJBTkQsSFY+CiAgQU1EIEZlYXR1cmVzPTB4MmMxMDA4MDA8U1lTQ0FM TCxOWCxQYWdlMUdCLFJEVFNDUCxMTT4KICBBTUQgRmVhdHVyZXMyPTB4MjE8TEFIRixBQk0+ CiAgU3RydWN0dXJlZCBFeHRlbmRlZCBGZWF0dXJlcz0weDdhYjxGU0dTQkFTRSxUU0NBREos Qk1JMSxBVlgyLFNNRVAsQk1JMixFUk1TLElOVlBDSUQ+CiAgU3RydWN0dXJlZCBFeHRlbmRl ZCBGZWF0dXJlczI9MHg0PFVNSVA+CiAgU3RydWN0dXJlZCBFeHRlbmRlZCBGZWF0dXJlczM9 MHhhYzAwMDQwMDxNRF9DTEVBUixJQlBCLFNUSUJQLEFSQ0hfQ0FQLFNTQkQ+CiAgWFNBVkUg RmVhdHVyZXM9MHgxPFhTQVZFT1BUPgogIElBMzJfQVJDSF9DQVBTPTB4NDg8U0tJUF9MMURG TF9WTUU+CiAgQU1EIEV4dGVuZGVkIEZlYXR1cmUgRXh0ZW5zaW9ucyBJRCBFQlg9MHgxMDBk MDAwPElCUEIsSUJSUyxTVElCUCxTU0JEPgpIeXBlcnZpc29yOiBPcmlnaW4gPSAiS1ZNS1ZN S1ZNIgpyZWFsIG1lbW9yeSAgPSA1MTUzOTYwNzU1MiAoNDkxNTIgTUIpCmF2YWlsIG1lbW9y eSA9IDUwMDY3ODAwMDY0ICg0Nzc0OCBNQikKRXZlbnQgdGltZXIgIkxBUElDIiBxdWFsaXR5 IDYwMApBQ1BJIEFQSUMgVGFibGU6IDxCT0NIUyAgQlhQQyAgICA+CkZyZWVCU0QvU01QOiBN dWx0aXByb2Nlc3NvciBTeXN0ZW0gRGV0ZWN0ZWQ6IDEyIENQVXMKRnJlZUJTRC9TTVA6IDEy IHBhY2thZ2UocykgeCAxIGNvcmUocykKcmFuZG9tOiByZWdpc3RlcmluZyBmYXN0IHNvdXJj ZSBJbnRlbCBTZWN1cmUgS2V5IFJORwpyYW5kb206IGZhc3QgcHJvdmlkZXI6ICJJbnRlbCBT ZWN1cmUgS2V5IFJORyIKcmFuZG9tOiB1bmJsb2NraW5nIGRldmljZS4KaW9hcGljMCA8VmVy c2lvbiAxLjE+IGlycXMgMC0yMwpMYXVuY2hpbmcgQVBzOiAxMSAzIDggMiA3IDUgOSA0IDYg MSAxMApyYW5kb206IGVudHJvcHkgZGV2aWNlIGV4dGVybmFsIGludGVyZmFjZQprYmQxIGF0 IGtiZG11eDAKdnR2Z2EwOiA8VlQgVkdBIGRyaXZlcj4Ka3ZtY2xvY2swOiA8S1ZNIHBhcmF2 aXJ0dWFsIGNsb2NrPgpUaW1lY291bnRlciAia3ZtY2xvY2siIGZyZXF1ZW5jeSAxMDAwMDAw MDAwIEh6IHF1YWxpdHkgOTc1Cmt2bWNsb2NrMDogcmVnaXN0ZXJlZCBhcyBhIHRpbWUtb2Yt ZGF5IGNsb2NrLCByZXNvbHV0aW9uIDAuMDAwMDAxcwpzbWJpb3MwOiA8U3lzdGVtIE1hbmFn ZW1lbnQgQklPUz4gYXQgaW9tZW0gMHhmNWE1MC0weGY1YTZlCnNtYmlvczA6IFZlcnNpb246 IDIuOCwgQkNEIFJldmlzaW9uOiAyLjgKYWVzbmkwOiA8QUVTLUNCQyxBRVMtQ0NNLEFFUy1H Q00sQUVTLUlDTSxBRVMtWFRTPgphY3BpMDogPEJPQ0hTIEJYUEM+CmFjcGkwOiBQb3dlciBC dXR0b24gKGZpeGVkKQpjcHUwOiA8QUNQSSBDUFU+IG9uIGFjcGkwCmF0cnRjMDogPEFUIHJl YWx0aW1lIGNsb2NrPiBwb3J0IDB4NzAtMHg3NyBpcnEgOCBvbiBhY3BpMAphdHJ0YzA6IHJl Z2lzdGVyZWQgYXMgYSB0aW1lLW9mLWRheSBjbG9jaywgcmVzb2x1dGlvbiAxLjAwMDAwMHMK RXZlbnQgdGltZXIgIlJUQyIgZnJlcXVlbmN5IDMyNzY4IEh6IHF1YWxpdHkgMApUaW1lY291 bnRlciAiQUNQSS1mYXN0IiBmcmVxdWVuY3kgMzU3OTU0NSBIeiBxdWFsaXR5IDkwMAphY3Bp X3RpbWVyMDogPDI0LWJpdCB0aW1lciBhdCAzLjU3OTU0NU1Iej4gcG9ydCAweDYwOC0weDYw YiBvbiBhY3BpMApwY2liMDogPEFDUEkgSG9zdC1QQ0kgYnJpZGdlPiBwb3J0IDB4Y2Y4LTB4 Y2ZmIG9uIGFjcGkwCnBjaTA6IDxBQ1BJIFBDSSBidXM+IG9uIHBjaWIwCnZnYXBjaTA6IDxW R0EtY29tcGF0aWJsZSBkaXNwbGF5PiBwb3J0IDB4ZDA0MC0weGQwNWYgbWVtIDB4ZjQwMDAw MDAtMHhmN2ZmZmZmZiwweGY4MDAwMDAwLTB4ZmJmZmZmZmYsMHhmZDIxMDAwMC0weGZkMjEx ZmZmIGlycSAyMSBhdCBkZXZpY2UgMS4wIG9uIHBjaTAKdmdhcGNpMDogQm9vdCB2aWRlbyBk ZXZpY2UKcGNpYjE6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxMjAwMC0weGZk MjEyZmZmIGlycSAyMiBhdCBkZXZpY2UgMi4wIG9uIHBjaTAKcGNpMTogPEFDUEkgUENJIGJ1 cz4gb24gcGNpYjEKcGNpYjI6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmYzIwMDAw MC0weGZjMjAwMGZmIGlycSAyMiBhdCBkZXZpY2UgMC4wIG9uIHBjaTEKcGNpMjogPEFDUEkg UENJIGJ1cz4gb24gcGNpYjIKcGNpYjM6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhm ZDIxMzAwMC0weGZkMjEzZmZmIGlycSAyMiBhdCBkZXZpY2UgMi4xIG9uIHBjaTAKcGNpMzog PEFDUEkgUENJIGJ1cz4gb24gcGNpYjMKdmlydGlvX3BjaTA6IDxWaXJ0SU8gUENJIChtb2Rl cm4pIE5ldHdvcmsgYWRhcHRlcj4gbWVtIDB4ZmQwNDAwMDAtMHhmZDA0MGZmZiwweGZlODAw MDAwLTB4ZmU4MDNmZmYgaXJxIDIyIGF0IGRldmljZSAwLjAgb24gcGNpMwp2dG5ldDA6IDxW aXJ0SU8gTmV0d29ya2luZyBBZGFwdGVyPiBvbiB2aXJ0aW9fcGNpMAp2dG5ldDA6IEV0aGVy bmV0IGFkZHJlc3M6IDUyOjU0OjU4OjkzOmM3OmVmCnZ0bmV0MDogbmV0bWFwIHF1ZXVlcy9z bG90czogVFggMS8yNTYsIFJYIDEvMTI4CjAwMC4wMDAwNzcgWyA0NTJdIHZ0bmV0X25ldG1h cF9hdHRhY2ggICAgICAgdnRuZXQgYXR0YWNoZWQgdHhxPTEsIHR4ZD0yNTYgcnhxPTEsIHJ4 ZD0xMjgKcGNpYjQ6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxNDAwMC0weGZk MjE0ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi4yIG9uIHBjaTAKcGNpNDogPEFDUEkgUENJIGJ1 cz4gb24gcGNpYjQKeGhjaTA6IDxYSENJIChnZW5lcmljKSBVU0IgMy4wIGNvbnRyb2xsZXI+ IG1lbSAweGZjZTAwMDAwLTB4ZmNlMDNmZmYgaXJxIDIyIGF0IGRldmljZSAwLjAgb24gcGNp NAp4aGNpMDogMzIgYnl0ZXMgY29udGV4dCBzaXplLCA2NC1iaXQgRE1BCnVzYnVzMCBvbiB4 aGNpMAp1c2J1czA6IDUuMEdicHMgU3VwZXIgU3BlZWQgVVNCIHYzLjAKcGNpYjU6IDxBQ1BJ IFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxNTAwMC0weGZkMjE1ZmZmIGlycSAyMiBhdCBk ZXZpY2UgMi4zIG9uIHBjaTAKcGNpNTogPEFDUEkgUENJIGJ1cz4gb24gcGNpYjUKdmlydGlv X3BjaTE6IDxWaXJ0SU8gUENJIChtb2Rlcm4pIFNDU0kgYWRhcHRlcj4gbWVtIDB4ZmNjMDAw MDAtMHhmY2MwMGZmZiwweGZlNDAwMDAwLTB4ZmU0MDNmZmYgaXJxIDIyIGF0IGRldmljZSAw LjAgb24gcGNpNQp2dHNjc2kwOiA8VmlydElPIFNDU0kgQWRhcHRlcj4gb24gdmlydGlvX3Bj aTEKcGNpYjY6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxNjAwMC0weGZkMjE2 ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi40IG9uIHBjaTAKcGNpNjogPEFDUEkgUENJIGJ1cz4g b24gcGNpYjYKdmlydGlvX3BjaTI6IDxWaXJ0SU8gUENJIChtb2Rlcm4pIENvbnNvbGUgYWRh cHRlcj4gbWVtIDB4ZmNhMDAwMDAtMHhmY2EwMGZmZiwweGZlMjAwMDAwLTB4ZmUyMDNmZmYg aXJxIDIyIGF0IGRldmljZSAwLjAgb24gcGNpNgpwY2liNzogPEFDUEkgUENJLVBDSSBicmlk Z2U+IG1lbSAweGZkMjE3MDAwLTB4ZmQyMTdmZmYgaXJxIDIyIGF0IGRldmljZSAyLjUgb24g cGNpMApwY2k3OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liNwp2aXJ0aW9fcGNpMzogPFZpcnRJ TyBQQ0kgKG1vZGVybikgQmFsbG9vbiBhZGFwdGVyPiBtZW0gMHhmZTAwMDAwMC0weGZlMDAz ZmZmIGlycSAyMiBhdCBkZXZpY2UgMC4wIG9uIHBjaTcKdnRiYWxsb29uMDogPFZpcnRJTyBC YWxsb29uIEFkYXB0ZXI+IG9uIHZpcnRpb19wY2kzCnBjaWI4OiA8QUNQSSBQQ0ktUENJIGJy aWRnZT4gbWVtIDB4ZmQyMTgwMDAtMHhmZDIxOGZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNiBv biBwY2kwCnBjaTg6IDxBQ1BJIFBDSSBidXM+IG9uIHBjaWI4CnZpcnRpb19wY2k0OiA8Vmly dElPIFBDSSAobW9kZXJuKSBFbnRyb3B5IGFkYXB0ZXI+IG1lbSAweGZkZTAwMDAwLTB4ZmRl MDNmZmYgaXJxIDIyIGF0IGRldmljZSAwLjAgb24gcGNpOApwY2liOTogPEFDUEkgUENJLVBD SSBicmlkZ2U+IG1lbSAweGZkMjE5MDAwLTB4ZmQyMTlmZmYgaXJxIDIyIGF0IGRldmljZSAy Ljcgb24gcGNpMApwY2k5OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liOQppc2FiMDogPFBDSS1J U0EgYnJpZGdlPiBhdCBkZXZpY2UgMzEuMCBvbiBwY2kwCmlzYTA6IDxJU0EgYnVzPiBvbiBp c2FiMAphaGNpMDogPEludGVsIElDSDkgQUhDSSBTQVRBIGNvbnRyb2xsZXI+IHBvcnQgMHhk MDYwLTB4ZDA3ZiBtZW0gMHhmZDIxYTAwMC0weGZkMjFhZmZmIGlycSAxNiBhdCBkZXZpY2Ug MzEuMiBvbiBwY2kwCmFoY2kwOiBBSENJIHYxLjAwIHdpdGggNiAxLjVHYnBzIHBvcnRzLCBQ b3J0IE11bHRpcGxpZXIgbm90IHN1cHBvcnRlZAphaGNpY2gwOiA8QUhDSSBjaGFubmVsPiBh dCBjaGFubmVsIDAgb24gYWhjaTAKYWhjaWNoMTogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5l bCAxIG9uIGFoY2kwCmFoY2ljaDI6IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgMiBvbiBh aGNpMAphaGNpY2gzOiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDMgb24gYWhjaTAKYWhj aWNoNDogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5lbCA0IG9uIGFoY2kwCmFoY2ljaDU6IDxB SENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgNSBvbiBhaGNpMAphY3BpX3N5c2NvbnRhaW5lcjA6 IDxTeXN0ZW0gQ29udGFpbmVyPiBvbiBhY3BpMAphY3BpX3N5c2NvbnRhaW5lcjE6IDxTeXN0 ZW0gQ29udGFpbmVyPiBwb3J0IDB4Y2Q4LTB4Y2UzIG9uIGFjcGkwCmFjcGlfc3lzY29udGFp bmVyMjogPFN5c3RlbSBDb250YWluZXI+IHBvcnQgMHg2MjAtMHg2MmYgb24gYWNwaTAKYWNw aV9zeXNjb250YWluZXIzOiA8U3lzdGVtIENvbnRhaW5lcj4gcG9ydCAweGNjMC0weGNkNyBv biBhY3BpMAp1YXJ0MDogPDE2NTUwIG9yIGNvbXBhdGlibGU+IHBvcnQgMHgzZjgtMHgzZmYg aXJxIDQgZmxhZ3MgMHgxMCBvbiBhY3BpMAphdGtiZGMwOiA8S2V5Ym9hcmQgY29udHJvbGxl ciAoaTgwNDIpPiBwb3J0IDB4NjAsMHg2NCBpcnEgMSBvbiBhY3BpMAphdGtiZDA6IDxBVCBL ZXlib2FyZD4gaXJxIDEgb24gYXRrYmRjMAprYmQwIGF0IGF0a2JkMAphdGtiZDA6IFtHSUFO VC1MT0NLRURdCnBzbTA6IDxQUy8yIE1vdXNlPiBpcnEgMTIgb24gYXRrYmRjMApwc20wOiBb R0lBTlQtTE9DS0VEXQpXQVJOSU5HOiBEZXZpY2UgInBzbSIgaXMgR2lhbnQgbG9ja2VkIGFu ZCBtYXkgYmUgZGVsZXRlZCBiZWZvcmUgRnJlZUJTRCAxNS4wLgpwc20wOiBtb2RlbCBJbnRl bGxpTW91c2UgRXhwbG9yZXIsIGRldmljZSBJRCA0Cm9ybTA6IDxJU0EgT3B0aW9uIFJPTT4g YXQgaW9tZW0gMHhlOTAwMC0weGVmZmZmIHBucGlkIE9STTAwMDAgb24gaXNhMAp2Z2EwOiA8 R2VuZXJpYyBJU0EgVkdBPiBhdCBwb3J0IDB4M2MwLTB4M2RmIGlvbWVtIDB4YTAwMDAtMHhi ZmZmZiBwbnBpZCBQTlAwOTAwIG9uIGlzYTAKYXR0aW1lcjA6IDxBVCB0aW1lcj4gYXQgcG9y dCAweDQwIG9uIGlzYTAKVGltZWNvdW50ZXIgImk4MjU0IiBmcmVxdWVuY3kgMTE5MzE4MiBI eiBxdWFsaXR5IDAKRXZlbnQgdGltZXIgImk4MjU0IiBmcmVxdWVuY3kgMTE5MzE4MiBIeiBx dWFsaXR5IDEwMApUaW1lY291bnRlcnMgdGljayBldmVyeSAxMC4wMDAgbXNlYwp1Z2VuMC4x OiA8KDB4MWIzNikgWEhDSSByb290IEhVQj4gYXQgdXNidXMwCnVodWIwIG9uIHVzYnVzMAp1 aHViMDogPCgweDFiMzYpIFhIQ0kgcm9vdCBIVUIsIGNsYXNzIDkvMCwgcmV2IDMuMDAvMS4w MCwgYWRkciAxPiBvbiB1c2J1czAKWkZTIGZpbGVzeXN0ZW0gdmVyc2lvbjogNQpaRlMgc3Rv cmFnZSBwb29sIHZlcnNpb246IGZlYXR1cmVzIHN1cHBvcnQgKDUwMDApClRyeWluZyB0byBt b3VudCByb290IGZyb20gemZzOnpyb290L1JPT1QvMjAyNC0xMi0yNi0xOC0wOSBbXS4uLgpk YTAgYXQgdnRzY3NpMCBidXMgMCBzY2J1czAgdGFyZ2V0IDAgbHVuIDAKZGEwOiA8UUVNVSBR RU1VIEhBUkRESVNLIDIuNSs+IEZpeGVkIERpcmVjdCBBY2Nlc3MgU1BDLTMgU0NTSSBkZXZp Y2UKZGEwOiAzMDAuMDAwTUIvcyB0cmFuc2ZlcnMKZGEwOiBDb21tYW5kIFF1ZXVlaW5nIGVu YWJsZWQKZGEwOiA3MzcyODBNQiAoMTUwOTk0OTQ0MCA1MTIgYnl0ZSBzZWN0b3JzKQpSb290 IG1vdW50IHdhaXRpbmcgZm9yOiB1c2J1czAKdWh1YjA6IDMwIHBvcnRzIHdpdGggMzAgcmVt b3ZhYmxlLCBzZWxmIHBvd2VyZWQKR0VPTV9FTEk6IERldmljZSBkYTBwMi5lbGkgY3JlYXRl ZC4KR0VPTV9FTEk6IEVuY3J5cHRpb246IEFFUy1YVFMgMTI4CkdFT01fRUxJOiAgICAgQ3J5 cHRvOiBhY2NlbGVyYXRlZCBzb2Z0d2FyZQppY2hzbWIwOiA8SW50ZWwgODI4MDFJIChJQ0g5 KSBTTUJ1cyBjb250cm9sbGVyPiBwb3J0IDB4NzAwLTB4NzNmIGlycSAxNiBhdCBkZXZpY2Ug MzEuMyBvbiBwY2kwCnNtYnVzMDogPFN5c3RlbSBNYW5hZ2VtZW50IEJ1cz4gb24gaWNoc21i MAp2dGNvbjA6IDxWaXJ0SU8gQ29uc29sZSBBZGFwdGVyPiBvbiB2aXJ0aW9fcGNpMgp2dHJu ZDA6IDxWaXJ0SU8gRW50cm9weSBBZGFwdGVyPiBvbiB2aXJ0aW9fcGNpNApyYW5kb206IHJl Z2lzdGVyaW5nIGZhc3Qgc291cmNlIFZpcnRJTyBFbnRyb3B5IEFkYXB0ZXIKbG8wOiBsaW5r IHN0YXRlIGNoYW5nZWQgdG8gVVAKdnRuZXQwOiBsaW5rIHN0YXRlIGNoYW5nZWQgdG8gVVAK U2VjdXJpdHkgcG9saWN5IGxvYWRlZDogTUFDL250cGQgKG1hY19udHBkKQpXYWl0aW5nICht YXggNjAgc2Vjb25kcykgZm9yIHN5c3RlbSBwcm9jZXNzIGB2bmxydScgdG8gc3RvcC4uLiBk b25lCldhaXRpbmcgKG1heCA2MCBzZWNvbmRzKSBmb3Igc3lzdGVtIHByb2Nlc3MgYHN5bmNl cicgdG8gc3RvcC4uLiAKU3luY2luZyBkaXNrcywgdm5vZGVzIHJlbWFpbmluZy4uLiAwIDAg ZG9uZQpBbGwgYnVmZmVycyBzeW5jZWQuCkdFT01fRUxJOiBEZXZpY2UgZGEwcDIuZWxpIGRl c3Ryb3llZC4KR0VPTV9FTEk6IERldGFjaGVkIGRhMHAyLmVsaSBvbiBsYXN0IGNsb3NlLgpV cHRpbWU6IDNtMnMKdWh1YjA6IGRldGFjaGVkCi0tLTw8Qk9PVD4+LS0tCkNvcHlyaWdodCAo YykgMTk5Mi0yMDI0IFRoZSBGcmVlQlNEIFByb2plY3QuCkNvcHlyaWdodCAoYykgMTk3OSwg MTk4MCwgMTk4MywgMTk4NiwgMTk4OCwgMTk4OSwgMTk5MSwgMTk5MiwgMTk5MywgMTk5NAoJ VGhlIFJlZ2VudHMgb2YgdGhlIFVuaXZlcnNpdHkgb2YgQ2FsaWZvcm5pYS4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KRnJlZUJTRCBpcyBhIHJlZ2lzdGVyZWQgdHJhZGVtYXJrIG9mIFRoZSBG cmVlQlNEIEZvdW5kYXRpb24uCkZyZWVCU0QgMTUuMC1DVVJSRU5UICMyMyBuMjc0MTgyLTkz OGU0YjEzMWM0OiBUaHUgRGVjIDI2IDE4OjIzOjE4IC0wMyAyMDI0CiAgICByb290QGlkYWhv LmFycmFraXMuY29tLmJyOi91c3Ivb2JqL3Vzci9zcmMvYW1kNjQuYW1kNjQvc3lzL0dFTkVS SUMtTk9ERUJVRyBhbWQ2NApGcmVlQlNEIGNsYW5nIHZlcnNpb24gMTkuMS41IChodHRwczov L2dpdGh1Yi5jb20vbGx2bS9sbHZtLXByb2plY3QuZ2l0IGxsdm1vcmctMTkuMS41LTAtZ2Fi NGI1YTJkYjU4MikKVlQodmdhKTogdGV4dCA4MHgyNQpDUFU6IEludGVsKFIpIFhlb24oUikg Q1BVIEU1LTI2OTcgdjMgQCAyLjYwR0h6ICgyNjAwLjA3LU1IeiBLOC1jbGFzcyBDUFUpCiAg T3JpZ2luPSJHZW51aW5lSW50ZWwiICBJZD0weDMwNmYyICBGYW1pbHk9MHg2ICBNb2RlbD0w eDNmICBTdGVwcGluZz0yCiAgRmVhdHVyZXM9MHhmODNmYmZmPEZQVSxWTUUsREUsUFNFLFRT QyxNU1IsUEFFLE1DRSxDWDgsQVBJQyxTRVAsTVRSUixQR0UsTUNBLENNT1YsUEFULFBTRTM2 LE1NWCxGWFNSLFNTRSxTU0UyLFNTPgogIEZlYXR1cmVzMj0weGZmZmEzMjAzPFNTRTMsUENM TVVMUURRLFNTU0UzLEZNQSxDWDE2LFBDSUQsU1NFNC4xLFNTRTQuMix4MkFQSUMsTU9WQkUs UE9QQ05ULFRTQ0RMVCxBRVNOSSxYU0FWRSxPU1hTQVZFLEFWWCxGMTZDLFJEUkFORCxIVj4K ICBBTUQgRmVhdHVyZXM9MHgyYzEwMDgwMDxTWVNDQUxMLE5YLFBhZ2UxR0IsUkRUU0NQLExN PgogIEFNRCBGZWF0dXJlczI9MHgyMTxMQUhGLEFCTT4KICBTdHJ1Y3R1cmVkIEV4dGVuZGVk IEZlYXR1cmVzPTB4N2FiPEZTR1NCQVNFLFRTQ0FESixCTUkxLEFWWDIsU01FUCxCTUkyLEVS TVMsSU5WUENJRD4KICBTdHJ1Y3R1cmVkIEV4dGVuZGVkIEZlYXR1cmVzMj0weDQ8VU1JUD4K ICBTdHJ1Y3R1cmVkIEV4dGVuZGVkIEZlYXR1cmVzMz0weGFjMDAwNDAwPE1EX0NMRUFSLElC UEIsU1RJQlAsQVJDSF9DQVAsU1NCRD4KICBYU0FWRSBGZWF0dXJlcz0weDE8WFNBVkVPUFQ+ CiAgSUEzMl9BUkNIX0NBUFM9MHg0ODxTS0lQX0wxREZMX1ZNRT4KICBBTUQgRXh0ZW5kZWQg RmVhdHVyZSBFeHRlbnNpb25zIElEIEVCWD0weDEwMGQwMDA8SUJQQixJQlJTLFNUSUJQLFNT QkQ+Ckh5cGVydmlzb3I6IE9yaWdpbiA9ICJLVk1LVk1LVk0iCnJlYWwgbWVtb3J5ICA9IDUx NTM5NjA3NTUyICg0OTE1MiBNQikKYXZhaWwgbWVtb3J5ID0gNTAwNjc4MDAwNjQgKDQ3NzQ4 IE1CKQpFdmVudCB0aW1lciAiTEFQSUMiIHF1YWxpdHkgNjAwCkFDUEkgQVBJQyBUYWJsZTog PEJPQ0hTICBCWFBDICAgID4KRnJlZUJTRC9TTVA6IE11bHRpcHJvY2Vzc29yIFN5c3RlbSBE ZXRlY3RlZDogMTIgQ1BVcwpGcmVlQlNEL1NNUDogMTIgcGFja2FnZShzKSB4IDEgY29yZShz KQpyYW5kb206IHJlZ2lzdGVyaW5nIGZhc3Qgc291cmNlIEludGVsIFNlY3VyZSBLZXkgUk5H CnJhbmRvbTogZmFzdCBwcm92aWRlcjogIkludGVsIFNlY3VyZSBLZXkgUk5HIgpyYW5kb206 IHVuYmxvY2tpbmcgZGV2aWNlLgppb2FwaWMwIDxWZXJzaW9uIDEuMT4gaXJxcyAwLTIzCkxh dW5jaGluZyBBUHM6IDEgNCA3IDkgNiA4IDMgMTAgMTEgNSAyCnJhbmRvbTogZW50cm9weSBk ZXZpY2UgZXh0ZXJuYWwgaW50ZXJmYWNlCmtiZDEgYXQga2JkbXV4MAp2dHZnYTA6IDxWVCBW R0EgZHJpdmVyPgprdm1jbG9jazA6IDxLVk0gcGFyYXZpcnR1YWwgY2xvY2s+ClRpbWVjb3Vu dGVyICJrdm1jbG9jayIgZnJlcXVlbmN5IDEwMDAwMDAwMDAgSHogcXVhbGl0eSA5NzUKa3Zt Y2xvY2swOiByZWdpc3RlcmVkIGFzIGEgdGltZS1vZi1kYXkgY2xvY2ssIHJlc29sdXRpb24g MC4wMDAwMDFzCnNtYmlvczA6IDxTeXN0ZW0gTWFuYWdlbWVudCBCSU9TPiBhdCBpb21lbSAw eGY1YTUwLTB4ZjVhNmUKc21iaW9zMDogVmVyc2lvbjogMi44LCBCQ0QgUmV2aXNpb246IDIu OAphZXNuaTA6IDxBRVMtQ0JDLEFFUy1DQ00sQUVTLUdDTSxBRVMtSUNNLEFFUy1YVFM+CmFj cGkwOiA8Qk9DSFMgQlhQQz4KYWNwaTA6IFBvd2VyIEJ1dHRvbiAoZml4ZWQpCmNwdTA6IDxB Q1BJIENQVT4gb24gYWNwaTAKYXRydGMwOiA8QVQgcmVhbHRpbWUgY2xvY2s+IHBvcnQgMHg3 MC0weDc3IGlycSA4IG9uIGFjcGkwCmF0cnRjMDogcmVnaXN0ZXJlZCBhcyBhIHRpbWUtb2Yt ZGF5IGNsb2NrLCByZXNvbHV0aW9uIDEuMDAwMDAwcwpFdmVudCB0aW1lciAiUlRDIiBmcmVx dWVuY3kgMzI3NjggSHogcXVhbGl0eSAwClRpbWVjb3VudGVyICJBQ1BJLWZhc3QiIGZyZXF1 ZW5jeSAzNTc5NTQ1IEh6IHF1YWxpdHkgOTAwCmFjcGlfdGltZXIwOiA8MjQtYml0IHRpbWVy IGF0IDMuNTc5NTQ1TUh6PiBwb3J0IDB4NjA4LTB4NjBiIG9uIGFjcGkwCnBjaWIwOiA8QUNQ SSBIb3N0LVBDSSBicmlkZ2U+IHBvcnQgMHhjZjgtMHhjZmYgb24gYWNwaTAKcGNpMDogPEFD UEkgUENJIGJ1cz4gb24gcGNpYjAKdmdhcGNpMDogPFZHQS1jb21wYXRpYmxlIGRpc3BsYXk+ IHBvcnQgMHhkMDQwLTB4ZDA1ZiBtZW0gMHhmNDAwMDAwMC0weGY3ZmZmZmZmLDB4ZjgwMDAw MDAtMHhmYmZmZmZmZiwweGZkMjEwMDAwLTB4ZmQyMTFmZmYgaXJxIDIxIGF0IGRldmljZSAx LjAgb24gcGNpMAp2Z2FwY2kwOiBCb290IHZpZGVvIGRldmljZQpwY2liMTogPEFDUEkgUENJ LVBDSSBicmlkZ2U+IG1lbSAweGZkMjEyMDAwLTB4ZmQyMTJmZmYgaXJxIDIyIGF0IGRldmlj ZSAyLjAgb24gcGNpMApwY2kxOiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liMQpwY2liMjogPEFD UEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZjMjAwMDAwLTB4ZmMyMDAwZmYgaXJxIDIyIGF0 IGRldmljZSAwLjAgb24gcGNpMQpwY2kyOiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liMgpwY2li MzogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjEzMDAwLTB4ZmQyMTNmZmYgaXJx IDIyIGF0IGRldmljZSAyLjEgb24gcGNpMApwY2kzOiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2li Mwp2aXJ0aW9fcGNpMDogPFZpcnRJTyBQQ0kgKG1vZGVybikgTmV0d29yayBhZGFwdGVyPiBt ZW0gMHhmZDA0MDAwMC0weGZkMDQwZmZmLDB4ZmU4MDAwMDAtMHhmZTgwM2ZmZiBpcnEgMjIg YXQgZGV2aWNlIDAuMCBvbiBwY2kzCnZ0bmV0MDogPFZpcnRJTyBOZXR3b3JraW5nIEFkYXB0 ZXI+IG9uIHZpcnRpb19wY2kwCnZ0bmV0MDogRXRoZXJuZXQgYWRkcmVzczogNTI6NTQ6NTg6 OTM6Yzc6ZWYKdnRuZXQwOiBuZXRtYXAgcXVldWVzL3Nsb3RzOiBUWCAxLzI1NiwgUlggMS8x MjgKMDAwLjAwMDA3NyBbIDQ1Ml0gdnRuZXRfbmV0bWFwX2F0dGFjaCAgICAgICB2dG5ldCBh dHRhY2hlZCB0eHE9MSwgdHhkPTI1NiByeHE9MSwgcnhkPTEyOApwY2liNDogPEFDUEkgUENJ LVBDSSBicmlkZ2U+IG1lbSAweGZkMjE0MDAwLTB4ZmQyMTRmZmYgaXJxIDIyIGF0IGRldmlj ZSAyLjIgb24gcGNpMApwY2k0OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liNAp4aGNpMDogPFhI Q0kgKGdlbmVyaWMpIFVTQiAzLjAgY29udHJvbGxlcj4gbWVtIDB4ZmNlMDAwMDAtMHhmY2Uw M2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDAuMCBvbiBwY2k0CnhoY2kwOiAzMiBieXRlcyBjb250 ZXh0IHNpemUsIDY0LWJpdCBETUEKdXNidXMwIG9uIHhoY2kwCnVzYnVzMDogNS4wR2JwcyBT dXBlciBTcGVlZCBVU0IgdjMuMApwY2liNTogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAw eGZkMjE1MDAwLTB4ZmQyMTVmZmYgaXJxIDIyIGF0IGRldmljZSAyLjMgb24gcGNpMApwY2k1 OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liNQp2aXJ0aW9fcGNpMTogPFZpcnRJTyBQQ0kgKG1v ZGVybikgU0NTSSBhZGFwdGVyPiBtZW0gMHhmY2MwMDAwMC0weGZjYzAwZmZmLDB4ZmU0MDAw MDAtMHhmZTQwM2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDAuMCBvbiBwY2k1CnZ0c2NzaTA6IDxW aXJ0SU8gU0NTSSBBZGFwdGVyPiBvbiB2aXJ0aW9fcGNpMQpwY2liNjogPEFDUEkgUENJLVBD SSBicmlkZ2U+IG1lbSAweGZkMjE2MDAwLTB4ZmQyMTZmZmYgaXJxIDIyIGF0IGRldmljZSAy LjQgb24gcGNpMApwY2k2OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liNgp2aXJ0aW9fcGNpMjog PFZpcnRJTyBQQ0kgKG1vZGVybikgQ29uc29sZSBhZGFwdGVyPiBtZW0gMHhmY2EwMDAwMC0w eGZjYTAwZmZmLDB4ZmUyMDAwMDAtMHhmZTIwM2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDAuMCBv biBwY2k2CnBjaWI3OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQyMTcwMDAtMHhm ZDIxN2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNSBvbiBwY2kwCnBjaTc6IDxBQ1BJIFBDSSBi dXM+IG9uIHBjaWI3CnZpcnRpb19wY2kzOiA8VmlydElPIFBDSSAobW9kZXJuKSBCYWxsb29u IGFkYXB0ZXI+IG1lbSAweGZlMDAwMDAwLTB4ZmUwMDNmZmYgaXJxIDIyIGF0IGRldmljZSAw LjAgb24gcGNpNwp2dGJhbGxvb24wOiA8VmlydElPIEJhbGxvb24gQWRhcHRlcj4gb24gdmly dGlvX3BjaTMKcGNpYjg6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhmZDIxODAwMC0w eGZkMjE4ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi42IG9uIHBjaTAKcGNpODogPEFDUEkgUENJ IGJ1cz4gb24gcGNpYjgKdmlydGlvX3BjaTQ6IDxWaXJ0SU8gUENJIChtb2Rlcm4pIEVudHJv cHkgYWRhcHRlcj4gbWVtIDB4ZmRlMDAwMDAtMHhmZGUwM2ZmZiBpcnEgMjIgYXQgZGV2aWNl IDAuMCBvbiBwY2k4CnBjaWI5OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQyMTkw MDAtMHhmZDIxOWZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNyBvbiBwY2kwCnBjaTk6IDxBQ1BJ IFBDSSBidXM+IG9uIHBjaWI5CmlzYWIwOiA8UENJLUlTQSBicmlkZ2U+IGF0IGRldmljZSAz MS4wIG9uIHBjaTAKaXNhMDogPElTQSBidXM+IG9uIGlzYWIwCmFoY2kwOiA8SW50ZWwgSUNI OSBBSENJIFNBVEEgY29udHJvbGxlcj4gcG9ydCAweGQwNjAtMHhkMDdmIG1lbSAweGZkMjFh MDAwLTB4ZmQyMWFmZmYgaXJxIDE2IGF0IGRldmljZSAzMS4yIG9uIHBjaTAKYWhjaTA6IEFI Q0kgdjEuMDAgd2l0aCA2IDEuNUdicHMgcG9ydHMsIFBvcnQgTXVsdGlwbGllciBub3Qgc3Vw cG9ydGVkCmFoY2ljaDA6IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgMCBvbiBhaGNpMAph aGNpY2gxOiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDEgb24gYWhjaTAKYWhjaWNoMjog PEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5lbCAyIG9uIGFoY2kwCmFoY2ljaDM6IDxBSENJIGNo YW5uZWw+IGF0IGNoYW5uZWwgMyBvbiBhaGNpMAphaGNpY2g0OiA8QUhDSSBjaGFubmVsPiBh dCBjaGFubmVsIDQgb24gYWhjaTAKYWhjaWNoNTogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5l bCA1IG9uIGFoY2kwCmFjcGlfc3lzY29udGFpbmVyMDogPFN5c3RlbSBDb250YWluZXI+IG9u IGFjcGkwCmFjcGlfc3lzY29udGFpbmVyMTogPFN5c3RlbSBDb250YWluZXI+IHBvcnQgMHhj ZDgtMHhjZTMgb24gYWNwaTAKYWNwaV9zeXNjb250YWluZXIyOiA8U3lzdGVtIENvbnRhaW5l cj4gcG9ydCAweDYyMC0weDYyZiBvbiBhY3BpMAphY3BpX3N5c2NvbnRhaW5lcjM6IDxTeXN0 ZW0gQ29udGFpbmVyPiBwb3J0IDB4Y2MwLTB4Y2Q3IG9uIGFjcGkwCnVhcnQwOiA8MTY1NTAg b3IgY29tcGF0aWJsZT4gcG9ydCAweDNmOC0weDNmZiBpcnEgNCBmbGFncyAweDEwIG9uIGFj cGkwCmF0a2JkYzA6IDxLZXlib2FyZCBjb250cm9sbGVyIChpODA0Mik+IHBvcnQgMHg2MCww eDY0IGlycSAxIG9uIGFjcGkwCmF0a2JkMDogPEFUIEtleWJvYXJkPiBpcnEgMSBvbiBhdGti ZGMwCmtiZDAgYXQgYXRrYmQwCmF0a2JkMDogW0dJQU5ULUxPQ0tFRF0KcHNtMDogPFBTLzIg TW91c2U+IGlycSAxMiBvbiBhdGtiZGMwCnBzbTA6IFtHSUFOVC1MT0NLRURdCldBUk5JTkc6 IERldmljZSAicHNtIiBpcyBHaWFudCBsb2NrZWQgYW5kIG1heSBiZSBkZWxldGVkIGJlZm9y ZSBGcmVlQlNEIDE1LjAuCnBzbTA6IG1vZGVsIEludGVsbGlNb3VzZSBFeHBsb3JlciwgZGV2 aWNlIElEIDQKb3JtMDogPElTQSBPcHRpb24gUk9NPiBhdCBpb21lbSAweGU5MDAwLTB4ZWZm ZmYgcG5waWQgT1JNMDAwMCBvbiBpc2EwCnZnYTA6IDxHZW5lcmljIElTQSBWR0E+IGF0IHBv cnQgMHgzYzAtMHgzZGYgaW9tZW0gMHhhMDAwMC0weGJmZmZmIHBucGlkIFBOUDA5MDAgb24g aXNhMAphdHRpbWVyMDogPEFUIHRpbWVyPiBhdCBwb3J0IDB4NDAgb24gaXNhMApUaW1lY291 bnRlciAiaTgyNTQiIGZyZXF1ZW5jeSAxMTkzMTgyIEh6IHF1YWxpdHkgMApFdmVudCB0aW1l ciAiaTgyNTQiIGZyZXF1ZW5jeSAxMTkzMTgyIEh6IHF1YWxpdHkgMTAwClRpbWVjb3VudGVy cyB0aWNrIGV2ZXJ5IDEwLjAwMCBtc2VjCnVnZW4wLjE6IDwoMHgxYjM2KSBYSENJIHJvb3Qg SFVCPiBhdCB1c2J1czAKdWh1YjAgb24gdXNidXMwCnVodWIwOiA8KDB4MWIzNikgWEhDSSBy b290IEhVQiwgY2xhc3MgOS8wLCByZXYgMy4wMC8xLjAwLCBhZGRyIDE+IG9uIHVzYnVzMApa RlMgZmlsZXN5c3RlbSB2ZXJzaW9uOiA1ClpGUyBzdG9yYWdlIHBvb2wgdmVyc2lvbjogZmVh dHVyZXMgc3VwcG9ydCAoNTAwMCkKVHJ5aW5nIHRvIG1vdW50IHJvb3QgZnJvbSB6ZnM6enJv b3QvUk9PVC8yMDI0LTEyLTI2LTE4LTIzIFtdLi4uCmRhMCBhdCB2dHNjc2kwIGJ1cyAwIHNj YnVzMCB0YXJnZXQgMCBsdW4gMApkYTA6IDxRRU1VIFFFTVUgSEFSRERJU0sgMi41Kz4gRml4 ZWQgRGlyZWN0IEFjY2VzcyBTUEMtMyBTQ1NJIGRldmljZQpkYTA6IDMwMC4wMDBNQi9zIHRy YW5zZmVycwpkYTA6IENvbW1hbmQgUXVldWVpbmcgZW5hYmxlZApkYTA6IDczNzI4ME1CICgx NTA5OTQ5NDQwIDUxMiBieXRlIHNlY3RvcnMpClJvb3QgbW91bnQgd2FpdGluZyBmb3I6IHVz YnVzMAp1aHViMDogMzAgcG9ydHMgd2l0aCAzMCByZW1vdmFibGUsIHNlbGYgcG93ZXJlZApH RU9NX0VMSTogRGV2aWNlIGRhMHAyLmVsaSBjcmVhdGVkLgpHRU9NX0VMSTogRW5jcnlwdGlv bjogQUVTLVhUUyAxMjgKR0VPTV9FTEk6ICAgICBDcnlwdG86IGFjY2VsZXJhdGVkIHNvZnR3 YXJlCmljaHNtYjA6IDxJbnRlbCA4MjgwMUkgKElDSDkpIFNNQnVzIGNvbnRyb2xsZXI+IHBv cnQgMHg3MDAtMHg3M2YgaXJxIDE2IGF0IGRldmljZSAzMS4zIG9uIHBjaTAKc21idXMwOiA8 U3lzdGVtIE1hbmFnZW1lbnQgQnVzPiBvbiBpY2hzbWIwCnZ0Y29uMDogPFZpcnRJTyBDb25z b2xlIEFkYXB0ZXI+IG9uIHZpcnRpb19wY2kyCnZ0cm5kMDogPFZpcnRJTyBFbnRyb3B5IEFk YXB0ZXI+IG9uIHZpcnRpb19wY2k0CnJhbmRvbTogcmVnaXN0ZXJpbmcgZmFzdCBzb3VyY2Ug VmlydElPIEVudHJvcHkgQWRhcHRlcgpsbzA6IGxpbmsgc3RhdGUgY2hhbmdlZCB0byBVUAp2 dG5ldDA6IGxpbmsgc3RhdGUgY2hhbmdlZCB0byBVUApTZWN1cml0eSBwb2xpY3kgbG9hZGVk OiBNQUMvbnRwZCAobWFjX250cGQpCldhaXRpbmcgKG1heCA2MCBzZWNvbmRzKSBmb3Igc3lz dGVtIHByb2Nlc3MgYHZubHJ1JyB0byBzdG9wLi4uIGRvbmUKV2FpdGluZyAobWF4IDYwIHNl Y29uZHMpIGZvciBzeXN0ZW0gcHJvY2VzcyBgc3luY2VyJyB0byBzdG9wLi4uIApTeW5jaW5n IGRpc2tzLCB2bm9kZXMgcmVtYWluaW5nLi4uIDAgMCBkb25lCkFsbCBidWZmZXJzIHN5bmNl ZC4KR0VPTV9FTEk6IERldmljZSBkYTBwMi5lbGkgZGVzdHJveWVkLgpHRU9NX0VMSTogRGV0 YWNoZWQgZGEwcDIuZWxpIG9uIGxhc3QgY2xvc2UuClVwdGltZTogM20zMHMKdWh1YjA6IGRl dGFjaGVkCi0tLTw8Qk9PVD4+LS0tCkNvcHlyaWdodCAoYykgMTk5Mi0yMDI0IFRoZSBGcmVl QlNEIFByb2plY3QuCkNvcHlyaWdodCAoYykgMTk3OSwgMTk4MCwgMTk4MywgMTk4NiwgMTk4 OCwgMTk4OSwgMTk5MSwgMTk5MiwgMTk5MywgMTk5NAoJVGhlIFJlZ2VudHMgb2YgdGhlIFVu aXZlcnNpdHkgb2YgQ2FsaWZvcm5pYS4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KRnJlZUJTRCBp cyBhIHJlZ2lzdGVyZWQgdHJhZGVtYXJrIG9mIFRoZSBGcmVlQlNEIEZvdW5kYXRpb24uCkZy ZWVCU0QgMTUuMC1DVVJSRU5UICMyMyBuMjc0MTgzLWJhMTkwNDkzN2Q5OiBUaHUgRGVjIDI2 IDE4OjE4OjIyIC0wMyAyMDI0CiAgICByb290QGlkYWhvLmFycmFraXMuY29tLmJyOi91c3Iv b2JqL3Vzci9zcmMvYW1kNjQuYW1kNjQvc3lzL0dFTkVSSUMtTk9ERUJVRyBhbWQ2NApGcmVl QlNEIGNsYW5nIHZlcnNpb24gMTkuMS41IChodHRwczovL2dpdGh1Yi5jb20vbGx2bS9sbHZt LXByb2plY3QuZ2l0IGxsdm1vcmctMTkuMS41LTAtZ2FiNGI1YTJkYjU4MikKVlQodmdhKTog dGV4dCA4MHgyNQpDUFU6IEludGVsKFIpIFhlb24oUikgQ1BVIEU1LTI2OTcgdjMgQCAyLjYw R0h6ICgyNjAwLjEwLU1IeiBLOC1jbGFzcyBDUFUpCiAgT3JpZ2luPSJHZW51aW5lSW50ZWwi ICBJZD0weDMwNmYyICBGYW1pbHk9MHg2ICBNb2RlbD0weDNmICBTdGVwcGluZz0yCiAgRmVh dHVyZXM9MHhmODNmYmZmPEZQVSxWTUUsREUsUFNFLFRTQyxNU1IsUEFFLE1DRSxDWDgsQVBJ QyxTRVAsTVRSUixQR0UsTUNBLENNT1YsUEFULFBTRTM2LE1NWCxGWFNSLFNTRSxTU0UyLFNT PgogIEZlYXR1cmVzMj0weGZmZmEzMjAzPFNTRTMsUENMTVVMUURRLFNTU0UzLEZNQSxDWDE2 LFBDSUQsU1NFNC4xLFNTRTQuMix4MkFQSUMsTU9WQkUsUE9QQ05ULFRTQ0RMVCxBRVNOSSxY U0FWRSxPU1hTQVZFLEFWWCxGMTZDLFJEUkFORCxIVj4KICBBTUQgRmVhdHVyZXM9MHgyYzEw MDgwMDxTWVNDQUxMLE5YLFBhZ2UxR0IsUkRUU0NQLExNPgogIEFNRCBGZWF0dXJlczI9MHgy MTxMQUhGLEFCTT4KICBTdHJ1Y3R1cmVkIEV4dGVuZGVkIEZlYXR1cmVzPTB4N2FiPEZTR1NC QVNFLFRTQ0FESixCTUkxLEFWWDIsU01FUCxCTUkyLEVSTVMsSU5WUENJRD4KICBTdHJ1Y3R1 cmVkIEV4dGVuZGVkIEZlYXR1cmVzMj0weDQ8VU1JUD4KICBTdHJ1Y3R1cmVkIEV4dGVuZGVk IEZlYXR1cmVzMz0weGFjMDAwNDAwPE1EX0NMRUFSLElCUEIsU1RJQlAsQVJDSF9DQVAsU1NC RD4KICBYU0FWRSBGZWF0dXJlcz0weDE8WFNBVkVPUFQ+CiAgSUEzMl9BUkNIX0NBUFM9MHg0 ODxTS0lQX0wxREZMX1ZNRT4KICBBTUQgRXh0ZW5kZWQgRmVhdHVyZSBFeHRlbnNpb25zIElE IEVCWD0weDEwMGQwMDA8SUJQQixJQlJTLFNUSUJQLFNTQkQ+Ckh5cGVydmlzb3I6IE9yaWdp biA9ICJLVk1LVk1LVk0iCnJlYWwgbWVtb3J5ICA9IDUxNTM5NjA3NTUyICg0OTE1MiBNQikK YXZhaWwgbWVtb3J5ID0gNTAwNjc4MDAwNjQgKDQ3NzQ4IE1CKQpFdmVudCB0aW1lciAiTEFQ SUMiIHF1YWxpdHkgNjAwCkFDUEkgQVBJQyBUYWJsZTogPEJPQ0hTICBCWFBDICAgID4KRnJl ZUJTRC9TTVA6IE11bHRpcHJvY2Vzc29yIFN5c3RlbSBEZXRlY3RlZDogMTIgQ1BVcwpGcmVl QlNEL1NNUDogMTIgcGFja2FnZShzKSB4IDEgY29yZShzKQpyYW5kb206IHJlZ2lzdGVyaW5n IGZhc3Qgc291cmNlIEludGVsIFNlY3VyZSBLZXkgUk5HCnJhbmRvbTogZmFzdCBwcm92aWRl cjogIkludGVsIFNlY3VyZSBLZXkgUk5HIgpyYW5kb206IHVuYmxvY2tpbmcgZGV2aWNlLgpp b2FwaWMwIDxWZXJzaW9uIDEuMT4gaXJxcyAwLTIzCkxhdW5jaGluZyBBUHM6IDQgMTEgNyAx IDkgMiA1IDYgOCAzIDEwCnJhbmRvbTogZW50cm9weSBkZXZpY2UgZXh0ZXJuYWwgaW50ZXJm YWNlCmtiZDEgYXQga2JkbXV4MAp2dHZnYTA6IDxWVCBWR0EgZHJpdmVyPgprdm1jbG9jazA6 IDxLVk0gcGFyYXZpcnR1YWwgY2xvY2s+ClRpbWVjb3VudGVyICJrdm1jbG9jayIgZnJlcXVl bmN5IDEwMDAwMDAwMDAgSHogcXVhbGl0eSA5NzUKa3ZtY2xvY2swOiByZWdpc3RlcmVkIGFz IGEgdGltZS1vZi1kYXkgY2xvY2ssIHJlc29sdXRpb24gMC4wMDAwMDFzCnNtYmlvczA6IDxT eXN0ZW0gTWFuYWdlbWVudCBCSU9TPiBhdCBpb21lbSAweGY1YTUwLTB4ZjVhNmUKc21iaW9z MDogVmVyc2lvbjogMi44LCBCQ0QgUmV2aXNpb246IDIuOAphZXNuaTA6IDxBRVMtQ0JDLEFF Uy1DQ00sQUVTLUdDTSxBRVMtSUNNLEFFUy1YVFM+CmFjcGkwOiA8Qk9DSFMgQlhQQz4KYWNw aTA6IFBvd2VyIEJ1dHRvbiAoZml4ZWQpCmNwdTA6IDxBQ1BJIENQVT4gb24gYWNwaTAKYXRy dGMwOiA8QVQgcmVhbHRpbWUgY2xvY2s+IHBvcnQgMHg3MC0weDc3IGlycSA4IG9uIGFjcGkw CmF0cnRjMDogcmVnaXN0ZXJlZCBhcyBhIHRpbWUtb2YtZGF5IGNsb2NrLCByZXNvbHV0aW9u IDEuMDAwMDAwcwpFdmVudCB0aW1lciAiUlRDIiBmcmVxdWVuY3kgMzI3NjggSHogcXVhbGl0 eSAwClRpbWVjb3VudGVyICJBQ1BJLWZhc3QiIGZyZXF1ZW5jeSAzNTc5NTQ1IEh6IHF1YWxp dHkgOTAwCmFjcGlfdGltZXIwOiA8MjQtYml0IHRpbWVyIGF0IDMuNTc5NTQ1TUh6PiBwb3J0 IDB4NjA4LTB4NjBiIG9uIGFjcGkwCnBjaWIwOiA8QUNQSSBIb3N0LVBDSSBicmlkZ2U+IHBv cnQgMHhjZjgtMHhjZmYgb24gYWNwaTAKcGNpMDogPEFDUEkgUENJIGJ1cz4gb24gcGNpYjAK dmdhcGNpMDogPFZHQS1jb21wYXRpYmxlIGRpc3BsYXk+IHBvcnQgMHhkMDQwLTB4ZDA1ZiBt ZW0gMHhmNDAwMDAwMC0weGY3ZmZmZmZmLDB4ZjgwMDAwMDAtMHhmYmZmZmZmZiwweGZkMjEw MDAwLTB4ZmQyMTFmZmYgaXJxIDIxIGF0IGRldmljZSAxLjAgb24gcGNpMAp2Z2FwY2kwOiBC b290IHZpZGVvIGRldmljZQpwY2liMTogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZk MjEyMDAwLTB4ZmQyMTJmZmYgaXJxIDIyIGF0IGRldmljZSAyLjAgb24gcGNpMApwY2liMjog PEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjEzMDAwLTB4ZmQyMTNmZmYgaXJxIDIy IGF0IGRldmljZSAyLjEgb24gcGNpMApwY2liMzogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1l bSAweGZkMjE0MDAwLTB4ZmQyMTRmZmYgaXJxIDIyIGF0IGRldmljZSAyLjIgb24gcGNpMApw Y2liNDogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjE1MDAwLTB4ZmQyMTVmZmYg aXJxIDIyIGF0IGRldmljZSAyLjMgb24gcGNpMApwY2liNTogPEFDUEkgUENJLVBDSSBicmlk Z2U+IG1lbSAweGZkMjE2MDAwLTB4ZmQyMTZmZmYgaXJxIDIyIGF0IGRldmljZSAyLjQgb24g cGNpMApwY2liNjogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjE3MDAwLTB4ZmQy MTdmZmYgaXJxIDIyIGF0IGRldmljZSAyLjUgb24gcGNpMApwY2liNzogPEFDUEkgUENJLVBD SSBicmlkZ2U+IG1lbSAweGZkMjE4MDAwLTB4ZmQyMThmZmYgaXJxIDIyIGF0IGRldmljZSAy LjYgb24gcGNpMApwY2liODogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjE5MDAw LTB4ZmQyMTlmZmYgaXJxIDIyIGF0IGRldmljZSAyLjcgb24gcGNpMAppc2FiMDogPFBDSS1J U0EgYnJpZGdlPiBhdCBkZXZpY2UgMzEuMCBvbiBwY2kwCmlzYTA6IDxJU0EgYnVzPiBvbiBp c2FiMAphaGNpMDogPEludGVsIElDSDkgQUhDSSBTQVRBIGNvbnRyb2xsZXI+IHBvcnQgMHhk MDYwLTB4ZDA3ZiBtZW0gMHhmZDIxYTAwMC0weGZkMjFhZmZmIGlycSAxNiBhdCBkZXZpY2Ug MzEuMiBvbiBwY2kwCmFoY2kwOiBBSENJIHYxLjAwIHdpdGggNiAxLjVHYnBzIHBvcnRzLCBQ b3J0IE11bHRpcGxpZXIgbm90IHN1cHBvcnRlZAphaGNpY2gwOiA8QUhDSSBjaGFubmVsPiBh dCBjaGFubmVsIDAgb24gYWhjaTAKYWhjaWNoMTogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5l bCAxIG9uIGFoY2kwCmFoY2ljaDI6IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgMiBvbiBh aGNpMAphaGNpY2gzOiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDMgb24gYWhjaTAKYWhj aWNoNDogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5lbCA0IG9uIGFoY2kwCmFoY2ljaDU6IDxB SENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgNSBvbiBhaGNpMAphY3BpX3N5c2NvbnRhaW5lcjA6 IDxTeXN0ZW0gQ29udGFpbmVyPiBvbiBhY3BpMAphY3BpX3N5c2NvbnRhaW5lcjE6IDxTeXN0 ZW0gQ29udGFpbmVyPiBwb3J0IDB4Y2Q4LTB4Y2UzIG9uIGFjcGkwCmFjcGlfc3lzY29udGFp bmVyMjogPFN5c3RlbSBDb250YWluZXI+IHBvcnQgMHg2MjAtMHg2MmYgb24gYWNwaTAKYWNw aV9zeXNjb250YWluZXIzOiA8U3lzdGVtIENvbnRhaW5lcj4gcG9ydCAweGNjMC0weGNkNyBv biBhY3BpMAp1YXJ0MDogPDE2NTUwIG9yIGNvbXBhdGlibGU+IHBvcnQgMHgzZjgtMHgzZmYg aXJxIDQgZmxhZ3MgMHgxMCBvbiBhY3BpMAphdGtiZGMwOiA8S2V5Ym9hcmQgY29udHJvbGxl ciAoaTgwNDIpPiBwb3J0IDB4NjAsMHg2NCBpcnEgMSBvbiBhY3BpMAphdGtiZDA6IDxBVCBL ZXlib2FyZD4gaXJxIDEgb24gYXRrYmRjMAprYmQwIGF0IGF0a2JkMAphdGtiZDA6IFtHSUFO VC1MT0NLRURdCnBzbTA6IDxQUy8yIE1vdXNlPiBpcnEgMTIgb24gYXRrYmRjMApwc20wOiBb R0lBTlQtTE9DS0VEXQpXQVJOSU5HOiBEZXZpY2UgInBzbSIgaXMgR2lhbnQgbG9ja2VkIGFu ZCBtYXkgYmUgZGVsZXRlZCBiZWZvcmUgRnJlZUJTRCAxNS4wLgpwc20wOiBtb2RlbCBJbnRl bGxpTW91c2UgRXhwbG9yZXIsIGRldmljZSBJRCA0Cm9ybTA6IDxJU0EgT3B0aW9uIFJPTT4g YXQgaW9tZW0gMHhlOTAwMC0weGVmZmZmIHBucGlkIE9STTAwMDAgb24gaXNhMAp2Z2EwOiA8 R2VuZXJpYyBJU0EgVkdBPiBhdCBwb3J0IDB4M2MwLTB4M2RmIGlvbWVtIDB4YTAwMDAtMHhi ZmZmZiBwbnBpZCBQTlAwOTAwIG9uIGlzYTAKYXR0aW1lcjA6IDxBVCB0aW1lcj4gYXQgcG9y dCAweDQwIG9uIGlzYTAKVGltZWNvdW50ZXIgImk4MjU0IiBmcmVxdWVuY3kgMTE5MzE4MiBI eiBxdWFsaXR5IDAKRXZlbnQgdGltZXIgImk4MjU0IiBmcmVxdWVuY3kgMTE5MzE4MiBIeiBx dWFsaXR5IDEwMApUaW1lY291bnRlcnMgdGljayBldmVyeSAxMC4wMDAgbXNlYwpaRlMgZmls ZXN5c3RlbSB2ZXJzaW9uOiA1ClpGUyBzdG9yYWdlIHBvb2wgdmVyc2lvbjogZmVhdHVyZXMg c3VwcG9ydCAoNTAwMCkKVHJ5aW5nIHRvIG1vdW50IHJvb3QgZnJvbSB6ZnM6enJvb3QvUk9P VC8yMDI0LTEyLTI2LTE4LTE4IFtdLi4uClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQg dGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKTW91bnRpbmcgZnJvbSB6ZnM6enJvb3QvUk9P VC8yMDI0LTEyLTI2LTE4LTE4IGZhaWxlZCB3aXRoIGVycm9yIDU7IHJldHJ5aW5nIGZvciAz IG1vcmUgc2Vjb25kcwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxh YmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wg bGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9v bCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBw b29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhl IHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0 aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5k IHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZp bmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3Qg ZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5v dCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fu bm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBD YW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6 IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElD RTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9U SUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xhcmlzOiBO T1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNvbGFyaXM6 IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcKU29sYXJp czogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290JwpTb2xh cmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJvb3QnClNv bGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6cm9vdCcK U29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3IgJ3pyb290 JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZvciAnenJv b3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwgZm9yICd6 cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJlbCBmb3Ig J3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxhYmVsIGZv ciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wgbGFiZWwg Zm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9vbCBsYWJl bCBmb3IgJ3pyb290JwpTb2xhcmlzOiBOT1RJQ0U6IENhbm5vdCBmaW5kIHRoZSBwb29sIGxh YmVsIGZvciAnenJvb3QnClNvbGFyaXM6IE5PVElDRTogQ2Fubm90IGZpbmQgdGhlIHBvb2wg bGFiZWwgZm9yICd6cm9vdCcKU29sYXJpczogTk9USUNFOiBDYW5ub3QgZmluZCB0aGUgcG9v bCBsYWJlbCBmb3IgJ3pyb290JwpNb3VudGluZyBmcm9tIHpmczp6cm9vdC9ST09ULzIwMjQt MTItMjYtMTgtMTggZmFpbGVkIHdpdGggZXJyb3IgNS4KCkxvYWRlciB2YXJpYWJsZXM6CiAg dmZzLnJvb3QubW91bnRmcm9tPXpmczp6cm9vdC9ST09ULzIwMjQtMTItMjYtMTgtMTgKCk1h bnVhbCByb290IGZpbGVzeXN0ZW0gc3BlY2lmaWNhdGlvbjoKICA8ZnN0eXBlPjo8ZGV2aWNl PiBbb3B0aW9uc10KICAgICAgTW91bnQgPGRldmljZT4gdXNpbmcgZmlsZXN5c3RlbSA8ZnN0 eXBlPgogICAgICBhbmQgd2l0aCB0aGUgc3BlY2lmaWVkIChvcHRpb25hbCkgb3B0aW9uIGxp c3QuCgogICAgZWcuIHVmczovZGV2L2RhMHMxYQogICAgICAgIHpmczp6cm9vdC9ST09UL2Rl ZmF1bHQKICAgICAgICBjZDk2NjA6L2Rldi9jZDAgcm8KICAgICAgICAgICh3aGljaCBpcyBl cXVpdmFsZW50IHRvOiBtb3VudCAtdCBjZDk2NjAgLW8gcm8gL2Rldi9jZDAgLykKCiAgPyAg ICAgICAgICAgICAgIExpc3QgdmFsaWQgZGlzayBib290IGRldmljZXMKICAuICAgICAgICAg ICAgICAgWWllbGQgMSBzZWNvbmQgKGZvciBiYWNrZ3JvdW5kIHRhc2tzKQogIDxlbXB0eSBs aW5lPiAgICBBYm9ydCBtYW51YWwgaW5wdXQKCm1vdW50cm9vdD4gCkxpc3Qgb2YgR0VPTSBt YW5hZ2VkIGRpc2sgZGV2aWNlczoKICAKCm1vdW50cm9vdD4gcGFuaWM6IG1vdW50cm9vdDog dW5hYmxlIHRvIChyZS0pbW91bnQgcm9vdC4KY3B1aWQgPSAwCnRpbWUgPSAxMApLREI6IHN0 YWNrIGJhY2t0cmFjZToKZGJfdHJhY2Vfc2VsZl93cmFwcGVyKCkgYXQgZGJfdHJhY2Vfc2Vs Zl93cmFwcGVyKzB4MmIvZnJhbWUgMHhmZmZmZmUwMTJmNjA1YjYwCnZwYW5pYygpIGF0IHZw YW5pYysweDEzNi9mcmFtZSAweGZmZmZmZTAxMmY2MDVjOTAKcGFuaWMoKSBhdCBwYW5pYysw eDQzL2ZyYW1lIDB4ZmZmZmZlMDEyZjYwNWNmMAp2ZnNfbW91bnRyb290KCkgYXQgdmZzX21v dW50cm9vdCsweDFjYmMvZnJhbWUgMHhmZmZmZmUwMTJmNjA1ZTYwCnN0YXJ0X2luaXQoKSBh dCBzdGFydF9pbml0KzB4MjMvZnJhbWUgMHhmZmZmZmUwMTJmNjA1ZWYwCmZvcmtfZXhpdCgp IGF0IGZvcmtfZXhpdCsweDdiL2ZyYW1lIDB4ZmZmZmZlMDEyZjYwNWYzMApmb3JrX3RyYW1w b2xpbmUoKSBhdCBmb3JrX3RyYW1wb2xpbmUrMHhlL2ZyYW1lIDB4ZmZmZmZlMDEyZjYwNWYz MAotLS0gdHJhcCAweGMsIHJpcCA9IDB4MjNlMGMwLCByc3AgPSAweDgyMDg3NzVlOCwgcmJw ID0gMHg4MjA4NzdiZjAgLS0tCktEQjogZW50ZXI6IHBhbmljCi0tLTw8Qk9PVD4+LS0tCkNv cHlyaWdodCAoYykgMTk5Mi0yMDI0IFRoZSBGcmVlQlNEIFByb2plY3QuCkNvcHlyaWdodCAo YykgMTk3OSwgMTk4MCwgMTk4MywgMTk4NiwgMTk4OCwgMTk4OSwgMTk5MSwgMTk5MiwgMTk5 MywgMTk5NAoJVGhlIFJlZ2VudHMgb2YgdGhlIFVuaXZlcnNpdHkgb2YgQ2FsaWZvcm5pYS4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KRnJlZUJTRCBpcyBhIHJlZ2lzdGVyZWQgdHJhZGVtYXJr IG9mIFRoZSBGcmVlQlNEIEZvdW5kYXRpb24uCkZyZWVCU0QgMTUuMC1DVVJSRU5UICMyMiBu Mjc0MTgyLTkzOGU0YjEzMWM0OiBUaHUgRGVjIDI2IDE4OjEwOjEyIC0wMyAyMDI0CiAgICBy b290QGlkYWhvLmFycmFraXMuY29tLmJyOi91c3Ivb2JqL3Vzci9zcmMvYW1kNjQuYW1kNjQv c3lzL0dFTkVSSUMtTk9ERUJVRyBhbWQ2NApGcmVlQlNEIGNsYW5nIHZlcnNpb24gMTkuMS41 IChodHRwczovL2dpdGh1Yi5jb20vbGx2bS9sbHZtLXByb2plY3QuZ2l0IGxsdm1vcmctMTku MS41LTAtZ2FiNGI1YTJkYjU4MikKVlQodmdhKTogdGV4dCA4MHgyNQpDUFU6IEludGVsKFIp IFhlb24oUikgQ1BVIEU1LTI2OTcgdjMgQCAyLjYwR0h6ICgyNjAwLjEyLU1IeiBLOC1jbGFz cyBDUFUpCiAgT3JpZ2luPSJHZW51aW5lSW50ZWwiICBJZD0weDMwNmYyICBGYW1pbHk9MHg2 ICBNb2RlbD0weDNmICBTdGVwcGluZz0yCiAgRmVhdHVyZXM9MHhmODNmYmZmPEZQVSxWTUUs REUsUFNFLFRTQyxNU1IsUEFFLE1DRSxDWDgsQVBJQyxTRVAsTVRSUixQR0UsTUNBLENNT1Ys UEFULFBTRTM2LE1NWCxGWFNSLFNTRSxTU0UyLFNTPgogIEZlYXR1cmVzMj0weGZmZmEzMjAz PFNTRTMsUENMTVVMUURRLFNTU0UzLEZNQSxDWDE2LFBDSUQsU1NFNC4xLFNTRTQuMix4MkFQ SUMsTU9WQkUsUE9QQ05ULFRTQ0RMVCxBRVNOSSxYU0FWRSxPU1hTQVZFLEFWWCxGMTZDLFJE UkFORCxIVj4KICBBTUQgRmVhdHVyZXM9MHgyYzEwMDgwMDxTWVNDQUxMLE5YLFBhZ2UxR0Is UkRUU0NQLExNPgogIEFNRCBGZWF0dXJlczI9MHgyMTxMQUhGLEFCTT4KICBTdHJ1Y3R1cmVk IEV4dGVuZGVkIEZlYXR1cmVzPTB4N2FiPEZTR1NCQVNFLFRTQ0FESixCTUkxLEFWWDIsU01F UCxCTUkyLEVSTVMsSU5WUENJRD4KICBTdHJ1Y3R1cmVkIEV4dGVuZGVkIEZlYXR1cmVzMj0w eDQ8VU1JUD4KICBTdHJ1Y3R1cmVkIEV4dGVuZGVkIEZlYXR1cmVzMz0weGFjMDAwNDAwPE1E X0NMRUFSLElCUEIsU1RJQlAsQVJDSF9DQVAsU1NCRD4KICBYU0FWRSBGZWF0dXJlcz0weDE8 WFNBVkVPUFQ+CiAgSUEzMl9BUkNIX0NBUFM9MHg0ODxTS0lQX0wxREZMX1ZNRT4KICBBTUQg RXh0ZW5kZWQgRmVhdHVyZSBFeHRlbnNpb25zIElEIEVCWD0weDEwMGQwMDA8SUJQQixJQlJT LFNUSUJQLFNTQkQ+Ckh5cGVydmlzb3I6IE9yaWdpbiA9ICJLVk1LVk1LVk0iCnJlYWwgbWVt b3J5ICA9IDUxNTM5NjA3NTUyICg0OTE1MiBNQikKYXZhaWwgbWVtb3J5ID0gNTAwNjc4MDAw NjQgKDQ3NzQ4IE1CKQpFdmVudCB0aW1lciAiTEFQSUMiIHF1YWxpdHkgNjAwCkFDUEkgQVBJ QyBUYWJsZTogPEJPQ0hTICBCWFBDICAgID4KRnJlZUJTRC9TTVA6IE11bHRpcHJvY2Vzc29y IFN5c3RlbSBEZXRlY3RlZDogMTIgQ1BVcwpGcmVlQlNEL1NNUDogMTIgcGFja2FnZShzKSB4 IDEgY29yZShzKQpyYW5kb206IHJlZ2lzdGVyaW5nIGZhc3Qgc291cmNlIEludGVsIFNlY3Vy ZSBLZXkgUk5HCnJhbmRvbTogZmFzdCBwcm92aWRlcjogIkludGVsIFNlY3VyZSBLZXkgUk5H IgpyYW5kb206IHVuYmxvY2tpbmcgZGV2aWNlLgppb2FwaWMwIDxWZXJzaW9uIDEuMT4gaXJx cyAwLTIzCkxhdW5jaGluZyBBUHM6IDQgNyA1IDggMTAgMTEgMiAxIDYgMyA5CnJhbmRvbTog ZW50cm9weSBkZXZpY2UgZXh0ZXJuYWwgaW50ZXJmYWNlCmtiZDEgYXQga2JkbXV4MAp2dHZn YTA6IDxWVCBWR0EgZHJpdmVyPgprdm1jbG9jazA6IDxLVk0gcGFyYXZpcnR1YWwgY2xvY2s+ ClRpbWVjb3VudGVyICJrdm1jbG9jayIgZnJlcXVlbmN5IDEwMDAwMDAwMDAgSHogcXVhbGl0 eSA5NzUKa3ZtY2xvY2swOiByZWdpc3RlcmVkIGFzIGEgdGltZS1vZi1kYXkgY2xvY2ssIHJl c29sdXRpb24gMC4wMDAwMDFzCnNtYmlvczA6IDxTeXN0ZW0gTWFuYWdlbWVudCBCSU9TPiBh dCBpb21lbSAweGY1YTUwLTB4ZjVhNmUKc21iaW9zMDogVmVyc2lvbjogMi44LCBCQ0QgUmV2 aXNpb246IDIuOAphZXNuaTA6IDxBRVMtQ0JDLEFFUy1DQ00sQUVTLUdDTSxBRVMtSUNNLEFF Uy1YVFM+CmFjcGkwOiA8Qk9DSFMgQlhQQz4KYWNwaTA6IFBvd2VyIEJ1dHRvbiAoZml4ZWQp CmNwdTA6IDxBQ1BJIENQVT4gb24gYWNwaTAKYXRydGMwOiA8QVQgcmVhbHRpbWUgY2xvY2s+ IHBvcnQgMHg3MC0weDc3IGlycSA4IG9uIGFjcGkwCmF0cnRjMDogcmVnaXN0ZXJlZCBhcyBh IHRpbWUtb2YtZGF5IGNsb2NrLCByZXNvbHV0aW9uIDEuMDAwMDAwcwpFdmVudCB0aW1lciAi UlRDIiBmcmVxdWVuY3kgMzI3NjggSHogcXVhbGl0eSAwClRpbWVjb3VudGVyICJBQ1BJLWZh c3QiIGZyZXF1ZW5jeSAzNTc5NTQ1IEh6IHF1YWxpdHkgOTAwCmFjcGlfdGltZXIwOiA8MjQt Yml0IHRpbWVyIGF0IDMuNTc5NTQ1TUh6PiBwb3J0IDB4NjA4LTB4NjBiIG9uIGFjcGkwCnBj aWIwOiA8QUNQSSBIb3N0LVBDSSBicmlkZ2U+IHBvcnQgMHhjZjgtMHhjZmYgb24gYWNwaTAK cGNpMDogPEFDUEkgUENJIGJ1cz4gb24gcGNpYjAKdmdhcGNpMDogPFZHQS1jb21wYXRpYmxl IGRpc3BsYXk+IHBvcnQgMHhkMDQwLTB4ZDA1ZiBtZW0gMHhmNDAwMDAwMC0weGY3ZmZmZmZm LDB4ZjgwMDAwMDAtMHhmYmZmZmZmZiwweGZkMjEwMDAwLTB4ZmQyMTFmZmYgaXJxIDIxIGF0 IGRldmljZSAxLjAgb24gcGNpMAp2Z2FwY2kwOiBCb290IHZpZGVvIGRldmljZQpwY2liMTog PEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjEyMDAwLTB4ZmQyMTJmZmYgaXJxIDIy IGF0IGRldmljZSAyLjAgb24gcGNpMApwY2kxOiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liMQpw Y2liMjogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZjMjAwMDAwLTB4ZmMyMDAwZmYg aXJxIDIyIGF0IGRldmljZSAwLjAgb24gcGNpMQpwY2kyOiA8QUNQSSBQQ0kgYnVzPiBvbiBw Y2liMgpwY2liMzogPEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjEzMDAwLTB4ZmQy MTNmZmYgaXJxIDIyIGF0IGRldmljZSAyLjEgb24gcGNpMApwY2kzOiA8QUNQSSBQQ0kgYnVz PiBvbiBwY2liMwp2aXJ0aW9fcGNpMDogPFZpcnRJTyBQQ0kgKG1vZGVybikgTmV0d29yayBh ZGFwdGVyPiBtZW0gMHhmZDA0MDAwMC0weGZkMDQwZmZmLDB4ZmU4MDAwMDAtMHhmZTgwM2Zm ZiBpcnEgMjIgYXQgZGV2aWNlIDAuMCBvbiBwY2kzCnZ0bmV0MDogPFZpcnRJTyBOZXR3b3Jr aW5nIEFkYXB0ZXI+IG9uIHZpcnRpb19wY2kwCnZ0bmV0MDogRXRoZXJuZXQgYWRkcmVzczog NTI6NTQ6NTg6OTM6Yzc6ZWYKdnRuZXQwOiBuZXRtYXAgcXVldWVzL3Nsb3RzOiBUWCAxLzI1 NiwgUlggMS8xMjgKMDAwLjAwMDA3NyBbIDQ1Ml0gdnRuZXRfbmV0bWFwX2F0dGFjaCAgICAg ICB2dG5ldCBhdHRhY2hlZCB0eHE9MSwgdHhkPTI1NiByeHE9MSwgcnhkPTEyOApwY2liNDog PEFDUEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjE0MDAwLTB4ZmQyMTRmZmYgaXJxIDIy IGF0IGRldmljZSAyLjIgb24gcGNpMApwY2k0OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liNAp4 aGNpMDogPFhIQ0kgKGdlbmVyaWMpIFVTQiAzLjAgY29udHJvbGxlcj4gbWVtIDB4ZmNlMDAw MDAtMHhmY2UwM2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDAuMCBvbiBwY2k0CnhoY2kwOiAzMiBi eXRlcyBjb250ZXh0IHNpemUsIDY0LWJpdCBETUEKdXNidXMwIG9uIHhoY2kwCnVzYnVzMDog NS4wR2JwcyBTdXBlciBTcGVlZCBVU0IgdjMuMApwY2liNTogPEFDUEkgUENJLVBDSSBicmlk Z2U+IG1lbSAweGZkMjE1MDAwLTB4ZmQyMTVmZmYgaXJxIDIyIGF0IGRldmljZSAyLjMgb24g cGNpMApwY2k1OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liNQp2aXJ0aW9fcGNpMTogPFZpcnRJ TyBQQ0kgKG1vZGVybikgU0NTSSBhZGFwdGVyPiBtZW0gMHhmY2MwMDAwMC0weGZjYzAwZmZm LDB4ZmU0MDAwMDAtMHhmZTQwM2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDAuMCBvbiBwY2k1CnZ0 c2NzaTA6IDxWaXJ0SU8gU0NTSSBBZGFwdGVyPiBvbiB2aXJ0aW9fcGNpMQpwY2liNjogPEFD UEkgUENJLVBDSSBicmlkZ2U+IG1lbSAweGZkMjE2MDAwLTB4ZmQyMTZmZmYgaXJxIDIyIGF0 IGRldmljZSAyLjQgb24gcGNpMApwY2k2OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liNgp2aXJ0 aW9fcGNpMjogPFZpcnRJTyBQQ0kgKG1vZGVybikgQ29uc29sZSBhZGFwdGVyPiBtZW0gMHhm Y2EwMDAwMC0weGZjYTAwZmZmLDB4ZmUyMDAwMDAtMHhmZTIwM2ZmZiBpcnEgMjIgYXQgZGV2 aWNlIDAuMCBvbiBwY2k2CnBjaWI3OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVtIDB4ZmQy MTcwMDAtMHhmZDIxN2ZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNSBvbiBwY2kwCnBjaTc6IDxB Q1BJIFBDSSBidXM+IG9uIHBjaWI3CnZpcnRpb19wY2kzOiA8VmlydElPIFBDSSAobW9kZXJu KSBCYWxsb29uIGFkYXB0ZXI+IG1lbSAweGZlMDAwMDAwLTB4ZmUwMDNmZmYgaXJxIDIyIGF0 IGRldmljZSAwLjAgb24gcGNpNwp2dGJhbGxvb24wOiA8VmlydElPIEJhbGxvb24gQWRhcHRl cj4gb24gdmlydGlvX3BjaTMKcGNpYjg6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBtZW0gMHhm ZDIxODAwMC0weGZkMjE4ZmZmIGlycSAyMiBhdCBkZXZpY2UgMi42IG9uIHBjaTAKcGNpODog PEFDUEkgUENJIGJ1cz4gb24gcGNpYjgKdmlydGlvX3BjaTQ6IDxWaXJ0SU8gUENJIChtb2Rl cm4pIEVudHJvcHkgYWRhcHRlcj4gbWVtIDB4ZmRlMDAwMDAtMHhmZGUwM2ZmZiBpcnEgMjIg YXQgZGV2aWNlIDAuMCBvbiBwY2k4CnBjaWI5OiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gbWVt IDB4ZmQyMTkwMDAtMHhmZDIxOWZmZiBpcnEgMjIgYXQgZGV2aWNlIDIuNyBvbiBwY2kwCnBj aTk6IDxBQ1BJIFBDSSBidXM+IG9uIHBjaWI5CmlzYWIwOiA8UENJLUlTQSBicmlkZ2U+IGF0 IGRldmljZSAzMS4wIG9uIHBjaTAKaXNhMDogPElTQSBidXM+IG9uIGlzYWIwCmFoY2kwOiA8 SW50ZWwgSUNIOSBBSENJIFNBVEEgY29udHJvbGxlcj4gcG9ydCAweGQwNjAtMHhkMDdmIG1l bSAweGZkMjFhMDAwLTB4ZmQyMWFmZmYgaXJxIDE2IGF0IGRldmljZSAzMS4yIG9uIHBjaTAK YWhjaTA6IEFIQ0kgdjEuMDAgd2l0aCA2IDEuNUdicHMgcG9ydHMsIFBvcnQgTXVsdGlwbGll ciBub3Qgc3VwcG9ydGVkCmFoY2ljaDA6IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgMCBv biBhaGNpMAphaGNpY2gxOiA8QUhDSSBjaGFubmVsPiBhdCBjaGFubmVsIDEgb24gYWhjaTAK YWhjaWNoMjogPEFIQ0kgY2hhbm5lbD4gYXQgY2hhbm5lbCAyIG9uIGFoY2kwCmFoY2ljaDM6 IDxBSENJIGNoYW5uZWw+IGF0IGNoYW5uZWwgMyBvbiBhaGNpMAphaGNpY2g0OiA8QUhDSSBj aGFubmVsPiBhdCBjaGFubmVsIDQgb24gYWhjaTAKYWhjaWNoNTogPEFIQ0kgY2hhbm5lbD4g YXQgY2hhbm5lbCA1IG9uIGFoY2kwCmFjcGlfc3lzY29udGFpbmVyMDogPFN5c3RlbSBDb250 YWluZXI+IG9uIGFjcGkwCmFjcGlfc3lzY29udGFpbmVyMTogPFN5c3RlbSBDb250YWluZXI+ IHBvcnQgMHhjZDgtMHhjZTMgb24gYWNwaTAKYWNwaV9zeXNjb250YWluZXIyOiA8U3lzdGVt IENvbnRhaW5lcj4gcG9ydCAweDYyMC0weDYyZiBvbiBhY3BpMAphY3BpX3N5c2NvbnRhaW5l cjM6IDxTeXN0ZW0gQ29udGFpbmVyPiBwb3J0IDB4Y2MwLTB4Y2Q3IG9uIGFjcGkwCnVhcnQw OiA8MTY1NTAgb3IgY29tcGF0aWJsZT4gcG9ydCAweDNmOC0weDNmZiBpcnEgNCBmbGFncyAw eDEwIG9uIGFjcGkwCmF0a2JkYzA6IDxLZXlib2FyZCBjb250cm9sbGVyIChpODA0Mik+IHBv cnQgMHg2MCwweDY0IGlycSAxIG9uIGFjcGkwCmF0a2JkMDogPEFUIEtleWJvYXJkPiBpcnEg MSBvbiBhdGtiZGMwCmtiZDAgYXQgYXRrYmQwCmF0a2JkMDogW0dJQU5ULUxPQ0tFRF0KcHNt MDogPFBTLzIgTW91c2U+IGlycSAxMiBvbiBhdGtiZGMwCnBzbTA6IFtHSUFOVC1MT0NLRURd CldBUk5JTkc6IERldmljZSAicHNtIiBpcyBHaWFudCBsb2NrZWQgYW5kIG1heSBiZSBkZWxl dGVkIGJlZm9yZSBGcmVlQlNEIDE1LjAuCnBzbTA6IG1vZGVsIEludGVsbGlNb3VzZSBFeHBs b3JlciwgZGV2aWNlIElEIDQKb3JtMDogPElTQSBPcHRpb24gUk9NPiBhdCBpb21lbSAweGU5 MDAwLTB4ZWZmZmYgcG5waWQgT1JNMDAwMCBvbiBpc2EwCnZnYTA6IDxHZW5lcmljIElTQSBW R0E+IGF0IHBvcnQgMHgzYzAtMHgzZGYgaW9tZW0gMHhhMDAwMC0weGJmZmZmIHBucGlkIFBO UDA5MDAgb24gaXNhMAphdHRpbWVyMDogPEFUIHRpbWVyPiBhdCBwb3J0IDB4NDAgb24gaXNh MApUaW1lY291bnRlciAiaTgyNTQiIGZyZXF1ZW5jeSAxMTkzMTgyIEh6IHF1YWxpdHkgMApF dmVudCB0aW1lciAiaTgyNTQiIGZyZXF1ZW5jeSAxMTkzMTgyIEh6IHF1YWxpdHkgMTAwClRp bWVjb3VudGVycyB0aWNrIGV2ZXJ5IDEwLjAwMCBtc2VjCnVnZW4wLjE6IDwoMHgxYjM2KSBY SENJIHJvb3QgSFVCPiBhdCB1c2J1czAKdWh1YjAgb24gdXNidXMwCnVodWIwOiA8KDB4MWIz NikgWEhDSSByb290IEhVQiwgY2xhc3MgOS8wLCByZXYgMy4wMC8xLjAwLCBhZGRyIDE+IG9u IHVzYnVzMApaRlMgZmlsZXN5c3RlbSB2ZXJzaW9uOiA1ClpGUyBzdG9yYWdlIHBvb2wgdmVy c2lvbjogZmVhdHVyZXMgc3VwcG9ydCAoNTAwMCkKVHJ5aW5nIHRvIG1vdW50IHJvb3QgZnJv bSB6ZnM6enJvb3QvUk9PVC8yMDI0LTEyLTI2LTE4LTA5IFtdLi4uCmRhMCBhdCB2dHNjc2kw IGJ1cyAwIHNjYnVzMCB0YXJnZXQgMCBsdW4gMApkYTA6IDxRRU1VIFFFTVUgSEFSRERJU0sg Mi41Kz4gRml4ZWQgRGlyZWN0IEFjY2VzcyBTUEMtMyBTQ1NJIGRldmljZQpkYTA6IDMwMC4w MDBNQi9zIHRyYW5zZmVycwpkYTA6IENvbW1hbmQgUXVldWVpbmcgZW5hYmxlZApkYTA6IDcz NzI4ME1CICgxNTA5OTQ5NDQwIDUxMiBieXRlIHNlY3RvcnMpClJvb3QgbW91bnQgd2FpdGlu ZyBmb3I6IHVzYnVzMAp1aHViMDogMzAgcG9ydHMgd2l0aCAzMCByZW1vdmFibGUsIHNlbGYg cG93ZXJlZApHRU9NX0VMSTogRGV2aWNlIGRhMHAyLmVsaSBjcmVhdGVkLgpHRU9NX0VMSTog RW5jcnlwdGlvbjogQUVTLVhUUyAxMjgKR0VPTV9FTEk6ICAgICBDcnlwdG86IGFjY2VsZXJh dGVkIHNvZnR3YXJlCmljaHNtYjA6IDxJbnRlbCA4MjgwMUkgKElDSDkpIFNNQnVzIGNvbnRy b2xsZXI+IHBvcnQgMHg3MDAtMHg3M2YgaXJxIDE2IGF0IGRldmljZSAzMS4zIG9uIHBjaTAK c21idXMwOiA8U3lzdGVtIE1hbmFnZW1lbnQgQnVzPiBvbiBpY2hzbWIwCnZ0Y29uMDogPFZp cnRJTyBDb25zb2xlIEFkYXB0ZXI+IG9uIHZpcnRpb19wY2kyCnZ0cm5kMDogPFZpcnRJTyBF bnRyb3B5IEFkYXB0ZXI+IG9uIHZpcnRpb19wY2k0CnJhbmRvbTogcmVnaXN0ZXJpbmcgZmFz dCBzb3VyY2UgVmlydElPIEVudHJvcHkgQWRhcHRlcgpsbzA6IGxpbmsgc3RhdGUgY2hhbmdl ZCB0byBVUAp2dG5ldDA6IGxpbmsgc3RhdGUgY2hhbmdlZCB0byBVUApTZWN1cml0eSBwb2xp Y3kgbG9hZGVkOiBNQUMvbnRwZCAobWFjX250cGQpCg== --------------W0YxwJfHrTrLuFbiP0nKhCQd-- From nobody Fri Dec 27 01:03:31 2024 X-Original-To: dev-commits-src-main@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 4YK6hL3XR6z5hdyy; Fri, 27 Dec 2024 01:04:02 +0000 (UTC) (envelope-from dbaio@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YK6hL2vJxz4YmQ; Fri, 27 Dec 2024 01:04:02 +0000 (UTC) (envelope-from dbaio@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735261442; 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: in-reply-to:in-reply-to:references:references; bh=M2Q1iDZDrA2dfdjoUlLKoWOJbRdLZqct2N+DPY5djCU=; b=P7rbXbZFQgk042JSss5Vx/odXyPXxeDjpLSEC8uNxz5mWtj5Pv6IdrOuy/2bPLFAXDd41G F/lDwFFgQE1ehXo4pS9jPc4drvFEfQW9SBEkiyWiTePV1aIToKThImwDMix3TWrwKjw14x S8C2d0oHor9fpQzb7QDZu7mEkKnI+Jou4Mt35DEtkSCRfq3TsD3T3512z4fChp9Rd5ymO8 IKb5lQNbM9ph4Z+KUSIenNKaGAO8wTUYOfQ30M4gkAeaBbqhOcmbJSKpDUtsf97NbBPSbe 0wcGZHqwbohxt/mO4crbHBd6ZMOembUmQlPKYxuyt9fwQ5B1HMLiQyiy0DxG4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735261442; 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: in-reply-to:in-reply-to:references:references; bh=M2Q1iDZDrA2dfdjoUlLKoWOJbRdLZqct2N+DPY5djCU=; b=kk+Wn+ZCuxXsZN3GDm7Req6TgieklLXQxgbTvJoStoMAbwY3G96P2QgWZ6jSFn6GYwU2Yb YYPJgR5Qbtlmv37YD5HAUHGpmHKCarpp0xKH6BzlvU+ycMdArz+VlyDz7vCHu0tgibidl5 TukUHecOeZtQlSaODkNp8v30m8iesdNozeMTNAuLZ+hTT+AfqBo2cMJbx3WrwdyXZGfw9t nzU6U6lyT5UCdgc9jr06s123GXOouvAtskjhmfdGHh+/SDYm7LrHV344Ttaoqs6Yv1ae3S etZCifDGZZTrzYi6NcUbNLXEQIVsmlULWCWhuLr4yRC764Hu64cjy0OSS0Fyhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735261442; a=rsa-sha256; cv=none; b=XCIODfkSpJdnFjaFIoqSTmNs6pLWQLsSlk5PI1isLM2Zf0Qv+YAZUoDSGZrje6Yaq9Rw4b 8UomaK/PVpBSQBiUzZXugu0tm4nd5NJx64ypOfNWu40/d6cfuN0p6OHS0gYcxaSKkN5Atz ozQ2Z09HpVCg6cIGxTalH6iCnhVKJUlohiErxtSalljD6e2jayFZk/lyL8DWpas6O6yPg8 HnYiyBqpzC27AhtBzK0iue7exn8eJsYicta/TqNxhujHLwyv/Fy8J2CzJd4sERxCIDogKm SNxuNEOrRbf7I7GAc+21SeYf+RC4D3/VxbLkN8dOYcxbkoOD4xmJPKOpcyaG9w== Received: from fauth-a1-smtp.messagingengine.com (fauth-a1-smtp.messagingengine.com [103.168.172.200]) (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) (Authenticated sender: dbaio/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YK6hL229vzQWc; Fri, 27 Dec 2024 01:04:02 +0000 (UTC) (envelope-from dbaio@freebsd.org) Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfauth.phl.internal (Postfix) with ESMTP id 9A5331200076; Thu, 26 Dec 2024 20:03:59 -0500 (EST) Received: from phl-imap-08 ([10.202.2.84]) by phl-compute-11.internal (MEProxy); Thu, 26 Dec 2024 20:03:59 -0500 X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudduledgfedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefoggffhf fvkfgjfhfutgfgsehtjeertdertddtnecuhfhrohhmpedfffgrnhhilhhoucfirdcuuegr ihhofdcuoegusggrihhosefhrhgvvgeuufffrdhorhhgqeenucggtffrrghtthgvrhhnpe ehveefgeeihfekueeikeffvdehgedvuefhleeftdeggfdtvdeileffgfegveehheenucff ohhmrghinhepfhhrvggvsghsugdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurf grrhgrmhepmhgrihhlfhhrohhmpegusggrihhoodhmvghsmhhtphgruhhthhhpvghrshho nhgrlhhithihqdduudekudefleduvddtqddvieektddvjeeikedquggsrghioheppehfrh gvvggsshgurdhorhhgsehfrghsthhmrghilhdrtghomhdpnhgspghrtghpthhtohepgedp mhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepuggvvhdqtghomhhmihhtshdqshhrtg dqrghllhesfhhrvggvsghsugdrohhrghdprhgtphhtthhopeguvghvqdgtohhmmhhithhs qdhsrhgtqdhmrghinhesfhhrvggvsghsugdrohhrghdprhgtphhtthhopehmrghnuhesfh hrvggvsghsugdrohhrghdprhgtphhtthhopehsrhgtqdgtohhmmhhithhtvghrshesfhhr vggvsghsugdrohhrgh X-ME-Proxy: Feedback-ID: i9d2946a4:Fastmail Received: by mailuser.phl.internal (Postfix, from userid 501) id 6F74918A006B; Thu, 26 Dec 2024 20:03:59 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Date: Thu, 26 Dec 2024 22:03:31 -0300 From: "Danilo G. Baio" To: "Emmanuel Vadot" , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-Id: <539b19c4-d1e7-4448-8dbb-f4b2f974722e@app.fastmail.com> In-Reply-To: <202412160947.4BG9lG3Z092493@gitrepo.freebsd.org> References: <202412160947.4BG9lG3Z092493@gitrepo.freebsd.org> Subject: Re: git: 94e94d2dddfa - main - UPDATING: Add a notes for iwm(4) firmware and pkgbase users Content-Type: text/plain Content-Transfer-Encoding: 7bit On Mon, Dec 16, 2024, at 06:47, Emmanuel Vadot wrote: > The branch main has been updated by manu: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=94e94d2dddfa43aa0aa3ad8aa3ab6d72363e4bd0 > > commit 94e94d2dddfa43aa0aa3ad8aa3ab6d72363e4bd0 > Author: Emmanuel Vadot > AuthorDate: 2024-12-16 09:46:05 +0000 > Commit: Emmanuel Vadot > CommitDate: 2024-12-16 09:46:05 +0000 > > UPDATING: Add a notes for iwm(4) firmware and pkgbase users > > Sponsored by: Beckhoff Automation GmbH & Co. KG > --- > UPDATING | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/UPDATING b/UPDATING > index 2a67a65a92ed..4fef13073431 100644 > --- a/UPDATING > +++ b/UPDATING > @@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: > world, or to merely disable the most expensive debugging functionality > at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) > > +20241216: > + The iwm(4) firmwares are no longer compiled as kernel modules but instead > + shipped as raw files. For pkgbase users if you use iwm(4) you will need > + to install the FreeBSD-firmware-iwm package. Hi, I upgraded my dev box today (pkgbase/weekly packages) and got a kernel panic. Then I installed FreeBSD-firmware-iwm, but still got a panic. To get it working again, I had to comment out these entries from the /boot/loader.conf: if_iwm_load="YES" iwm8265fw_load="YES" Now it's booting; the device works, but I don't know how. =) -- Danilo G. Baio From nobody Fri Dec 27 08:59:13 2024 X-Original-To: dev-commits-src-main@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 4YKKDg61GHz5jRym; Fri, 27 Dec 2024 08:59:15 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4YKKDg1MtNz3yty; Fri, 27 Dec 2024 08:59:15 +0000 (UTC) (envelope-from manu@bidouilliste.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1735289953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ssji6xQ93516F76hOeGVgwxLBqXMYbPjfquoJlj3+oc=; b=Gb6EJG/6JrdoWOBGq9KzOS1oMH6xrzoqQHlJIApsC7e09wXWIk1NnVYFHAp2ViIuVopy5W ZJxldUEnLniC9qUFwLyG5YAdlSOSIj0QaYTBJBDs63AeT6pFn/gBIOBBwyG5JlyecBxm9i jadui4UmcD2BsEA8JNXH9xBPN0ZENHA= Received: from skull.home.blih.net (arennes-299-1-68-49.w92-159.abo.wanadoo.fr [92.159.163.49]) by mx.blih.net (OpenSMTPD) with ESMTPSA id 112a0639 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 27 Dec 2024 08:59:13 +0000 (UTC) Date: Fri, 27 Dec 2024 09:59:13 +0100 From: Emmanuel Vadot To: "Danilo G. Baio" Cc: "Emmanuel Vadot" , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 94e94d2dddfa - main - UPDATING: Add a notes for iwm(4) firmware and pkgbase users Message-Id: <20241227095913.cb0abf57b49986790134f8da@bidouilliste.com> In-Reply-To: <539b19c4-d1e7-4448-8dbb-f4b2f974722e@app.fastmail.com> References: <202412160947.4BG9lG3Z092493@gitrepo.freebsd.org> <539b19c4-d1e7-4448-8dbb-f4b2f974722e@app.fastmail.com> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd15.0) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR] X-Rspamd-Queue-Id: 4YKKDg1MtNz3yty X-Spamd-Bar: ---- On Thu, 26 Dec 2024 22:03:31 -0300 "Danilo G. Baio" wrote: > > > On Mon, Dec 16, 2024, at 06:47, Emmanuel Vadot wrote: > > The branch main has been updated by manu: > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=94e94d2dddfa43aa0aa3ad8aa3ab6d72363e4bd0 > > > > commit 94e94d2dddfa43aa0aa3ad8aa3ab6d72363e4bd0 > > Author: Emmanuel Vadot > > AuthorDate: 2024-12-16 09:46:05 +0000 > > Commit: Emmanuel Vadot > > CommitDate: 2024-12-16 09:46:05 +0000 > > > > UPDATING: Add a notes for iwm(4) firmware and pkgbase users > > > > Sponsored by: Beckhoff Automation GmbH & Co. KG > > --- > > UPDATING | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/UPDATING b/UPDATING > > index 2a67a65a92ed..4fef13073431 100644 > > --- a/UPDATING > > +++ b/UPDATING > > @@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: > > world, or to merely disable the most expensive debugging functionality > > at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) > > > > +20241216: > > + The iwm(4) firmwares are no longer compiled as kernel modules but instead > > + shipped as raw files. For pkgbase users if you use iwm(4) you will need > > + to install the FreeBSD-firmware-iwm package. > > Hi, > > I upgraded my dev box today (pkgbase/weekly packages) and got a kernel panic. > > Then I installed FreeBSD-firmware-iwm, but still got a panic. > > To get it working again, I had to comment out these entries from the /boot/loader.conf: > > if_iwm_load="YES" > iwm8265fw_load="YES" > > Now it's booting; the device works, but I don't know how. =) > > -- > Danilo G. Baio Hi Danilo, You got a panic because loader doesn't know that iwm8265fw is a raw firmware and not a kernel module anymore, and it's working after removing those lines because now iwm is loaded via devmatch and the firmware is correctly loaded. https://reviews.freebsd.org/D48211 is addressing this so users who loads iwm from loader(8) can still do it (even if I don't understand why anyone wants to do this). Cheers, -- Emmanuel Vadot From nobody Fri Dec 27 11:22:49 2024 X-Original-To: dev-commits-src-main@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 4YKNQl5HTNz5jc92; Fri, 27 Dec 2024 11:23:11 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKNQl4Wzlz4D9q; Fri, 27 Dec 2024 11:23:11 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735298591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eBimwIWMMURGRIKUyCUC+AccBhkpggmU4Xrv0OlMlwg=; b=AJ1qWisP8aU057VR32Jv88oz5FulB2yuK98FviM3QUqhOeeEm8JIBDLJXEyx4wM8CZ4/O2 4agAQXB0bjvfXtg34nZxpl/icjMg8tg4OuWZ2Qy2UYMOy3bLYWrxX1NEXlOFN21yG6D/LM oBH/duRMmOolLyL3yHTPoDRpC28oWmuEoDJrVUyFf1xfdPtzhQVzZSoQ6Zs51H8zKR1cPF LMiwaWJtILC0tdORGdVFvoXdjQq7wrbl2EM9jTQGooA+g8SXARwjwYVOkvmNqmlOvwDpVa JlH/Uzwvp2eAFh/59yljIX0qMFuvo5b8CSjKJClJFsQUM0PgjLwUBzkq1lnq3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735298591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eBimwIWMMURGRIKUyCUC+AccBhkpggmU4Xrv0OlMlwg=; b=JS/JnemrP1g33+oVT11OAR5TQjGw8fOPZPjbtypdZ16QOv6ZimacbAfopTsi3pwFTYFGpV uy/RryXXhIZNhU4ZCC1eZVZrd+k7vPraRZEO4bOvfpC/LzRWL7NBfeG4+4Yp8SnpzdHbIo usodeIA8FEZyfL83P56xtGjs9W4vcVBUZDd6Ktf2cD3w8KgF/E7gM3PPPsKGzUbOWqRHU0 an7BWORCVa5Cm46k9/cC3KRddEfhvAoE4Ht4IeWhbQauGsOEf08c2fPHzun2PilAkRo0dk ky/HjR5zyjgSEcH35lYw6axCbsfNsSy6m5zErjTCoGEQFiEOauqxlX4QK2sAfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735298591; a=rsa-sha256; cv=none; b=Pk04kNspe+Inu84Cx4Cz9pIOyY50c4cWjfDSS7me5Ci7WHrRiOILrs2uFzN1v5PJYXK/fm BIxO57PFtjmxFjZ+FYonrQm3rfdEIZhsfO0M/7cp1PLN/Pu8H+6fFIxFY++Duw23pX43Qz Z7e1EMfeq7dvieK0nqwkKIL1FBwAbFL39apGP+T6nDu7Z5hxFJvy6tK/gn5Gb/mLUDwOws wow0bLpnS/JJ1fW969qJ9oxNkhdNk+o395P6U2K74zan8LsrDtlaKBoNPUlaZyUPGj3W6K 8f83ScdPBW1zRvu5qiBUZ2bDeKbb/il59so3zvY7GaZFfo374jQY398sH3yeKw== Received: from fauth-a2-smtp.messagingengine.com (fauth-a2-smtp.messagingengine.com [103.168.172.201]) (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) (Authenticated sender: dbaio/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YKNQl3TPgzdsk; Fri, 27 Dec 2024 11:23:11 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfauth.phl.internal (Postfix) with ESMTP id EA27F1200076; Fri, 27 Dec 2024 06:23:10 -0500 (EST) Received: from phl-imap-08 ([10.202.2.84]) by phl-compute-11.internal (MEProxy); Fri, 27 Dec 2024 06:23:10 -0500 X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddruddvtddgvdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefoggffhf fvvefkjghfufgtgfesthejredtredttdenucfhrhhomhepfdffrghnihhlohcuifdruceu rghiohdfuceouggsrghioheshfhrvggvuefuffdrohhrgheqnecuggftrfgrthhtvghrnh epveetgeffkefhiedtleehjeekueeviedufffgvdeiveefveehuedutdfgtdduteevnecu ffhomhgrihhnpehfrhgvvggsshgurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepuggsrghiohdomhgvshhmthhprghuthhhphgvrhhs ohhnrghlihhthidquddukedufeeluddvtddqvdeikedtvdejieekqdgusggrihhopeephf hrvggvuefuffdrohhrghesfhgrshhtmhgrihhlrdgtohhmpdhnsggprhgtphhtthhopeeh pdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehmrghnuhessghiughouhhilhhlih hsthgvrdgtohhmpdhrtghpthhtohepuggvvhdqtghomhhmihhtshdqshhrtgdqrghllhes fhhrvggvsghsugdrohhrghdprhgtphhtthhopeguvghvqdgtohhmmhhithhsqdhsrhgtqd hmrghinhesfhhrvggvsghsugdrohhrghdprhgtphhtthhopehmrghnuhesfhhrvggvsghs ugdrohhrghdprhgtphhtthhopehsrhgtqdgtohhmmhhithhtvghrshesfhhrvggvsghsug drohhrgh X-ME-Proxy: Feedback-ID: i9d2946a4:Fastmail Received: by mailuser.phl.internal (Postfix, from userid 501) id C211B18A0068; Fri, 27 Dec 2024 06:23:10 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Date: Fri, 27 Dec 2024 08:22:49 -0300 From: "Danilo G. Baio" To: "Emmanuel Vadot" Cc: "Emmanuel Vadot" , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-Id: In-Reply-To: <20241227095913.cb0abf57b49986790134f8da@bidouilliste.com> References: <202412160947.4BG9lG3Z092493@gitrepo.freebsd.org> <539b19c4-d1e7-4448-8dbb-f4b2f974722e@app.fastmail.com> <20241227095913.cb0abf57b49986790134f8da@bidouilliste.com> Subject: Re: git: 94e94d2dddfa - main - UPDATING: Add a notes for iwm(4) firmware and pkgbase users Content-Type: text/plain Content-Transfer-Encoding: 7bit On Fri, Dec 27, 2024, at 05:59, Emmanuel Vadot wrote: > On Thu, 26 Dec 2024 22:03:31 -0300 > "Danilo G. Baio" wrote: > >> >> >> On Mon, Dec 16, 2024, at 06:47, Emmanuel Vadot wrote: >> > The branch main has been updated by manu: >> > >> > URL: >> > https://cgit.FreeBSD.org/src/commit/?id=94e94d2dddfa43aa0aa3ad8aa3ab6d72363e4bd0 >> > >> > commit 94e94d2dddfa43aa0aa3ad8aa3ab6d72363e4bd0 >> > Author: Emmanuel Vadot >> > AuthorDate: 2024-12-16 09:46:05 +0000 >> > Commit: Emmanuel Vadot >> > CommitDate: 2024-12-16 09:46:05 +0000 >> > >> > UPDATING: Add a notes for iwm(4) firmware and pkgbase users >> > >> > Sponsored by: Beckhoff Automation GmbH & Co. KG >> > --- >> > UPDATING | 5 +++++ >> > 1 file changed, 5 insertions(+) >> > >> > diff --git a/UPDATING b/UPDATING >> > index 2a67a65a92ed..4fef13073431 100644 >> > --- a/UPDATING >> > +++ b/UPDATING >> > @@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: >> > world, or to merely disable the most expensive debugging functionality >> > at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) >> > >> > +20241216: >> > + The iwm(4) firmwares are no longer compiled as kernel modules but instead >> > + shipped as raw files. For pkgbase users if you use iwm(4) you will need >> > + to install the FreeBSD-firmware-iwm package. >> >> Hi, >> >> I upgraded my dev box today (pkgbase/weekly packages) and got a kernel panic. >> >> Then I installed FreeBSD-firmware-iwm, but still got a panic. >> >> To get it working again, I had to comment out these entries from the /boot/loader.conf: >> >> if_iwm_load="YES" >> iwm8265fw_load="YES" >> >> Now it's booting; the device works, but I don't know how. =) >> >> -- >> Danilo G. Baio > > Hi Danilo, > > You got a panic because loader doesn't know that iwm8265fw is a raw > firmware and not a kernel module anymore, and it's working after > removing those lines because now iwm is loaded via devmatch and the > firmware is correctly loaded. > https://reviews.freebsd.org/D48211 is addressing this so users who > loads iwm from loader(8) can still do it (even if I don't understand > why anyone wants to do this). > > Cheers, Awesome, thanks for the explanation and for working on this Regards, -- Danilo G. Baio From nobody Fri Dec 27 14:41:35 2024 X-Original-To: dev-commits-src-main@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 4YKSqk5qPwz5hcPZ; Fri, 27 Dec 2024 14:41:38 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKSqk5KF1z4fGs; Fri, 27 Dec 2024 14:41:38 +0000 (UTC) (envelope-from avg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735310498; 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: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=i/x17kdCE7YLtryqGGLueKds92oAmmS1hkA3luaTiOQ=; b=YTazIy7zVx7oul2+K0Q86AHOwb76wU5jlXPtC92o7T0Oons45u/KLzc8FqmjFZKjWt01tp qTnU6JA4ZhR2yBN8YrbpL7xRMu+Ju0umTOmY0uGWKRSv80zwlMUSbLEvOmfmZX2Nn2Z8Ao U5+Hg8vBWt9aone7cSX9WOUOHL8GXm/bt1gjXC6b4d+ky7dIBvdbN4jqATfKsLED5r+Bai HUX3jY5p+YP5zQolXtDAR7eGBkMp+nT2yW5/vZDjfRx/JYpoRfD95Qa0XOG8FsDBOfXm6e QACCrvD5owef4Dfv0Ak6vJjxu/yfdfTfqbnXWCj21lvwrSiMorHeKCSwt32zzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735310498; 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: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=i/x17kdCE7YLtryqGGLueKds92oAmmS1hkA3luaTiOQ=; b=n+QYZlhS/2HGPLPFAGAUx9IY5dKZOcpKJLubvHJ4++pRnMB5R25EiSGrK/BjoE+InbV/Rx FTImzWDw9tsAmE0vBZ8SKCu0aEyKyYVIHJsAOwOYZOG6DrZp99mtFaTQj65mcrOQ+4WNeg HFUHro9ILs3J514CMj8MOIbL8rZWr40iQVkj2AyEKbfBwbxf3rBG8c2SgQmAoiOD2KVs1y deT4RCfiEaMzlsP+35KqaLaDet8tdoRKU5xmZCgpyxr5k5XSD/FKeWLkgFrS7/xgnKEX7Z YRR3WwXxkXSk/NozcipdiL6xWdxBtahVVuiSs/8k04wx2iDbDl5f/pwYqZmwGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735310498; a=rsa-sha256; cv=none; b=fyTNwlFfVUqxhrQT7zvrY5ygNCv0NEIKK6bz1QmVf38IpAf/Xtu3pqWMnOqjWiJmSznerb mT1erFhBQKlSYHgBnckYoe1wv9TJffFOQiQzWcrZgwuma9oiFS8yPOyNf2o+5zvGiunXUN /wTxUyB18JXYi12poH+wPc/E7d43YJPC1OB0pg3N5mAyoPjUuMuAIOplH2oxRTp9CF7Xm9 Rg97UQaQ4/g5Ng1ktWRNiZXltjzmT4DgT807pGyMS6cnKfR176R2fGpXr+KDKs+DmPaTrw V2q2O0yiyDJ4P4vyGCFzIE17zfJz4K4yvlqLphmS9T1nJ7n5q8BCe4YALRYBEg== Received: from [192.168.0.88] (unknown [93.188.39.137]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: avg/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YKSqk0jFczjWh; Fri, 27 Dec 2024 14:41:37 +0000 (UTC) (envelope-from avg@FreeBSD.org) Message-ID: <14efd79e-75be-4f96-8a04-7ffc9ed1012c@FreeBSD.org> Date: Fri, 27 Dec 2024 16:41:35 +0200 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 24ae172a5035 - main - ng_ubt(4): do not attach Realtek 87XX/88XX adaptors in bootloader mode. To: Vladimir Kondratyev , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202411062331.4A6NVuiE070018@gitrepo.freebsd.org> Content-Language: en-US From: Andriy Gapon Autocrypt: addr=avg@FreeBSD.org; keydata= xsDNBGcKrHEBDADRvwQOK0b/yo4ys5cs6bOQMhEh4xtfbaZ/CU00cpPgUip3sOZCdrtMWlRC g25z97prxE9pKueZi+HXDhIPpa9xl14ghqF4oYScuJ1i18HyiOH2y5Q3Vv/TtFiSzicd3EAu QgS3jVidpgDSPDdj2Yz3UxYpZ+PuFl6nOnvCvqOFcjUlzKCyPaiN2b86l1Nscmhnc+zQ/faB erUOEFEDQbWMA5YfXi8HrbeR16hfRfGt7E0aMDlIj9FIPIq71UWMN9CimPgs4+rbNr1MAlLa z4GxSDhVYZEY5rqtCzr+PLXboRQWnaUwXl0/biw9enf17NHdYv1SNAFTX2eC4dZ3qBVI74dS PgNprm+PMfz+6Hhs/dAv+Nan5nVhg3EFIjYTiy0MnjMSq8uI0v0ykpAGAcJJ5xl6d23aLxgN 6f0z6pJRCO0hGPgU7UzvFD0MxJxmbzqdT1R51KDan1oD41b+tjl2LMBuCDCoB0U44Pu0zLdp xMfFTxCXtwIYKIUxwd28jwMAEQEAAc0eQW5kcml5IEdhcG9uIDxhdmdARnJlZUJTRC5vcmc+ wsENBBMBCAA3FiEEmXvSmjiQFHPVOpLnzDOt5NLj67sFAmcKrHEFCQeEzgACGwMECwkIBwUV CAkKCwUWAgMBAAAKCRDMM63k0uPru5tSDACFK15LLbq89RSQ6QMnjiIm1t/wYJyumb519MHu Dhzxx1lbr8oghf0RHtF6kYRLQPaW2VdToi74pRobd3CN4bhZKDLSL6WfTn17RfavDjL6Njwp KBo30CkOeYKWq1mDmo0xEoQj8cc7ybEZnus+YScZOpj8Ti4EFwhRt6SHer7YDb161IHKL8m4 MsCxpFSGEjbKj8Iul3Ri/fTOO8w14ivcuEEQIvJt4/+4YV5Az8G23wKzL/3aJ7SOT3oYGmR9 atBTmVO3DlODjM+rZLegd8SfLSPTcBTHspWE5duemIzZbEX3BP77r3Qx4Fo5Tkit3bG1XVar yPQato+sFGFEGifdE9USBQoAoOaaeZevwAWjDU0TIuCT0CUe0sKtQuNP4LRq0n9EEHOXBu9a CfdMhFUSkAZnuE7miSVwgPvoVNJ1stA37EXLN/sVsWik7wslTQ5vF81VpdGFiwoQPOe2XEKh ogcwGSnXbwv1gD4x+Gz/7Y+kFyr1NY+4/nSaeXVcS2fOwM0EZwqscgEMAMQTe6ypAmQe/TFO HqKD2hfFKdksTptKi6uEh8xIwct8G/0FBldDWXo9eu8CGr/ZrDg0/bAwJxbaLRQCMH19Gq2Y hLvZ1QK5GQJVzZKcqfxbF2LiDUTs6WkdOBIhGpdDy7p1xFrvqCGCtNFYHuGYm067EozibBSF BWAPstKu2FQuVHZNMOfs7p3OIz3Yfqu9woXDeg3/8G2qVQJINe+8EwXKlhgh4CyDbq7nAZoA kIu1SE9z9u3WI5mcNy/0dFmVUsFxBqRC3ewbvzie8tKyZ9yFOlaZPT0Y4nRBXQTI3mLZ8zQ8 mtrWK5OOmrJ02kdeO9RBXe+OMaUUWMf92ZIoBFb4HP6N+B+4N1y1OwULousfl7JRoYxA4MRL ls7E2sSoJvrEBTJB3Pc34xu8rsJ1A5V3NgN6djX8yEZYpTRkcmrBeWy/ofDqZPVqneAx0LRm eldDS9msXDW4KXODyPZ+9unvmHAcoH0xaBYaSH44CDZDQDg4LNcmbOvuu1TEXBJhjQARAQAB wsD8BBgBCAAmFiEEmXvSmjiQFHPVOpLnzDOt5NLj67sFAmcKrHMFCQeEzgACGwwACgkQzDOt 5NLj67sUCAv5AXqgWnYN9EblapMbZjkiqL8pZQ0GNqh+Pg9FwbyULxjtRTO6rD4D0IxizByb ef+neeUNyYlagt5nfKMysEr0SU/gHKCi8vyTF/63ukMrGUNGmJJxrndl5ZYKC6j6eX7twrZF L1Uvlmn6FnQ22red5kHO93fDjG4zaDIZvHfwj7kzjZ4tpC7Byinf88s14mdZeScc0PnU2hj4 UGYju/wg2FF4YxaZYhcmdTiRYY0Wx85XSMZv19pnn78sadEuRvfRd4JTmw++j1xGXeqQGWzz /CTG5/Ex9GAkQ02hZbmi236byDXoet4G8TEyOph9QFVkV9bNd0jQZaFZPGEj4PSPUYGAF7s5 xJaNGgctC3aZ7WjEv1FBoo44XCU4xcjJ1wZQUrHxRhx6TW0Jtcl0U9qfKFW30TSPo6RyiXuj X4ltWKAtjoXB8nUmEJckaz7IRu2b4pXDeazZuz5JBygUs10yJjDxh2vFQZo0KaBAPx9MZlPn gpPTjT15L8xGftEjQXF6 In-Reply-To: <202411062331.4A6NVuiE070018@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 07/11/2024 01:31, Vladimir Kondratyev wrote: > The branch main has been updated by wulf: > > URL: https://cgit.FreeBSD.org/src/commit/?id=24ae172a50352ad4fd22989477f29ecca5aed6e3 > > commit 24ae172a50352ad4fd22989477f29ecca5aed6e3 > Author: Vladimir Kondratyev > AuthorDate: 2024-11-06 23:28:11 +0000 > Commit: Vladimir Kondratyev > CommitDate: 2024-11-06 23:28:11 +0000 > > ng_ubt(4): do not attach Realtek 87XX/88XX adaptors in bootloader mode. Perhaps this change deserves an UPDATING entry? Today I upgraded only to find out that my bluetooth related things stopped working. It turned out that ng_ubt didn't attach to my USB bluetooth adapter. Only then I discovered this change, installed the firmware package, etc. As strange as it may seem, previously my adapter worked without uploading any extra firmware. Some data points, just in case: idVendor = 0x0b05 idProduct = 0x190e bcdDevice = 0x0200 iManufacturer = 0x0001 iProduct = 0x0002 rtlbt_is_realtek: found USB Realtek rtlbt_dump_version: hci_version 0x0a rtlbt_dump_version: hci_revision 0x000b rtlbt_dump_version: lmp_version 0x0a rtlbt_dump_version: lmp_subversion 0x8761 main: loading firmware /usr/local/share/rtlbt-firmware/rtl8761bu_fw.bin main: loading config /usr/local/share/rtlbt-firmware/rtl8761bu_config.bin main: Firmware download complete rtlbt_dump_version: hci_version 0x0a rtlbt_dump_version: hci_revision 0xdfc6 rtlbt_dump_version: lmp_version 0x0a rtlbt_dump_version: lmp_subversion 0xd922 main: Firmware download is successful! > Attempt to initialize FreeBSD bluetooth stack while such a device is in > bootloader mode locks the adapter hardly so it requires power on/off > cycle to restore. > > This change blocks ng_ubt attachment unless operational firmware is > loaded thus preventing the lock up. > > Sponsored by: Future Crew LLC > MFC after: 1 month > Differential Revision: https://reviews.freebsd.org/D46738 -- Andriy Gapon From nobody Fri Dec 27 17:02:56 2024 X-Original-To: dev-commits-src-main@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 4YKWyn1PFSz5j2vh; Fri, 27 Dec 2024 17:02: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKWyn0qyVz4twm; Fri, 27 Dec 2024 17:02:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735318977; 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=qgyEAHkEveiJMrGiu2TUjnhu9lpOV7m8GaVXGEPZtzw=; b=AAim15E6Q0phRF8ChXJOhM0shm81ACpdOvAJWCpPi02vo35qC7qxA8nRbJ7AUd+ekyd7sB h8r/xgU+Wj2u1bWI1hFf6zxOplUQfjn9Vin06q3hR+My2rbLyayl6IQ//tWkjL2bUjjWpf pC0hhiK3c8NcuRPUhnOn1PqPf+Q1ed+Dg2RQ4k6bZBl41dea8b05H8jfWm561aTijIGva6 xN3wsA/mlMyzYqG6udYXmW+Y8SNn8aJ+Z86Q3PsRrOFXer5wG0OGOZzOcoKGQmkijjs9KK M5HG29oLSdFbALsOibSeumNI2KodK6/QeYaqJK5PjCtMTMGXbgZ8kkh9IVRdkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735318977; 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=qgyEAHkEveiJMrGiu2TUjnhu9lpOV7m8GaVXGEPZtzw=; b=UjYtmvgIZ2U6pdHU2uMJwnF1V+UKIUJFyOClLCwrRBMAdinmx612hnOPITjLd0NVJMFPkA J9V7F6ufDb2PZR3A1xMeLQhhQUFVOTAdWLlKN8e51cJbqIoisljkwOSPqTKXWDOgsfSD4D w54tCAn2W/xcju5ZjpDsvA4Bt5v48BP2lmy9i9VuRHeiOKA9AvyzSXR6UAHjB88MlJKLWb 7alEYTQeLvmUQugavfrRMzoXOFtEd7ET7rOOrb3U05123xFfEZqIDdqPXbRI5gHwBd5RCc D1zy8bNfj610gmaZcmGVNyrIrBjckMrFQF+YNSueACoKQWdgSm+GXST7A60+qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735318977; a=rsa-sha256; cv=none; b=ogkNdFkVFYUDuWmmRgeGLuxG3s5tYWsnVcKCA/RHaUUx8BfnNhfeeO8DDOqjnMjdF8iU+9 LVRFSyUuOZcKje/TsJiurAsw/eHyBPNCPMlIBoUJlthiS1Eq/KhOAvRPVLiVoQtliYqLr0 BKA2m17J93Hp5A7UuvowwmoYyJECBdjmv0YtaWk/Wk342otiD6T17w6HD/C6Fw5Duhzfaq Bkj4OcgeAydeS6lEr/OOkTKktQTGnYQLrEdwxvaOjD0lKLQVF0Gaoz54RfJJ9QxgMZO3zQ BWXB8bplWn3lEA3gjmgHKqWVI6qZYYpBXaLgbKDYao65OrnVZGWI8jFwplJIRQ== 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 4YKWyn0RRgznhR; Fri, 27 Dec 2024 17:02:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BRH2u5d035865; Fri, 27 Dec 2024 17:02:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRH2ujJ035862; Fri, 27 Dec 2024 17:02:56 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:02:56 GMT Message-Id: <202412271702.4BRH2ujJ035862@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 6ea1ce222c7c - main - bhnd: Fix a few use after frees when releasing resources List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ea1ce222c7ce2aeae7ecd3558c731cb8c05a37e Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6ea1ce222c7ce2aeae7ecd3558c731cb8c05a37e commit 6ea1ce222c7ce2aeae7ecd3558c731cb8c05a37e Author: Gavin Atkinson AuthorDate: 2024-12-27 16:55:05 +0000 Commit: John Baldwin CommitDate: 2024-12-27 16:55:05 +0000 bhnd: Fix a few use after frees when releasing resources The resource list entry needs to be looked up using rman_get_* prior to releasing the resource. Fixes: 9dbf5b0e6876 new-bus: Remove the 'rid' and 'type' arguments from BUS_RELEASE_RESOURCE --- sys/dev/bhnd/bhndb/bhndb.c | 17 +++++++++-------- sys/dev/bhnd/cores/chipc/chipc.c | 6 ++++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/sys/dev/bhnd/bhndb/bhndb.c b/sys/dev/bhnd/bhndb/bhndb.c index eeff088ffdde..511beae0cc25 100644 --- a/sys/dev/bhnd/bhndb/bhndb.c +++ b/sys/dev/bhnd/bhndb/bhndb.c @@ -1037,7 +1037,7 @@ static int bhndb_release_resource(device_t dev, device_t child, struct resource *r) { struct bhndb_softc *sc; - struct resource_list_entry *rle; + struct resource_list_entry *rle = NULL; bool passthrough; int error; @@ -1058,16 +1058,17 @@ bhndb_release_resource(device_t dev, device_t child, struct resource *r) return (error); } + /* Check for resource list entry */ + if (!passthrough) + rle = resource_list_find(BUS_GET_RESOURCE_LIST(dev, child), + rman_get_type(r), rman_get_rid(r)); + if ((error = rman_release_resource(r))) return (error); - if (!passthrough) { - /* Clean resource list entry */ - rle = resource_list_find(BUS_GET_RESOURCE_LIST(dev, child), - rman_get_type(r), rman_get_rid(r)); - if (rle != NULL) - rle->res = NULL; - } + /* Clean resource list entry */ + if (rle != NULL) + rle->res = NULL; return (0); } diff --git a/sys/dev/bhnd/cores/chipc/chipc.c b/sys/dev/bhnd/cores/chipc/chipc.c index 010ebbbd6cb2..09ca4d8884e6 100644 --- a/sys/dev/bhnd/cores/chipc/chipc.c +++ b/sys/dev/bhnd/cores/chipc/chipc.c @@ -893,6 +893,10 @@ chipc_release_resource(device_t dev, device_t child, struct resource *r) if (cr == NULL) return (EINVAL); + /* Cache rle */ + rle = resource_list_find(BUS_GET_RESOURCE_LIST(dev, child), + rman_get_type(r), rman_get_rid(r)); + /* Deactivate resources */ error = bus_generic_rman_release_resource(dev, child, r); if (error != 0) @@ -902,8 +906,6 @@ chipc_release_resource(device_t dev, device_t child, struct resource *r) chipc_release_region(sc, cr, RF_ALLOCATED); /* Clear reference from the resource list entry if exists */ - rle = resource_list_find(BUS_GET_RESOURCE_LIST(dev, child), - rman_get_type(r), rman_get_rid(r)); if (rle != NULL) rle->res = NULL; From nobody Fri Dec 27 17:26:18 2024 X-Original-To: dev-commits-src-main@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 4YKXTv5dPxz5j4fL; Fri, 27 Dec 2024 17:26:27 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKXTv52XDz45Z3; Fri, 27 Dec 2024 17:26:27 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735320387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=RDwD3ewwwKv4ORM3gdwL9029CAX3z6ZgyyTaCMdk9hA=; b=yi8Q1bcLNjJU1q/k0lXLd3AgjpPL1hH+cal/UT5m+oedMOxDXD3bQhq6t9tX9KxsmD+TFs /fDnxKBfHusvZCy58JYd1I3YCu0IEEN5ouW4fEqQfZIXiu6c6SCkaX68xBy2exjSwTG+BL uFWn6bulUu7ejqFS6ozPvxS6nmxHdxrujrAyojWKex7i9pM/Tcg+yUoz5wVC0pQ2Il1hdR yMVRNRwoas7l6wlRQb/nbcN4y1pE3osMzreKAg26NDiIJBL3E6iNv1IzEBaXa33olrL/D2 7OEcUIunw4REsSfmdwSa418u0lexsE25O6UFUPCV4zX6Gr8XFRltxGgrYNacWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735320387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=RDwD3ewwwKv4ORM3gdwL9029CAX3z6ZgyyTaCMdk9hA=; b=vt0dOUmiZmZiiZB8J8xmaqFDA8/kpnhZLZP2/RqzWtA+P/hEMLgdZwfYFNiczK1aLOKjI/ uIBj31BnR8kTNnzKVvlZF5CFKWU+BhykEI65mxuBv4ftFPZR0RJwgl1pNN0XOvwAEXoo9R RaXhRXUKXg+t7/vxcrz3brLT4RVk574dm5WIRbTrwF8pqDhVR3uXH77+xMli8jCpkEMGfn xg1frO7gb8zw7wewFTEEepbfv37/KIAQqKNVF7t44i3fyrfR2ueZs62z7rkBs2fz1mpIAX Hrhp23FJ/c8hhDJyRjY8BcnzW3P5nCfx9UYILbMyG5N5OgDJQ3BaWbWUO+YczQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735320387; a=rsa-sha256; cv=none; b=DMzwK790P5ikY9EiEwnSC9UMltQlmb0j7tMWH8ChxEt7hiVg9j79qB+9svkyWooJdocUE9 mIR/JWMn7Ej/x2dVI5oPEbFEnzrBRnnq9cWi3cIAis0vi8Tf71L5lACKRAaAP1Oq8UB7RL may8MT1j6mw3Wa5R+5kN1cXh6+Xg8H1x/neU9QR5Q8RCvZlsb6rVZ9Tur0UMlrXQ5cG0C4 BbTN35mkWM0tONkM73GEnFekLxq0mNUjgUq/0VP2ls0wzKzN/GM8kACLL71YSuqtLnmRnD 5XjAD/V7lQJnS1bNqnqC6WlgLF+92oSIDEuvG3hBRECR51pdCWHN5rWADIz1Dw== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (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 (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R10" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YKXTv3HRfz12Fx; Fri, 27 Dec 2024 17:26:27 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 7D24176FB; Fri, 27 Dec 2024 18:26:23 +0100 (CET) From: Kristof Provost To: Renato Botelho Cc: Andrew Turner , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: ba1904937d9a - main - acpica: Extract _OSC parsing to a common file Date: Fri, 27 Dec 2024 17:26:18 +0000 X-Mailer: MailMate (2.0r6068) Message-ID: In-Reply-To: <149116bc-677c-47b2-9ff7-f454418fec21@FreeBSD.org> References: <202412121819.4BCIJ1KW097190__8805.67587898753$1734027579$gmane$org@gitrepo.freebsd.org> <149116bc-677c-47b2-9ff7-f454418fec21@FreeBSD.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="=_MailMate_B90DBFDC-A7D8-4764-961A-A5BB375C1A68_=" --=_MailMate_B90DBFDC-A7D8-4764-961A-A5BB375C1A68_= Content-Type: text/plain; charset=UTF-8; format=flowed; markup=markdown Content-Transfer-Encoding: quoted-printable On 26 Dec 2024, at 21:44, Renato Botelho wrote: > On 12/12/24 15:19, Andrew Turner wrote: >> The branch main has been updated by andrew: >> >> URL: = >> https://cgit.FreeBSD.org/src/commit/?id=3Dba1904937d9ae0539e39001467a1= 519b17177118 >> >> commit ba1904937d9ae0539e39001467a1519b17177118 >> Author: Andrew Turner >> AuthorDate: 2024-12-12 16:29:45 +0000 >> Commit: Andrew Turner >> CommitDate: 2024-12-12 18:00:22 +0000 >> >> acpica: Extract _OSC parsing to a common file >> This will be used by pci_host_generic_acpi.c so needs to be = >> in a >> common location. >> Reviewed by: imp, jhb >> Sponsored by: Arm Ltd >> Differential Revision: https://reviews.freebsd.org/D48044 > > My dev system was running CURRENT from Oct 31 and broke after I = > upgrade to most recent version on Dec 20. After bisecting I found = > this commit as the one that introduced the problem. > > It starts booting but can't found any disk. Pressing ? at mount = > prompt shows nothing. This system is a VM running on KVM and I've = > attached dmesg from successfully boot > > FreeBSD idaho.arrakis.com.br 15.0-CURRENT FreeBSD 15.0-CURRENT #22 = > n274182-938e4b131c4: Thu Dec 26 18:10:12 -03 2024 = > root@idaho.arrakis.com.br:/usr/obj/usr/src/amd64.amd64/sys/GENERIC-NODE= BUG = > amd64 > I=E2=80=99m seeing similar boot issues on VMWare aarch64 (i.e. freebsd in= = VMware on a Mac). My bisect pointed to: commit 1f5c50a8617355758510675cb9412f56fed12efc Author: Andrew Turner Date: Thu Dec 12 16:30:39 2024 +0000 pci_host_generic:Add pcib_request_feature on ACPI In the ACPI attachment add support for the pcib_request_feature = method. This uses the common _OSC handling. Reviewed by: imp, jhb Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D48048 I=E2=80=99ve not yet been able to capture a dmesg, but it looks like the = nvme = storage device just isn=E2=80=99t found, leading to the zpool failing to = mount. I=E2=80=99m currently working around that with this patch: diff --git a/sys/dev/pci/pci_host_generic_acpi.c = b/sys/dev/pci/pci_host_generic_acpi.c index 1ff3a6bda707..c990edf26a3c 100644 --- a/sys/dev/pci/pci_host_generic_acpi.c +++ b/sys/dev/pci/pci_host_generic_acpi.c @@ -543,7 +543,7 @@ static device_method_t generic_pcie_acpi_methods[] = =3D { DEVMETHOD(pcib_release_msix, = generic_pcie_acpi_release_msix), DEVMETHOD(pcib_map_msi, generic_pcie_acpi_map_msi), DEVMETHOD(pcib_get_id, generic_pcie_acpi_get_id), - DEVMETHOD(pcib_request_feature, = generic_pcie_acpi_request_feature), + //DEVMETHOD(pcib_request_feature, = generic_pcie_acpi_request_feature), DEVMETHOD_END }; Best regards, Kristof --=_MailMate_B90DBFDC-A7D8-4764-961A-A5BB375C1A68_= Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

On 26 Dec 2024, at 21:44, Renato Botelho wrote:

On 12/12/24 15:19, Andrew Turner wrote:

The branch main has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/co= mmit/?id=3Dba1904937d9ae0539e39001467a1519b17177118

commit ba1904937d9ae0539e39001467a1519b17177118
Author: Andrew Turner andrew@Fr= eeBSD.org
AuthorDate: 2024-12-12 16:29:45 +0000
Commit: Andrew Turner andrew@Fr= eeBSD.org
CommitDate: 2024-12-12 18:00:22 +0000

 a=
cpica: Extract _OSC parsing to a common file
     This will be used by pci_host_generic_acpi.c so needs to be in a
 common location.
     Reviewed by:    imp, jhb
 Sponsored by:   Arm Ltd
 Differential Revision:  https://reviews.freebsd.org/D48044

My dev system was running CURRENT from Oct 31 and broke a= fter I upgrade to most recent version on Dec 20. After bisecting I found= this commit as the one that introduced the problem.

It starts booting but can't found any disk. Pressing ? a= t mount prompt shows nothing. This system is a VM running on KVM and I'v= e attached dmesg from successfully boot

FreeBSD idaho.arrakis.com.br 15.0-CURRENT FreeBSD 15.0-CU= RRENT #22 n274182-938e4b131c4: Thu Dec 26 18:10:12 -03 2024 root@idaho.arrakis.com.br:/usr/obj/us= r/src/amd64.amd64/sys/GENERIC-NODEBUG amd64

I=E2=80=99m seeing similar boot issues on VMWare aarch64 = (i.e. freebsd in VMware on a Mac). My bisect pointed to:

co=
mmit 1f5c50a8617355758510675cb9412f56fed12efc
Author: Andrew Turner <andrew@FreeBSD.org>
Date:   Thu Dec 12 16:30:39 2024 +0000

    pci_host_generic:Add pcib_request_feature on ACPI

    In the ACPI attachment add support for the pcib_request_feature metho=
d.
    This uses the common _OSC handling.

    Reviewed by:    imp, jhb
    Sponsored by:   Arm Ltd
    Differential Revision:  https://reviews.freebsd.org/D48048

I=E2=80=99ve not yet been able to capture a dmesg, but it= looks like the nvme storage device just isn=E2=80=99t found, leading to = the zpool failing to mount.

I=E2=80=99m currently working around that with this patch= :

di=
ff --git a/sys/dev/pci/pci_host_generic_acpi.c b/sys/dev/pci/pci_host_gen=
eric_acpi.c
index 1ff3a6bda707..c990edf26a3c 100644
--- a/sys/dev/pci/pci_host_generic_acpi.c
+++ b/sys/dev/pci/pci_host_generic_acpi.c
@@ -543,7 +543,7 @@ static device_method_t generic_pcie_acpi_methods[] =3D=
 {
        DEVMETHOD(pcib_release_msix,    generic_pcie_acpi_release_msix),
        DEVMETHOD(pcib_map_msi,         generic_pcie_acpi_map_msi),
        DEVMETHOD(pcib_get_id,          generic_pcie_acpi_get_id),
-       DEVMETHOD(pcib_request_feature, generic_pcie_acpi_request_feature=
),
+       //DEVMETHOD(pcib_request_feature,       generic_pcie_acpi_request=
_feature),

        DEVMETHOD_END
 };

Best regards,
Kristof

--=_MailMate_B90DBFDC-A7D8-4764-961A-A5BB375C1A68_=-- From nobody Fri Dec 27 17:40:16 2024 X-Original-To: dev-commits-src-main@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 4YKXnw3SHHz5j5PV; Fri, 27 Dec 2024 17:40:20 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKXnw2bDnz47RC; Fri, 27 Dec 2024 17:40:20 +0000 (UTC) (envelope-from garga@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735321220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=4eX7TDliJeAGrADhFvRWsbgEHy9pKnHkimwdgQqw7vk=; b=jCjsteL1LqmKhNhrROl+QrT/+xocZZMWlplPqfq2ko5EumOREX70LfWC+y2smhWskVNgjD SSbzwK0obag/QdlqkHvTraxzmJrKc4rXPzg9tlvEbEXz7pzsxJ67Ju5UR/zYE7N9Q1NZpW JUOAfWa79rPZPSkJqyQMJXf02t9To+46KyLAJNaZqc2aQUOi04fk2Kha85xoFxq+Ag3v3s SkBnFFMGRS03JVdxbImGxSWlVi2MLnA1ItaX1cswwCcbbjpsenveWylxT4b/ea4InoA02H dfM1GJOUOGVrvTfxIPNlCJ6vIlr+yY8aHu7J3w7980rVzVGl2YEkQECgzSM35w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735321220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=4eX7TDliJeAGrADhFvRWsbgEHy9pKnHkimwdgQqw7vk=; b=pObuOsEzViLRtVh3zDrCjdWNXVNT6wsXVGKP97SvNpzqCHKBDelBZwgJfSt+OvksOa0Ujr 3AZSf7f7WJTL8x1D22DSXnj1X603KipA5TlF0aqeVhZTqWlQPg1Ja+xc93A1oai4MLM5oK Q4tV7w9HZ82zjlJUrF8vFFmaCai1Wgi+kLC/qh0u7CL45PWiRA+N6ZsKp8VEvokJIuhk1N kh4+J7jJsKG9E8R9atp+LrKDcfLa4Sul/6mGSw2mxaCMiOUY34+mrRZqD+T3YpZmZDDUc/ vocvIEa+2P3wtR40VKVqUJFuRXTJW7RhaiVa0kvsW43q2fgRA/CI0ryaTHEs4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735321220; a=rsa-sha256; cv=none; b=GR9ir12OwpiMZCI2+teIvJbkv4zbXYvOO/RzLQDomkoUWB0b+0eMhIFUsBJU7G839wnm1T lnT1qd5SYBQ1+8UTj/NBwpiCcx9WwxxjyRHeHvfFWGWGu/9KjkWhaB0i3kZTnvQYRuA/oI V+15uHZhlXUGYAfe2gtvBU9gDxI4jBFbyrospNjI+eLLlMNRiVG4k18P2Yt6A42vhn7Mkn dsTHF+k47uIbq4bJ3GGEh+CLNw9Cn2HiXdvLDkIYdiOjj/JHLkDN3h/LtTNC4TNkAa8pzU EiGFjVkwYbG9LvwLlQYMWCBKK6bdL/sPoY+v3fQXjzBBWNOtcYLftwdlfSIkag== Received: from [IPV6:2804:f1c:31:cc00:f541:9717:f6fd:58ab] (unknown [IPv6:2804:f1c:31:cc00:f541:9717:f6fd:58ab]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: garga) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YKXnv1wH3z11yy; Fri, 27 Dec 2024 17:40:19 +0000 (UTC) (envelope-from garga@FreeBSD.org) Message-ID: <1aa3fd17-c566-4432-8d30-3b412970f237@FreeBSD.org> Date: Fri, 27 Dec 2024 14:40:16 -0300 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta Subject: Re: git: ba1904937d9a - main - acpica: Extract _OSC parsing to a common file To: Kristof Provost Cc: Andrew Turner , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202412121819.4BCIJ1KW097190__8805.67587898753$1734027579$gmane$org@gitrepo.freebsd.org> <149116bc-677c-47b2-9ff7-f454418fec21@FreeBSD.org> Content-Language: en-US From: Renato Botelho Autocrypt: addr=garga@FreeBSD.org; keydata= xsBNBGStavwBCACjNlp/9+Y+VFe9ieR2h/WWbdvjz4Mb2z/f22bGoaskzCfvVNbo/v3i34I9 H6OdgZkGqheQEAD2jNfRbmPr4z40xDMUpYGLds+1Mvg7G3Hms3j5Ef8KaLSWUNWIfwKdfSVR Qs35ccSJxAdRW5YdI6J3xZgika+3Bc4eJ05YE/nWW+PNTYevt5rqD50N3zybVYIcLoqVPpBi AZE/sf5SLiLACIJb1t/s4x+pi8vgWevxVVT9u8V1f8zYErmHSLSqjxii0B3eRZphX9NCJOv9 +tfFZhnENInhn9gT7H4e2YumUltEy3jacONHJF3CC1pvvWEa6lEyypclMOkHQwNON7DLABEB AAHNLFJlbmF0byBCb3RlbGhvIChGcmVlQlNEKSA8Z2FyZ2FARnJlZUJTRC5vcmc+wsCXBBMB CgBBAhsDBQkFo5qABQsJCAcDBRUKCQgLBRYDAgEAAh4FAheAFiEERL7Dxegbnh7xTiQ5Ob6P xxJcZXoFAmSta78CGQEACgkQOb6PxxJcZXrYlggAgaZmr6c1yIWzN8VksHrHpwt/uxONEP+h ljy3yfrMsgfS5wx5Uzgfih1xYZUFC6jiI63CetqBqJpp3g1klRS1UWYKx2NeXphDMYZEdPm/ a6sXh4bKZbk6IE8Yn0/YiRT57d9DtbvswC7Gn7Igj/MSbhl49TvTGyvuB6juaffVoYZViomx 5zMoee8Ml2o2qj3MrCJ+/K8GU54RlpOGqGRsqdwVdr9XEWub6fF2YFwR46cjmbiU3P5urFHH nkJlBGPIwKxHimTW0lZsdx9aCKRDd/D80/WOEzXmk3k8B9lv/GsvOluHmveLhJG1R1tIJ31I f2q8dfTvqsQXnu8CcWRcgc7ATQRkrWr8AQgA1DufoxScA+CWQbUR6zExIu8wXQKrhuRt4DG2 BgynT7EMUvEBadcbQRZXsBpemNfncc9Axyut/+rWiyKJf9BLQuo/9QYmSRvW1U6+0LJUYmdg kMyBeYaPk+vnssv/u9jLuvV7FVgyE0yk1iaWIKOVDD+XrQCOvGw9uSceBrQyCyo3A/eRM/+p vnDCaywR63PKE+3axk6lfNdGK3TnaWmS30/ZDCZlNsXuqprqR4JdT5wXids5o36dsuJ5EZ20 s5hNMD34s4Yr1Y1R9elH6qBsFCpozs0+jwrArxq+UJJCR6hH5W8ZEwJtRC8tzR8mRE1WywzX BXYj0YhfGztQIxZckQARAQABwsB8BBgBCgAmFiEERL7Dxegbnh7xTiQ5Ob6PxxJcZXoFAmSt avwCGwwFCQWjmoAACgkQOb6PxxJcZXr1vgf/SKXhoZcUU5I7TqcbHg0lJz9tICTupCGHWr/s SQgjh9oEM5j1wqW7FlCGP90Tl9K0g3ow9YdbhU7VK470o6pymX9V9eLHzGgkZO/KMEtGBeK1 u+5ePjCJ/MK5B21KODLSU7WrIL1VN5ceXfQPLYt02LMLtPri+oduHD6RNBeA7US1DUzleq5F 9NHGbvV2U7BdDUezpiO8NaFjFZVB11I5d99FxUM5XGVstI3VhsRKZxjY0KnqJzaQgTFsPGmv AUfZVIN1pXgXiedhPXpr8+Y64jP+pHVwpVmh1zYWL6+q3kqFOUVP6c5iiMeoEXZvgJz7x/AC ek3X5gvu8Hpcv+MZIg== In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 27/12/24 14:26, Kristof Provost wrote: > On 26 Dec 2024, at 21:44, Renato Botelho wrote: > > On 12/12/24 15:19, Andrew Turner wrote: > > The branch main has been updated by andrew: > > URL: https://cgit.FreeBSD.org/src/commit/? > id=ba1904937d9ae0539e39001467a1519b17177118 cgit.FreeBSD.org/src/commit/? > id=ba1904937d9ae0539e39001467a1519b17177118> > > commit ba1904937d9ae0539e39001467a1519b17177118 > Author: Andrew Turner andrew@FreeBSD.org > AuthorDate: 2024-12-12 16:29:45 +0000 > Commit: Andrew Turner andrew@FreeBSD.org > CommitDate: 2024-12-12 18:00:22 +0000 > > |acpica: Extract _OSC parsing to a common file This will be used > by pci_host_generic_acpi.c so needs to be in a common location. > Reviewed by: imp, jhb Sponsored by: Arm Ltd Differential > Revision: https://reviews.freebsd.org/D48044 | > > My dev system was running CURRENT from Oct 31 and broke after I > upgrade to most recent version on Dec 20. After bisecting I found > this commit as the one that introduced the problem. > > It starts booting but can't found any disk. Pressing ? at mount > prompt shows nothing. This system is a VM running on KVM and I've > attached dmesg from successfully boot > > FreeBSD idaho.arrakis.com.br 15.0-CURRENT FreeBSD 15.0-CURRENT #22 > n274182-938e4b131c4: Thu Dec 26 18:10:12 -03 2024 > root@idaho.arrakis.com.br :/usr/ > obj/usr/src/amd64.amd64/sys/GENERIC-NODEBUG amd64 > > I’m seeing similar boot issues on VMWare aarch64 (i.e. freebsd in VMware > on a Mac). My bisect pointed to: > > |commit 1f5c50a8617355758510675cb9412f56fed12efc Author: Andrew Turner > Date: Thu Dec 12 16:30:39 2024 +0000 > pci_host_generic:Add pcib_request_feature on ACPI In the ACPI attachment > add support for the pcib_request_feature method. This uses the common > _OSC handling. Reviewed by: imp, jhb Sponsored by: Arm Ltd Differential > Revision: https://reviews.freebsd.org/D48048 | > > I’ve not yet been able to capture a dmesg, but it looks like the nvme > storage device just isn’t found, leading to the zpool failing to mount. > > I’m currently working around that with this patch: > > |diff --git a/sys/dev/pci/pci_host_generic_acpi.c b/sys/dev/pci/ > pci_host_generic_acpi.c index 1ff3a6bda707..c990edf26a3c 100644 --- a/ > sys/dev/pci/pci_host_generic_acpi.c +++ b/sys/dev/pci/ > pci_host_generic_acpi.c @@ -543,7 +543,7 @@ static device_method_t > generic_pcie_acpi_methods[] = { DEVMETHOD(pcib_release_msix, > generic_pcie_acpi_release_msix), DEVMETHOD(pcib_map_msi, > generic_pcie_acpi_map_msi), DEVMETHOD(pcib_get_id, > generic_pcie_acpi_get_id), - DEVMETHOD(pcib_request_feature, > generic_pcie_acpi_request_feature), + //DEVMETHOD(pcib_request_feature, > generic_pcie_acpi_request_feature), DEVMETHOD_END }; | I tried to apply your patch and got the same error on boot. The only way I found to make my system to boot properly is reverting ba1904937d9ae0539e39001467a1519b17177118 -- Renato Botelho From nobody Sat Dec 28 01:47:02 2024 X-Original-To: dev-commits-src-main@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 4YKlbV6LXsz5jhsY; Sat, 28 Dec 2024 01:47: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKlbV5SJMz4GDc; Sat, 28 Dec 2024 01:47:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735350422; 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=FESKnCd25cjbAThG+RbURWOV6DS/zvL/4BH7SwyC30g=; b=Nhq+iqJQva0vFkpzh07qxya17D2aDs3Gs147R+3qJJ4LkPbyKg+Nd0DsYdp/sCY0r5PpiH peQGATHmWtkreuTKf1ESC6cnBPVJqK2BtTW0aRa6pXHekag3nxO3brmrz5UIrOSa0UFOlY tEY8xZLCPR9Jr5cmzON6Boxe/Jg9hHZaT20efLs24Gv5nyJz8uWbFJ9JSxo5R1au00/kv9 GDF3EMNvMcPXPlRVdPRXXtehlYQvp5zCy/vtH998Z5tkfrpvaNloeiTtLgFLudO2YrIUf7 rkjBGeS0oAtmcpPxdEMReHJrraqXx3vAu5b/ihztP90LeXYUJj81gwTwYfiB+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735350422; 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=FESKnCd25cjbAThG+RbURWOV6DS/zvL/4BH7SwyC30g=; b=mMot7cwvgb3Si44b7htLzAQsabdR3MdqfyAn9wlfIvCp/naHN+U5cAf4Aubth4YNzT/kOl OqIK4FG8B7clpPWlG3e7At9Hv7v9QRRqOZp/DgdQTD7dF6AA0mgXa/Aggs16xqPAualo41 Azsx1P13Cmysyk2B4smpZ7O+fBmpQEv/ZvCUMmhCzFPYLM86oyaj6khvZqcVKWhzv5BIRF SCn8zVcv0sRzzUdYGvgceyHN0tqBsQEf+Lj65Qaglp3c5ewYD2Pv5vPXh1ZE7aBoYQ1KSZ O0aEAfuBiO2IwFR9zc9UJRwIDCrLB6CsHDzZWf2FvTHMgPRmjMlCbANTUMwcXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735350422; a=rsa-sha256; cv=none; b=S+8flronbwqRgZ5IA99P4UHGnaQTkquvch78bLUdOMIN5iawZ4BKwOOiyj/nofxOh/v0Bp 1QPrvZQbyTHBXdJf5GD48/0WWeYJ1D2hrvrc0O6F0aAAqJmK/g12MjQGvae35+G1jk2oFZ qG9qjg1ki9aClT6aFR99wu5/GaJ1gfrqwTZ8T0iIuK+W1zGa8AAeQUb82J75I0feB3W+ey BRSOSL5g3c1NgKXcI4fzYe+93S2rAkeoXVGc8HR+k5JsKGBYVahMSa9jtm+OA8/aAk0lNB NTBXDATk07EUSthAscyNCQnMcQzxEzgXEDuZKVq5znfHKeCgktLt/f0Qi2W6cw== 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 4YKlbV4wmhz14GS; Sat, 28 Dec 2024 01:47:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BS1l24T010515; Sat, 28 Dec 2024 01:47:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BS1l2iT010512; Sat, 28 Dec 2024 01:47:02 GMT (envelope-from git) Date: Sat, 28 Dec 2024 01:47:02 GMT Message-Id: <202412280147.4BS1l2iT010512@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 791170aaf7ef - main - rtwn: make sure RCR_APPFCS stays set in monitor mode / mode changes. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 791170aaf7efb4e053ccbf537d80a43e8a81d1e4 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=791170aaf7efb4e053ccbf537d80a43e8a81d1e4 commit 791170aaf7efb4e053ccbf537d80a43e8a81d1e4 Author: Adrian Chadd AuthorDate: 2024-12-16 20:09:56 +0000 Commit: Adrian Chadd CommitDate: 2024-12-28 01:46:38 +0000 rtwn: make sure RCR_APPFCS stays set in monitor mode / mode changes. My previous commit meant that APPFCS wasn't enabled during monitor mode and likely other corner cases. Ensure it stays on at all times. This, amusingly, fixes monitor mode in RTL8812AU/RTL8821AU - without it, I don't see HT/VHT frames in monitor mode but I can still receive them in normal STA mode. Differential Revision: https://reviews.freebsd.org/D48112 --- sys/dev/rtwn/if_rtwn_rx.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/dev/rtwn/if_rtwn_rx.c b/sys/dev/rtwn/if_rtwn_rx.c index b1465dd80ee7..e5ddc7a3cb97 100644 --- a/sys/dev/rtwn/if_rtwn_rx.c +++ b/sys/dev/rtwn/if_rtwn_rx.c @@ -532,7 +532,7 @@ rtwn_set_promisc(struct rtwn_softc *sc) RTWN_ASSERT_LOCKED(sc); mask_all = R92C_RCR_ACF | R92C_RCR_ADF | R92C_RCR_AMF | R92C_RCR_AAP; - mask_min = R92C_RCR_APM | R92C_RCR_APPFCS; + mask_min = R92C_RCR_APM; if (sc->bcn_vaps == 0) mask_min |= R92C_RCR_CBSSID_BCN; @@ -551,5 +551,12 @@ rtwn_set_promisc(struct rtwn_softc *sc) sc->rcr &= ~mask_min; sc->rcr |= mask_all; } + + /* + * Add FCS, to work around occasional 4 byte truncation. + * See the previous comment above R92C_RCR_APPFCS. + */ + sc->rcr |= R92C_RCR_APPFCS; + rtwn_rxfilter_set(sc); } From nobody Sat Dec 28 06:43:17 2024 X-Original-To: dev-commits-src-main@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 4YKt9K5L5xz5hcGv; Sat, 28 Dec 2024 06:43: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKt9K4k64z4lW1; Sat, 28 Dec 2024 06:43:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735368197; 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=kdqrCohqUkPeQj6NMTF7vpAksP8nzrJBe4mlLdFJzgo=; b=T8rVGFb1OpNyoiq8/VoFXUstbd5v6jDfnsl1upx+gOQBBtz0pUIZ+Ftd/PwFwreY0sBYPk WeTP9FZ8UlSs0i0s+RtevLpzt9fHCO2Mb0hmDm9Ct7Q43DlSvuwcMkTgTMxGzv9E61+KNj 8a4pYppKkKt7H3uulfTRsB6Y0439pQJ5AGt4FodYFgh5yRgpuKmvhIJnmgZLKiVO7aRf+U m+X2KOj+TG9a2L8bWQmcwagSTN853mmZkNz+H9dTVUhGJyjB4mJklHODvoeHUOaPiTiCdz QFSMx2P0+E1/VkBK0ZHEUAPaPeBHnLGiQN5eUv5EN+Qw2t++xR53SSBu5ju/AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735368197; 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=kdqrCohqUkPeQj6NMTF7vpAksP8nzrJBe4mlLdFJzgo=; b=y1FbKSHFat6JPMewEMhhpfQypuLvfXiuCuwNr99jOtxx3jePvsNk/dAvvskCsUNVqMK/XZ U0CM68saCz6/rB8fNzDibe95B7xhp10TYr0yyDDtK5gYb6wK/+E48nLgd8zWq1lqIt9Ep0 RrQrHMJeEUj4SlSlGsLMdrnb8qEnL8ta6Vwy1t6U90HJAyANeDjLoDbfZAtOgEQBG/zeQK lKidTFIpM0ZvLIQ+dBnsgSzKe3/JBkgocadUWFSIqWD82JdfHsmb4Tv8RsajNkELUNqCDr ZYGbW6vcRPZbb1AMKr3uZDb8hF6M1VgY9FNnKDikc0bn/3LdyyO+OwJUq9AHMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735368197; a=rsa-sha256; cv=none; b=Md4Prns8Z51Qsygq6uMyyXvXPPa+wDMJyf7ltIhYIlyN7Y6mbBzVY5bwm7pFIibVD1ZFbK 3/6zTflvwWyGaO0BMvnvoOdEeFSmjsJJX1DP9DKaQ9pAd23MTIqMdQTkg+y4mOuDaHx2u/ coJtUQhkveaAEpipD4jatoLCwpxBr6V86uabyLazGvWz2pRNIWKbZMUT3C2pv0Z4WleomI j/kP8RN3qYhADcH7s/XjfmYl8T07C1miLF7dLmNMjMliDXAhrOpO6No7emuWMY9zVieEEx Rg0nWlHtPtR91YYfJ3edi2LsrPo1K6ceLE0G/xc4JKXUmWhukmxoz60Jw8cHhw== 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 4YKt9K4KMPz1CWH; Sat, 28 Dec 2024 06:43:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BS6hHdR072242; Sat, 28 Dec 2024 06:43:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BS6hHfh072239; Sat, 28 Dec 2024 06:43:17 GMT (envelope-from git) Date: Sat, 28 Dec 2024 06:43:17 GMT Message-Id: <202412280643.4BS6hHfh072239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: fad3e1fbc8a4 - main - arm/qualcomm: Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: fad3e1fbc8a4b7bf4189c93e877bdb68aa26f611 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=fad3e1fbc8a4b7bf4189c93e877bdb68aa26f611 commit fad3e1fbc8a4b7bf4189c93e877bdb68aa26f611 Author: Gordon Bergling AuthorDate: 2024-12-28 06:37:41 +0000 Commit: Gordon Bergling CommitDate: 2024-12-28 06:41:24 +0000 arm/qualcomm: Fix a typo in a source code comment - s/unneccessary/unnecessary/ MFC after: 3 days --- sys/arm/qualcomm/ipq4018_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/qualcomm/ipq4018_machdep.c b/sys/arm/qualcomm/ipq4018_machdep.c index 206f428111ba..49dd2ff0193a 100644 --- a/sys/arm/qualcomm/ipq4018_machdep.c +++ b/sys/arm/qualcomm/ipq4018_machdep.c @@ -64,7 +64,7 @@ ipq4018_late_init(platform_t plat) * XXX FIXME This is needed because we're not parsing * the fdt reserved memory regions in a consistent way * between arm/arm64. Once the reserved region parsing - * is fixed up this will become unneccessary. + * is fixed up this will become unnecessary. * * These cover the SRAM/TZ regions that are not fully * accessible from the OS. They're in the ipq4018.dtsi From nobody Sat Dec 28 06:43:18 2024 X-Original-To: dev-commits-src-main@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 4YKt9M2w8xz5hcJP; Sat, 28 Dec 2024 06:43: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKt9M0GC2z4lSb; Sat, 28 Dec 2024 06:43:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735368199; 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=nvPjSzznX4q4WqGswl511T/dMO1ZKpF2DZvuDDDIsYE=; b=ckTLjy/WZKdP03V34Lgewqep6nRvwuXRsb4YcoFxxllQdoBib6MUUQTIk+2BggJhg766bP Xx83EAO/gotb4oidsNfjI/tCLG1l7LgqSyp3DzN2aOfkwR0V8tv8Bx62HQZ+LcFW417cPf bc1vJFIjmvv0afwwjmmcZ/a1Ldi4LS1qzjebhGd+zii0yCTu4x1aYOne3RiJkcOMzv2uHR 06KfaDWgG95D81n8JRzzrLkgPbc6HgIzGD6xILHso/bfWChiyb2XCYBZlcgc43OgSK89vq 5ZGy3V7g8FD7QtrNgR97py7lLEOQ/LyL8O7Ec4VmXgTLo9CY1U11X/0FF5JyuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735368199; 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=nvPjSzznX4q4WqGswl511T/dMO1ZKpF2DZvuDDDIsYE=; b=uZGre6ckuV51CZbK/0HPdCUCMQ5UWY+wy42R/fs0V061fy+7u2j5YNXQYKwkANwrZqYRms /ssjSmKRLJ+HUJeO2nRFL+IVStaWhxK+/24EKS1o00AM2Sq+EUG2bNAU3ibqz7WrfgQ2KO boWpmd7rFxhVG11jmIdnGeiU7JbGpfUrTkkscsKIRap01p+m3TBM4soTtAwCBkDv1kRZWi 5mj3nwQZbbLKiP66ehHqpz36dQ8FDuYLa5DUPnQTT3pyFYwDkoI+sIOp9yLi7kuwP8+5d+ kZp5f4ANOjiUwIjCJbQ7ULilo6G0PP0HDUVfhrwtrAl6VmFat379thIXcQEHiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735368199; a=rsa-sha256; cv=none; b=Atgma9Kw58+Yv9SNZW9ybt0KV7s+ZaQAPSk/Z7O5bNs+HHwCkiATvSGYlEWLnXA1EB6+Da ngiK/wzmRg4j94yziNH/WsdzlQOMGVuTiU4+N9//yvci3CFfNfQI+dptj46sTG+H5gOAyf 3ujwsRTgpCZEbuVEzbB0ndckSc+aq4xDz1hjMPEVWj/hlsCNTAb43EBfmK14326aMyRiDm 5KrG+SbVSlfSFljMHt/EbV9kcmErXUxAj7qz2tKXjU549LSJ0uD7CWK2c7FH8NM2yGqVLN L6Fom8kvtTsbP/GNSCRcQhFfYyZiJtdrCPCPDfYYk5hG+Nv2jgo0qDKP96RWqg== 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 4YKt9L5Mb5z1Cwn; Sat, 28 Dec 2024 06:43:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BS6hIjD072301; Sat, 28 Dec 2024 06:43:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BS6hIQp072298; Sat, 28 Dec 2024 06:43:18 GMT (envelope-from git) Date: Sat, 28 Dec 2024 06:43:18 GMT Message-Id: <202412280643.4BS6hIQp072298@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 3db51fb1720e - main - isci(4): Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 3db51fb1720efdddd6e8c2045397f59a398692d3 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3db51fb1720efdddd6e8c2045397f59a398692d3 commit 3db51fb1720efdddd6e8c2045397f59a398692d3 Author: Gordon Bergling AuthorDate: 2024-12-28 06:38:33 +0000 Commit: Gordon Bergling CommitDate: 2024-12-28 06:41:34 +0000 isci(4): Fix a typo in a source code comment - s/kength/length/ MFC after: 3 days --- sys/dev/isci/scil/sati_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/isci/scil/sati_util.c b/sys/dev/isci/scil/sati_util.c index 22c3111fe9ca..300ecbd5367b 100644 --- a/sys/dev/isci/scil/sati_util.c +++ b/sys/dev/isci/scil/sati_util.c @@ -70,7 +70,7 @@ /** * @brief This method will set the data direction, protocol, and transfer - * kength for an ATA non-data command. + * length for an ATA non-data command. * * @pre It is expected that the user will use this method for setting these * values in a non-data ATA command constuct. From nobody Sat Dec 28 06:43:19 2024 X-Original-To: dev-commits-src-main@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 4YKt9N0pXnz5hchg; Sat, 28 Dec 2024 06:43: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKt9M6TZcz4lQD; Sat, 28 Dec 2024 06:43:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735368199; 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=tu+JfGGu/kzdVWRk9Zn3qZwQ2Rvgf55wXxB5FBsBNZ4=; b=ySJXeZi0Qliz1265oQ/AMSY1BB6OKB2yiG2HT6CsVkrGTVii/o3KPBRgfq9M1T9bXPSay1 CyEjr3OiN7qzboyTyr87bowKdWyvTcnmPbG6ekMrW8wI4r7iBz168vH67AidO1REWOj+mP r2rvVU9pxa1a09gEV0RhfbTHjtRcxtJQ95K1HYeHf3VbnyrAUS0OlHJT+BLlxl0bWfAv1X Y+gXU2IuNsvYGbQeptUgcgqN3sN8c1rUMzrJjJA/JLkNMm2eCzEYEV9bKD/kHTrSEGlLEa M5ZEU7rojLKuy2US1+JhCBaQd8IS845NPIcR3bSgI/qiiBjw9dOc0ZWJ1sHpfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735368199; 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=tu+JfGGu/kzdVWRk9Zn3qZwQ2Rvgf55wXxB5FBsBNZ4=; b=rsj0XE5yXLr50wPNlq90pA8C+FyZ3D3GUyPWFoQxn/8G3/lOjc8YfYulWkWz6egSgC5h2f ys7UBRL0/WWP9/TP/Z7iPeNzVto8a58vHjKbAWbnOKLbK9wYBufKitJ3IlwW/dFbXUVMBF vFDTiFL829492TKsOemjWD3AiIlDcYYYlfwZHrir+JjRgkhAnrnH9GMvr+xNCnwAqEO1pv 3QrYcO57WBj6BhclTOO8PCowTBsP5NrByekHIGizIBQbHEIq2npAOEWR/cgvhhJ/kyjJ2O WUegRWYZwzIkIpMKvv+PCXz8tA3ePiPscahVHUJLExNonR4vkRJJgxDBwrcX7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735368199; a=rsa-sha256; cv=none; b=gJSml0kpwxmjZeWSFRT+O55nLf1wbOq3gUcN0dVrvLm6AAdUjEy4MjoBUHL+v8xsHpg7b3 2vqCLY1gwwViJrl/AtnIg037kZmdLaBFODo3pf1kR/xeL4NoCGR+hAnjTDf7GwPzyM32ZI Hoxc+YuSFjJ9xUReVVgpwl4TszGtKp1BQGbuQsPCio92ZzQvVV5sOJhoIx21UbVBi2JeLT DCwAokvfILqD73AvGnAKqY7S9aFZUcUDbdNFupDU7zgqZnbqTSjQZ4HzPA17FdAYd5a0cE dUNPl6AQVvpp7TT1f4kTLAgRTm8bJ6Lx0gxhB7cXFzyDyx3+5a32yAEY6Iu3TQ== 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 4YKt9M65k2z1CtH; Sat, 28 Dec 2024 06:43:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BS6hJai072361; Sat, 28 Dec 2024 06:43:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BS6hJPm072358; Sat, 28 Dec 2024 06:43:19 GMT (envelope-from git) Date: Sat, 28 Dec 2024 06:43:19 GMT Message-Id: <202412280643.4BS6hJPm072358@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: d40330306cd0 - main - sound(4): Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: d40330306cd000c7c64dc18a3634ac8e04b33fdd Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d40330306cd000c7c64dc18a3634ac8e04b33fdd commit d40330306cd000c7c64dc18a3634ac8e04b33fdd Author: Gordon Bergling AuthorDate: 2024-12-28 06:39:21 +0000 Commit: Gordon Bergling CommitDate: 2024-12-28 06:41:43 +0000 sound(4): Fix a typo in a source code comment - s/orginally/originally/ MFC after: 3 days --- sys/dev/sound/pci/csareg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sound/pci/csareg.h b/sys/dev/sound/pci/csareg.h index a36e36177f5c..3341390f618b 100644 --- a/sys/dev/sound/pci/csareg.h +++ b/sys/dev/sound/pci/csareg.h @@ -34,7 +34,7 @@ #define _CSA_REG_H /* - * The following constats are orginally in the sample by Crystal Semiconductor. + * The following constats are originally in the sample by Crystal Semiconductor. * Copyright (c) 1996-1998 Crystal Semiconductor Corp. */ From nobody Sat Dec 28 06:43:20 2024 X-Original-To: dev-commits-src-main@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 4YKt9P3RlXz5hcm8; Sat, 28 Dec 2024 06:43: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKt9P12H7z4lWK; Sat, 28 Dec 2024 06:43:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735368201; 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=mnQQJPoomVVpvqWOy5/oQCzKQhy9yETh0MK3qtfbVOo=; b=tWW3Jdoooug3NjC6TKKxm5wfAfBtBDGtDeA3Z1U/8nbylib4fFPWdFxW+vbqR48Hb8DTNO OUbBc79fSLqEcTsfv17Ax2bMuu/ApJaZYuX9qItPk1wmJxBrAHPwF8T2Syxhoxh3ESBGPo /M0+isR3UV7GKllIYo+QrWBSwtMP8TpiJG0CcAVY1/CQEawsXEX8gbUdfgXA2AOTPvudqy B9MgR5U10IjinCfxplmlyU9eSNSuKNWv/OS5AOxXMtMqxd+Ms39R3sisD92cIKb2dbuEA6 61GRmetSGiyu5p+DNtuTQtAd35a47bwg0HkKk5KrbwV77X0wEdWfFtfKgdrhmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735368201; 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=mnQQJPoomVVpvqWOy5/oQCzKQhy9yETh0MK3qtfbVOo=; b=LQftt63xVx8GykeUTnvfuWSi/sBMJRMmNtMbUgJAZ6XgDqCvlpjzkvFGd6ndbuydTDyMJj gJfrAS3VLcihu5DT9oUrNLH+9J7KiOWy56s6an0XRWZQaEukdGAV7lzmwAQ0MigBKvq/LL VCXNTkd3xc74x+Zc02jHkpcYK5XTCpVsiW99iGH8OWD1mkrqkDSaXBo2hkjbxyjVSk0i/Q eLortsGkmL51L8P8zVB6JRdK0Y9HTtlOjSWZWP/XpFCLbuiVxrMQ6nExzeA7hqhFLRZRnA qObv7wbdWFihXkH2BmeBkkMsM+dD8CRuYBZuYpz/a7sex7evANV5u1SGg4y+7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735368201; a=rsa-sha256; cv=none; b=n09ODFE1OtmyybiHg6BJC5ZX+4wjQkGq2HLzhJGH4dkPBTrnJ4B6zIhvtH1mLBREO0gsGC SiaNJ2tTDnpFXXbGlxCU0wQb+WFsmmJEv8PGtzjDh6M5GXle+/zBuZzP9ahjzwr8Av4izX eUcxs/xezHRPpatUzMjJ9rNaqjlKCkkI+nFEu2pc5E0TpOqTL5jMlxzSMDldKtbQjF3TmX C8tD8Fc22mBsUySN7FqsU24Lbl3gPZFTANqXW/JKAbsGtyfXzcv4Ft35OnLYSMeNbe+zGa vmfB+8En2iFwFsJ4zbNehMF/Dyur4C+bzbesZq2g99wJl8r5tsM0on5pPuw01A== 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 4YKt9P0JpWzDq4; Sat, 28 Dec 2024 06:43:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BS6hK0G072431; Sat, 28 Dec 2024 06:43:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BS6hKb7072428; Sat, 28 Dec 2024 06:43:20 GMT (envelope-from git) Date: Sat, 28 Dec 2024 06:43:20 GMT Message-Id: <202412280643.4BS6hKb7072428@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 15ce9a0544e9 - main - kern: Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 15ce9a0544e9d850fb332b4bae3313ff38584d61 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=15ce9a0544e9d850fb332b4bae3313ff38584d61 commit 15ce9a0544e9d850fb332b4bae3313ff38584d61 Author: Gordon Bergling AuthorDate: 2024-12-28 06:39:50 +0000 Commit: Gordon Bergling CommitDate: 2024-12-28 06:41:50 +0000 kern: Fix a typo in a source code comment - s/explicity/explicitly/ MFC after: 3 days --- sys/kern/sys_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index fe2e112dbcfa..581f8f65ec56 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -355,7 +355,7 @@ proc_rwmem(struct proc *p, struct uio *uio) /* * If we are writing, then we request vm_fault() to create a private * copy of each page. Since these copies will not be writeable by the - * process, we must explicity request that they be dirtied. + * process, we must explicitly request that they be dirtied. */ writing = uio->uio_rw == UIO_WRITE; reqprot = writing ? VM_PROT_COPY | VM_PROT_READ : VM_PROT_READ; From nobody Sat Dec 28 07:16:47 2024 X-Original-To: dev-commits-src-main@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 4YKtw000Bmz5hfrG; Sat, 28 Dec 2024 07:16: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKtvz4nsFz4qYF; Sat, 28 Dec 2024 07:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735370207; 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=PZO0jDSr0J20+Jpb4sCLkgCUFgB/LKdV8tGZl0CCewc=; b=rGNkFyyCXaYx9NMcAXCuEjcLf2PCz9ERPOV5LBV6zuP+IGST74+egiXDwtP2SvUbpAJLbe 40tk13rEgsvpPi5/b8QmRQQdPu6MUME4EDPArXyFr1CLjmIWTOdv9FxKl3XPaO14JZJhuF HvALY2D36HYc2TEJexA7HwTHYkcQ+oEz4x2JHOPNgTWEhbrxMhno8F9EMFC0qvxpiPM0kW ihqWzEGuRyCct6kdh8xLdAkRXdnXWOwiH2ypwVhEUccv/qpLflj8XeMGvl8iJMHhYfQCC7 bmzWCYC2uJMUR+StYL2cW5Jg00TX5yaLOnUumDTyhU/A61W5Ee0WkgzJ3gP58w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735370207; 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=PZO0jDSr0J20+Jpb4sCLkgCUFgB/LKdV8tGZl0CCewc=; b=bKBRWsEn/dGl9dpqI1lP0KNATjmdIg3VIIlAHQQ5QoRFEPPY31aFpc0nq8cC8ZJfyEtUFi L0keCCFv6L0EYlY5NNasto/t80i6zcsPL48ayaNl8lV72W5OVovr1TE6SovD9SPIX8VMnM 0NHOAp5413NQsW5Z2dQLouJtwuCJZyQaqSs7Yvtn3F2AybLharqcP/Nt1FgJcLPPo9bhLW s5X5IBg6wv9Mp66R5aFjm8CngGmI/YRBI5huK0eR+usPvYnClQEsXiD22YBExgRVV3oPOP TEAubmudumvIu7eV+T4XTZv1xlwkYGRMtgxm0r+KoEx+bAGpYmzHffA2v3rV6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735370207; a=rsa-sha256; cv=none; b=ySsTjh68CFKpFzGX6hBxORUgVOq7+7my+XDL7KHZ/NFVODDlqWGnvrCbPyvNRI3RIJ9llN dAeJLfsFXGO4i/VYwadvZL8PBudZWwcDqhF2qQdQbJ4LgnB13N4KDi0Txsq9QijvT4AMQK 90xNpI1Gm8mn1VC7eTMIY35kZoLlJwHFqY+ecvBhVxCL43W11gWoldHCBY3d5WTayzFzOA E9KOUoqGFyml11aGitS14dn/c8kClaN/RRa3B+98CRjXUHAO5fLpWeXOH0/TOxZxkeEqGZ dHJhcJH4I3MbtOR/0kEzrjkfR+y1kbZyeIVp1fbMq0Pl0z81ETpubEAS0ONgmA== 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 4YKtvz43mkzFHl; Sat, 28 Dec 2024 07:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BS7GlNw030349; Sat, 28 Dec 2024 07:16:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BS7GlY0030346; Sat, 28 Dec 2024 07:16:47 GMT (envelope-from git) Date: Sat, 28 Dec 2024 07:16:47 GMT Message-Id: <202412280716.4BS7GlY0030346@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 06690044dac1 - main - timeout(1): Some minor tweaks and improvements List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 06690044dac183ea1d93c2ae227e261da3bdca2a Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=06690044dac183ea1d93c2ae227e261da3bdca2a commit 06690044dac183ea1d93c2ae227e261da3bdca2a Author: Gordon Bergling AuthorDate: 2024-12-28 07:13:22 +0000 Commit: Gordon Bergling CommitDate: 2024-12-28 07:13:22 +0000 timeout(1): Some minor tweaks and improvements - Define exit status and macros and use them - Improve the second kill logic by setting 'do_second_kill = false' after configuring the second kill - Minor style tweaks - Reorder options in the man page, as well as the usage help - Reorder the exit status in the man page - Enhance the HISTORY section in the man page (obtained from NetBSD) Reviewed by: bapt, Alexander Ziaee (manpages) Approved by: bapt (src) Obtained from: DragonFlyBSD MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47866 --- bin/timeout/timeout.1 | 63 +++++++++++++++++++++++++++++++-------------------- bin/timeout/timeout.c | 38 ++++++++++++++++++------------- 2 files changed, 60 insertions(+), 41 deletions(-) diff --git a/bin/timeout/timeout.1 b/bin/timeout/timeout.1 index 10e5fd70c393..b8ec3030b271 100644 --- a/bin/timeout/timeout.1 +++ b/bin/timeout/timeout.1 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 17, 2024 +.Dd December 28, 2024 .Dt TIMEOUT 1 .Os .Sh NAME @@ -32,10 +32,11 @@ .Nd run a command with a time limit .Sh SYNOPSIS .Nm -.Op Fl -signal Ar sig | Fl s Ar sig -.Op Fl -preserve-status +.Op Fl k Ar time | Fl -kill-after Ar time +.Op Fl s Ar sig | Fl -signal Ar sig .Op Fl -kill-after Ar time | Fl k Ar time .Op Fl -foreground +.Op Fl -preserve-status .Ar duration .Ar command .Op Ar args ... @@ -62,18 +63,6 @@ is 0. .Pp The options are as follows: .Bl -tag -width indent -.It Fl -preserve-status -Exit with the same status as -.Ar command , -even if it times out and is killed. -.It Fl -foreground -Do not propagate timeout to the children of -.Ar command . -.It Fl s Ar sig , Fl -signal Ar sig -Specify the signal to send on timeout. -By default, -.Dv SIGTERM -is sent. .It Fl k Ar time , Fl -kill-after Ar time Send a .Dv SIGKILL @@ -82,8 +71,21 @@ signal if is still running after .Ar time after the first signal was sent. +.It Fl s Ar sig , Fl -signal Ar sig +Specify the signal to send on timeout. +By default, +.Dv SIGTERM +is sent. +.It Fl -foreground +Do not propagate timeout to the children of +.Ar command . +.It Fl -preserve-status +Exit with the same status as +.Ar command , +even if it times out and is killed. .El .Sh DURATION FORMAT +The .Ar duration and .Ar time @@ -92,7 +94,7 @@ unit-specifying suffix. Values without an explicit unit are interpreted as seconds. .Pp Supported unit symbols are: -.Bl -tag -width indent -compact +.Bl -tag -offset indent -width indent -compact .It Cm s seconds .It Cm m @@ -116,10 +118,15 @@ If .Fl -preserve-status is not set, an exit status of 124 is returned. .Pp +If an invalid parameter is passed to +.Fl s +or +.Fl k , +the exit status returned is 125. +.Pp If .Ar command -exits after receiving a signal, the exit status returned is the signal number -plus 128. +is an otherwise invalid program, the exit status returned is 126. .Pp If .Ar command @@ -127,13 +134,8 @@ refers to a non-existing program, the exit status returned is 127. .Pp If .Ar command -is an otherwise invalid program, the exit status returned is 126. -.Pp -If an invalid parameter is passed to -.Fl s -or -.Fl k , -the exit status returned is 125. +exits after receiving a signal, the exit status returned is the signal number +plus 128. .Sh EXAMPLES Run .Xr sleep 1 @@ -206,6 +208,17 @@ The .Nm command first appeared in .Fx 10.3 . +.Pp +The +.Fx +work is compatible with GNU +.Nm +by +.An Padraig Brady , +from GNU Coreutils 8.21. +The +.Nm +utility first appeared in GNU Coreutils 7.0. .Sh AUTHORS .An Baptiste Daroussin Aq Mt bapt@FreeBSD.org and diff --git a/bin/timeout/timeout.c b/bin/timeout/timeout.c index b1c3262bf711..76e51eaa965e 100644 --- a/bin/timeout/timeout.c +++ b/bin/timeout/timeout.c @@ -41,6 +41,9 @@ #include #define EXIT_TIMEOUT 124 +#define EXIT_INVALID 125 +#define EXIT_CMD_ERROR 126 +#define EXIT_CMD_NOENT 127 static sig_atomic_t sig_chld = 0; static sig_atomic_t sig_term = 0; @@ -51,9 +54,9 @@ static void usage(void) { - fprintf(stderr, "Usage: %s [--signal sig | -s sig] [--preserve-status]" - " [--kill-after time | -k time] [--foreground] " - " \n", getprogname()); + fprintf(stderr, "Usage: %s [-k time | --kill-after time]" + " [-s sig | --signal sig] [--foreground] [--preserve-status]" + " \n", getprogname()); exit(EXIT_FAILURE); } @@ -66,13 +69,13 @@ parse_duration(const char *duration) ret = strtod(duration, &end); if (ret == 0 && end == duration) - errx(125, "invalid duration"); + errx(EXIT_INVALID, "invalid duration"); if (end == NULL || *end == '\0') return (ret); if (end != NULL && *(end + 1) != '\0') - errx(125, "invalid duration"); + errx(EXIT_INVALID, "invalid duration"); switch (*end) { case 's': @@ -87,11 +90,11 @@ parse_duration(const char *duration) ret *= 60 * 60 * 24; break; default: - errx(125, "invalid duration"); + errx(EXIT_INVALID, "invalid duration"); } if (ret < 0 || ret >= 100000000UL) - errx(125, "invalid duration"); + errx(EXIT_INVALID, "invalid duration"); return (ret); } @@ -106,6 +109,7 @@ parse_signal(const char *str) if (errstr == NULL) return (sig); + if (strncasecmp(str, "SIG", 3) == 0) str += 3; @@ -114,7 +118,7 @@ parse_signal(const char *str) return (i); } - errx(125, "invalid signal"); + errx(EXIT_INVALID, "invalid signal"); } static void @@ -149,7 +153,7 @@ set_interval(double iv) memset(&tim, 0, sizeof(tim)); tim.it_value.tv_sec = (time_t)iv; - iv -= (time_t)iv; + iv -= (double)tim.it_value.tv_sec; tim.it_value.tv_usec = (suseconds_t)(iv * 1000000UL); if (setitimer(ITIMER_REAL, &tim, NULL) == -1) @@ -160,10 +164,10 @@ int main(int argc, char **argv) { int ch; - unsigned long i; int foreground, preserve; int error, pstat, status; int killsig = SIGTERM; + size_t i; pid_t pid, cpid; double first_kill; double second_kill; @@ -240,11 +244,13 @@ main(int argc, char **argv) signals.sa_handler = sig_handler; signals.sa_flags = SA_RESTART; - for (i = 0; i < sizeof(signums) / sizeof(signums[0]); i++) + for (i = 0; i < sizeof(signums) / sizeof(signums[0]); i++) { if (signums[i] != -1 && signums[i] != 0 && sigaction(signums[i], &signals, NULL) == -1) err(EXIT_FAILURE, "sigaction()"); + } + /* Don't stop if background child needs TTY */ signal(SIGTTIN, SIG_IGN); signal(SIGTTOU, SIG_IGN); @@ -259,9 +265,9 @@ main(int argc, char **argv) error = execvp(argv[0], argv); if (error == -1) { if (errno == ENOENT) - err(127, "exec(%s)", argv[0]); + err(EXIT_CMD_NOENT, "exec(%s)", argv[0]); else - err(126, "exec(%s)", argv[0]); + err(EXIT_CMD_ERROR, "exec(%s)", argv[0]); } } @@ -294,7 +300,7 @@ main(int argc, char **argv) break; } else { procctl(P_PID, getpid(), - PROC_REAP_STATUS, &info); + PROC_REAP_STATUS, &info); if (info.rs_children == 0) break; } @@ -313,7 +319,7 @@ main(int argc, char **argv) if (do_second_kill) { set_interval(second_kill); - second_kill = 0; + do_second_kill = false; sig_ign = killsig; killsig = SIGKILL; } else @@ -330,7 +336,7 @@ main(int argc, char **argv) if (do_second_kill) { set_interval(second_kill); - second_kill = 0; + do_second_kill = false; sig_ign = killsig; killsig = SIGKILL; } else From nobody Sat Dec 28 12:52:20 2024 X-Original-To: dev-commits-src-main@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 4YL2MG1hcHz5jL8X; Sat, 28 Dec 2024 12:52:26 +0000 (UTC) (envelope-from tuexen@freebsd.org) Received: from drew.franken.de (mail-n.franken.de [193.175.24.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "Certum Domain Validation CA SHA2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL2MF2V1fz4Lgl; Sat, 28 Dec 2024 12:52:25 +0000 (UTC) (envelope-from tuexen@freebsd.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=softfail (mx1.freebsd.org: 193.175.24.27 is neither permitted nor denied by domain of tuexen@freebsd.org) smtp.mailfrom=tuexen@freebsd.org; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=freebsd.org (policy=none) Received: from smtpclient.apple (unknown [IPv6:2a02:8109:1140:c3d:8c31:93fe:2e38:cc39]) (Authenticated sender: macmic) by drew.franken.de (Postfix) with ESMTPSA id 666AB721E2806; Sat, 28 Dec 2024 13:52:21 +0100 (CET) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.300.87.4.3\)) Subject: Re: git: 1f5c50a86173 - main - pci_host_generic:Add pcib_request_feature on ACPI From: tuexen@freebsd.org In-Reply-To: <202412121819.4BCIJ6fq097364@gitrepo.freebsd.org> Date: Sat, 28 Dec 2024 13:52:20 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <75B236EB-ECB4-46B5-807D-4B5802E96485@freebsd.org> References: <202412121819.4BCIJ6fq097364@gitrepo.freebsd.org> To: Andrew Turner X-Mailer: Apple Mail (2.3826.300.87.4.3) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Spamd-Result: default: False [-2.60 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; MV_CASE(0.50)[]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : No valid SPF, No valid DKIM,none]; RCVD_IN_DNSWL_LOW(-0.10)[193.175.24.27:from]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; FROM_NO_DN(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEFALL_USER(0.00)[tuexen]; ASN(0.00)[asn:680, ipnet:193.174.0.0/15, country:DE]; TO_DN_EQ_ADDR_SOME(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; R_DKIM_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all:c]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[4] X-Rspamd-Queue-Id: 4YL2MF2V1fz4Lgl X-Spamd-Bar: -- Hi Andrew, this commits breaks the booting of my arm64 VM using VMWare fusion on an = M1 MacBookPro. During booting it reports: ... mountroot: waiting for device /dev/nda0p2 uhub0: 6 port with 6 removable, self powered Mounting from ufs:/dev/nda0p2 failed with error 19 Loader variables: vfs.root.mountfrom=3Dufs:/dev/nda0p2 vfs.root.montfrom.options=3Drw Manual root filesystem specification: ... Any idea what is going wrong? Best regards Michael > On 12. Dec 2024, at 19:19, Andrew Turner wrote: >=20 > The branch main has been updated by andrew: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D1f5c50a8617355758510675cb9412f56= fed12efc >=20 > commit 1f5c50a8617355758510675cb9412f56fed12efc > Author: Andrew Turner > AuthorDate: 2024-12-12 16:30:39 +0000 > Commit: Andrew Turner > CommitDate: 2024-12-12 18:00:23 +0000 >=20 > pci_host_generic:Add pcib_request_feature on ACPI >=20 > In the ACPI attachment add support for the pcib_request_feature = method. > This uses the common _OSC handling. >=20 > Reviewed by: imp, jhb > Sponsored by: Arm Ltd > Differential Revision: https://reviews.freebsd.org/D48048 > --- > sys/dev/pci/pci_host_generic_acpi.c | 27 +++++++++++++++++++++++++++ > sys/dev/pci/pci_host_generic_acpi.h | 1 + > 2 files changed, 28 insertions(+) >=20 > diff --git a/sys/dev/pci/pci_host_generic_acpi.c = b/sys/dev/pci/pci_host_generic_acpi.c > index d90b7c0c01f8..1ff3a6bda707 100644 > --- a/sys/dev/pci/pci_host_generic_acpi.c > +++ b/sys/dev/pci/pci_host_generic_acpi.c > @@ -287,6 +287,8 @@ pci_host_generic_acpi_init(device_t dev) > sc =3D device_get_softc(dev); > handle =3D acpi_get_handle(dev); >=20 > + acpi_pcib_osc(dev, &sc->osc_ctl, 0); > + > /* Get Start bus number for the PCI host bus is from _BBN method */ > status =3D acpi_GetInteger(handle, "_BBN", &sc->base.bus_start); > if (ACPI_FAILURE(status)) { > @@ -504,6 +506,30 @@ generic_pcie_acpi_get_id(device_t pci, device_t = child, enum pci_id_type type, > return (pcib_get_id(pci, child, type, id)); > } >=20 > +static int > +generic_pcie_acpi_request_feature(device_t pcib, device_t dev, > + enum pci_feature feature) > +{ > + struct generic_pcie_acpi_softc *sc; > + uint32_t osc_ctl; > + > + sc =3D device_get_softc(pcib); > + > + switch (feature) { > + case PCI_FEATURE_HP: > + osc_ctl =3D PCIM_OSC_CTL_PCIE_HP; > + break; > + case PCI_FEATURE_AER: > + osc_ctl =3D PCIM_OSC_CTL_PCIE_AER; > + break; > + default: > + return (EINVAL); > + } > + > + return (acpi_pcib_osc(pcib, &sc->osc_ctl, osc_ctl)); > +} > + > + > static device_method_t generic_pcie_acpi_methods[] =3D { > DEVMETHOD(device_probe, generic_pcie_acpi_probe), > DEVMETHOD(device_attach, pci_host_generic_acpi_attach), > @@ -517,6 +543,7 @@ static device_method_t generic_pcie_acpi_methods[] = =3D { > DEVMETHOD(pcib_release_msix, generic_pcie_acpi_release_msix), > DEVMETHOD(pcib_map_msi, generic_pcie_acpi_map_msi), > DEVMETHOD(pcib_get_id, generic_pcie_acpi_get_id), > + DEVMETHOD(pcib_request_feature, generic_pcie_acpi_request_feature), >=20 > DEVMETHOD_END > }; > diff --git a/sys/dev/pci/pci_host_generic_acpi.h = b/sys/dev/pci/pci_host_generic_acpi.h > index 802099abb9d7..5617da971306 100644 > --- a/sys/dev/pci/pci_host_generic_acpi.h > +++ b/sys/dev/pci/pci_host_generic_acpi.h > @@ -35,6 +35,7 @@ > struct generic_pcie_acpi_softc { > struct generic_pcie_core_softc base; > int segment; > + uint32_t osc_ctl; > ACPI_BUFFER ap_prt; /* interrupt routing table */ > }; >=20 From nobody Sat Dec 28 15:34:17 2024 X-Original-To: dev-commits-src-main@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 4YL5y15KGLz5jWcK; Sat, 28 Dec 2024 15:34: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL5y14mCPz4ZYd; Sat, 28 Dec 2024 15:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735400057; 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=ykBBEWWQ84LKdgzCUIijsa1wnqKcg2jKh1qd30gTXJQ=; b=gZ9iuykApGM5WylMxlY9iDLuJMes2Qagm2EHwhcYcb9f4tVOOlVfpRyV/l1cE4ojaroqdm uN5zlDr27bpty+hfpMOoRoIQu7G3/O0U+qNPL1wTkwFF/N3lJKcYQRIZIVwm/2xcCFObvg UEzqJgFvvGvyYzqnOYTlazjmaft9FbTM9iQssUitufpF1xkEcz1jrMhtD1zU16ajLxgtrz uwWa+nIn5Jol5vHiirEt5opiW6N4+gQhWYoJ3HtloT/oNvXy7SOkQChsd30jj8+fqElyVZ H0SIyJoOspR6j7yRayQYsoaGLn26H2cgN2C9OHlc9tReJLILk3S6jnlIbc/OzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735400057; 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=ykBBEWWQ84LKdgzCUIijsa1wnqKcg2jKh1qd30gTXJQ=; b=ARcIQmr1Yb5bf7Eievf9C6Hofm0NOrfIkrtdGxWIYBEdWeRMWF35pK+pnFRiotZRBwdzGx m1BdtgcJqok0PpuUHLsXCsLph70fTHbjTkXV9gFo6B+S4SsZFlo117FY2JhkJqszTog9pk EfgGQpaXRI7U5bLGU8FxmaUyzY0jCEnpfs9ojO4ue3roSRTFksC1MuRo8Rfx9aoNpHKIDv ykSBqOEsfw0N+ubL4HLM+0gDAuJEQWWTWaTU22RDu7pfXSaInwSEiPA7vPWnpjYu+a62vA 5nbgMxzlrktenLKQ8BzCJJ0brW3xxDPtyXSgwEEWQcR066ZLa5zl5FcElTuYJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735400057; a=rsa-sha256; cv=none; b=Wg8/zOBwBVZg37miYTYRGj+q0hIHehH74RDQ4kfr7ZtbZB92oDVRQx0ifCfGGk8nFMJwLN yCopfRpCkPbAjkF1IBLHtsgl6LxOMdR7uO4kFN7wnxYtEXS8Wy8fr5giJ10t+OaoghzLLD zBIyPmtxw7LWXODrzqu8eqO/I8IqDWUbsdMjRbdTu8rLuQGTTZ1pHeayjyTUOmD5A1daQ5 +RJrCf9B4eTprqdKBdX9D5LPL4t00jg31pk1AKe/rub2MekzeH76tvlG3Or5O+qaGb/LE1 asbnLP9HZICv/PrZ0v8dFdbsZYfvlbEPoD/u3FBkGi/naKeywKbREsDVruX25A== 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 4YL5y141n7zWLV; Sat, 28 Dec 2024 15:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSFYHbX063292; Sat, 28 Dec 2024 15:34:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSFYHU4063289; Sat, 28 Dec 2024 15:34:17 GMT (envelope-from git) Date: Sat, 28 Dec 2024 15:34:17 GMT Message-Id: <202412281534.4BSFYHU4063289@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 837feb4d05c2 - main - kernel: Clarify kern.elfNN.nxstack sysctl description List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 837feb4d05c2dccafa1698649b58f7b7fdc59c54 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=837feb4d05c2dccafa1698649b58f7b7fdc59c54 commit 837feb4d05c2dccafa1698649b58f7b7fdc59c54 Author: Ed Maste AuthorDate: 2024-12-27 20:42:17 +0000 Commit: Ed Maste CommitDate: 2024-12-28 15:33:33 +0000 kernel: Clarify kern.elfNN.nxstack sysctl description The nxstack sysctl controls processing of the PT_GNU_STACK segment, not directly whether or not the stack is executable. Reviewed by: kib, shurd Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48221 --- sys/kern/imgact_elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 916011f573cf..d94f9e1e5143 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -127,7 +127,7 @@ int __elfN(nxstack) = #endif SYSCTL_INT(__CONCAT(_kern_elf, __ELF_WORD_SIZE), OID_AUTO, nxstack, CTLFLAG_RW, &__elfN(nxstack), 0, - __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) ": enable non-executable stack"); + __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) ": support PT_GNU_STACK for non-executable stack control"); #if defined(__amd64__) static int __elfN(vdso) = 1; From nobody Sat Dec 28 15:54:52 2024 X-Original-To: dev-commits-src-main@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 4YL6Pn1NpJz5jXYW; Sat, 28 Dec 2024 15:54:53 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL6Pn0tdqz4cR6; Sat, 28 Dec 2024 15:54:53 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735401293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=/2FZydhUsYg4AGG3mQVlLvgHaL0g0kzPb4gZmiUXRp4=; b=m+apRJD9AYWC0Zf/Y5bhkaPVjYRiqd7y7saNWjOkPGokXzT8+387shAuOhackaNe0uO2ek S3v4rKyW0K2P3Qb042np8VNrIgt9alhk//9m4kAHyWx20GLRkTDv/hLa/R+SyL6YGOuD64 B7iE7LdCNAJHEg0WsCBvSob31x7f1FEYzvJ3hE8NNvX1REpag886ItiWPD8mcPdYXK4wLX 3KJu5KhGt8g+VoUtk05Oko1+66waBOtUf1mvPOV02ozgD2WU8gbBuCXCsbBoTOEFgaY12W z4y0mauhXTyLhWzdlq8QW2wXwaFhfSchrZayZVD8ojsAp5qiFGDs9InxivydLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735401293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=/2FZydhUsYg4AGG3mQVlLvgHaL0g0kzPb4gZmiUXRp4=; b=MFkhkluhUWvOuQ9qr36u78X1yad525DhFzbdY47elI5VQ+Riga+/pEhH9Cc0F1pucV3yJg ZIu9OyFQa5XSDHk4BEaUa+/q+HovS1q4blTt+IHxuKKiZpaanMtF8eUuC/UJ32iObHE+HN sPd6/1wqz/SozZCrMkclZFfZo2c37YdLjmSWzHeimqHLpaf3V5IqrhNcJLyMpMPsDmxFXo mqOAGeH6mKvrgo9bd/L5OWkTHSQubZbTKMzpS5AExwT3QmNw6j6BcszvMawdW+hjwUJBJJ RaMN2D5BFcM/hAf8hz0uGAIwWDlNkAjiBilBtQIg6WqCJFW2kLk1AKsP4yqHuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735401293; a=rsa-sha256; cv=none; b=DCIAndfbS0zAu5EdvJUwxAyUxwVQv5h4trY8QCXyXOMt1vAHA3Rygc9GxERF+PCq547C31 w8uA4UESAnidvA5r9YQ65ERTIZSavRhCtKGZgHHgEG706nKtAUvJrkX3HRo2d++S3nUJmF 9sGTwej9dEUuRMzzmE98dj/FNXjUw+0Z/kcIa/875fxMspT3+NNMIJIpwDLe9QpgdHn4Yx QwJEuFkbmRF8E60q/bjB1ZqZnpsPjyqCxGTNJOK4v5rWiOYWlH9GIWxmPARbtTdVLRe2aU mB+58C431+OCBT5CivIJrb8Cgmqrc6U88N9FOx+2cNucDmdYkM/cgqcYSRiu2A== Received: by freefall.freebsd.org (Postfix, from userid 1033) id 0218C1F369; Sat, 28 Dec 2024 15:54:53 +0000 (UTC) Date: Sat, 28 Dec 2024 15:54:52 +0000 From: Alexey Dokuchaev To: Andriy Gapon Cc: Vladimir Kondratyev , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 24ae172a5035 - main - ng_ubt(4): do not attach Realtek 87XX/88XX adaptors in bootloader mode. Message-ID: References: <202411062331.4A6NVuiE070018@gitrepo.freebsd.org> <14efd79e-75be-4f96-8a04-7ffc9ed1012c@FreeBSD.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <14efd79e-75be-4f96-8a04-7ffc9ed1012c@FreeBSD.org> On Fri, Dec 27, 2024 at 04:41:35PM +0200, Andriy Gapon wrote: > On 07/11/2024 01:31, Vladimir Kondratyev wrote: > > commit 24ae172a50352ad4fd22989477f29ecca5aed6e3 > > > > ng_ubt(4): do not attach Realtek 87XX/88XX adaptors in bootloader mode. > > Today I upgraded only to find out that my bluetooth related things stopped > working. It turned out that ng_ubt didn't attach to my USB bluetooth > adapter. > Only then I discovered this change, installed the firmware package, etc. > > As strange as it may seem, previously my adapter worked without uploading > any extra firmware. I'd also like to hear why some hardware which used to work before without explicit firmware upload now may requires these extra dances, just to be prepared if my BT/WiFi cards suddenly stop working as well. ./danfe From nobody Sat Dec 28 17:20:21 2024 X-Original-To: dev-commits-src-main@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 4YL8JQ2x65z5jfRJ; Sat, 28 Dec 2024 17:20:22 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL8JQ0krTz4my9; Sat, 28 Dec 2024 17:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406422; 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=pDNNxkF4BohC/3M/Ox/uzvsdDQLPdv9SZw+dr1JZlIs=; b=htzwHYDxv0/E6H8qqDMDx4+ljFLE85TByVTfQGyKdlIQDIfAoMGSV5/Gvab4wxrcRC6xc1 qp+nlwgAJRAciOo6lvOLxPOYx0EE/4Mco75elePZ85mL3FiDzh1TW8GB2M1RSe1S9S4Gw1 ghP3Fx1nkB/njhgNL+2GVVhmbwqTaFhY++iSUsF5AaNK5/FAQwvf5yuIsyxjOVch0GeDlh NjuutIPAiTgwDmLFtMxRvOAn1Du5IhUh+O0KyRxkAKQRNOlUIueuUu0tGFOHEYl5LB86BL qqieSvmDUvRT2KLtCrmertlSFNQau1e49tucdfHRONrTZX+6hDibSKHaexDivQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406422; 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=pDNNxkF4BohC/3M/Ox/uzvsdDQLPdv9SZw+dr1JZlIs=; b=rhyyI0WSetNRlzLInzGWH6NJz50Fmjzbr3i+xZYrqLu5UIliXEYKVKPVEKEzLo4SPvEsfJ O0q/lYq8j7HVdqKimjQZjF3shFkLQvpCQ1N/pVQHBq3sE+UQ6JUjnpVe5cEKN3Z5K0edyd qwhJ5RrXcmuDoKJMErKzFPqMcYcGbdu0O2yV2QNhbyS3RXr8DkxtCgo1/T6zwB8LuxJf6V DgGJdoJ4VKplR0PK7M/gh8bfX6p+JD99SRWy9RAyauv7lxrFO6MFqQOVZWGQyCuqJ0n7dM KiCuJBwrUxYR7bom7YPde3xOBS5iGys8LxuIwo+rOYm2eRCCHY3R5y9yaikAvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735406422; a=rsa-sha256; cv=none; b=MWG6b9k36cq09zMW7BKc8ig5yALAFz5NBvUUgEdPCIURPN1MPXSWQnpq67XMl8SyWTx+Pj oqV/bXGKB4mLdiu6ecT0IuQF2VCFvWcKm3CSc9ykw3vPAPUadFxtvscDYLKg6Kvy/eu4ST fC1S+NKQHHwtAYU4uQ0J8cL/uoKkwC+hwxCpWyN7dvIQJTRFQiu7p8ft7C4W9yD9IJ2Lkp WHj8f65ro7G39fYrSgXJjLvZmUmXuG/cetMNUfjQaHNMmuZGd9beyPixgfnIvcoWu13zYr Cr3LKGytFi7J0nbTk8GIc75fFjfGU+J2TjBHRkC4y4Sitt5b8rvEdbtXA7oY4w== 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 4YL8JP41sWzXvZ; Sat, 28 Dec 2024 17:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSHKL72061841; Sat, 28 Dec 2024 17:20:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSHKLjk061838; Sat, 28 Dec 2024 17:20:21 GMT (envelope-from git) Date: Sat, 28 Dec 2024 17:20:21 GMT Message-Id: <202412281720.4BSHKLjk061838@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 3282e368e004 - main - thr_cancel.c: style List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 3282e368e00460de500e5cfcf1c33b597199aaf8 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3282e368e00460de500e5cfcf1c33b597199aaf8 commit 3282e368e00460de500e5cfcf1c33b597199aaf8 Author: Konstantin Belousov AuthorDate: 2024-12-21 17:55:11 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-28 17:01:19 +0000 thr_cancel.c: style Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D48200 --- lib/libthr/thread/thr_cancel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c index b1b95e54b46f..0e00c2c36086 100644 --- a/lib/libthr/thread/thr_cancel.c +++ b/lib/libthr/thread/thr_cancel.c @@ -99,9 +99,9 @@ _thr_setcancelstate(int state, int *oldstate) return (EINVAL); } - if (oldstate) { + if (oldstate != NULL) { *oldstate = oldval ? PTHREAD_CANCEL_ENABLE : - PTHREAD_CANCEL_DISABLE; + PTHREAD_CANCEL_DISABLE; } return (0); } @@ -125,9 +125,9 @@ _thr_setcanceltype(int type, int *oldtype) return (EINVAL); } - if (oldtype) { + if (oldtype != NULL) { *oldtype = oldval ? PTHREAD_CANCEL_ASYNCHRONOUS : - PTHREAD_CANCEL_DEFERRED; + PTHREAD_CANCEL_DEFERRED; } return (0); } From nobody Sat Dec 28 17:20:23 2024 X-Original-To: dev-commits-src-main@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 4YL8JR6MNCz5jfQS; Sat, 28 Dec 2024 17:20: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL8JR5b2sz4mvq; Sat, 28 Dec 2024 17:20:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406423; 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=H8peRZTFtxzjsSldxKXZM7Hp7ECIlXWPSXqKiL3Wmsk=; b=OaENqOO+TBPyWiq1qFAi4zKnkzgNGeox3G6jOtzsKYn3U1Fcat4ux/PkiNNlVfORlZmvY2 4pYdXa99Y8qhFqG4Q9QQczVV0wk/Lj+ToluYIRz9Q2Z/FcFPjf6JI9FyZSswaE3QmD5Rn1 eW5I5nFjtYUFFu2OkmU0/nljzbSQddbQOCG2hHeazzVSHmnIWbIYRdojgLWy0YBFyLxtfr n+vOT/00j2SzZfZBF+9m0MEktxrb8Wjw4ZQuXcx02cuutpDAoaIVeKMkPg2bBPft/nQK5/ uhorOHAghTlzKq6NXSd/Sb2zZQ9WkIzNh6++Q1XcUYt93UUoDyM6XRD79gHyEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406423; 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=H8peRZTFtxzjsSldxKXZM7Hp7ECIlXWPSXqKiL3Wmsk=; b=XMllJ9amz7w1BcQGsPb9Z/Yhs3di7E3E8v/5uIeeVe6eq6AzSYO84yxjPN8VBfhsATeU9B nRqsDvseQDtMYuy/v54n3C/guA+bSeTKiJTeGyPt0PHcwBg/fJe9XpXiNkLcccJB7jazoR OlTEV4qi0D5GxyX51uKtizLLMprtQSuuAYq3RCUYf1OxpV/YgBCjNJ0EXglLae9/JWSJy+ hvopIKAKHKBRtjVSey27kat5T+BdZdgEdJ/GS9tq/75ud3TNIMtd7DAjqYxrr5ghzd3xKc n/oyzob7gvLfRTOCkM/Jy3vrUSfiJ+djA0hpO4CP5VzvTo0McJMMSofuXuRg8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735406423; a=rsa-sha256; cv=none; b=oxlfx8OKtAyhgYmXtut9TDhAa9Mj0NrmaT/dcwQ8zqn/4jDgVzeD4OFxNtTteWuyiQZzjl VpqV0GK5OmCePh37xVnPqVs7NtWTUKq58boiqeij48dlVvES57//NHLWzOhEI2jWuixENu p2sS2RKpC1dxJ2b8TeuDhi8G6gBvXhnQ1ugc6FG6Jzd7mGcQUOIh2EH5CHOIuJFvY+gI8d uxTnOaIDOLQRKz0RXyEYAxVfX5KMLJE5SEj+WxkeKGiEsg5SKAJ1K9M/qesQY/HXLq+1I7 oIuxhvNFuRbVKa78wA0AvTmZl+XsSFGNmXZ156rJdr/BULj9WSBmkG8Zz8t9Ew== 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 4YL8JR52Y3zYJg; Sat, 28 Dec 2024 17:20:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSHKNbr061939; Sat, 28 Dec 2024 17:20:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSHKNTd061936; Sat, 28 Dec 2024 17:20:23 GMT (envelope-from git) Date: Sat, 28 Dec 2024 17:20:23 GMT Message-Id: <202412281720.4BSHKNTd061936@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 86f6ff9ff00e - main - libthr: move dlerror_msg into zeroed part of struct thread List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 86f6ff9ff00e2ba4d4cd5b7a94d57b1c3f85ff98 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=86f6ff9ff00e2ba4d4cd5b7a94d57b1c3f85ff98 commit 86f6ff9ff00e2ba4d4cd5b7a94d57b1c3f85ff98 Author: Konstantin Belousov AuthorDate: 2024-12-23 23:48:58 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-28 17:01:34 +0000 libthr: move dlerror_msg into zeroed part of struct thread struct thread reuse might cause stalled rtld error message to propagate to the new thread. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D48200 --- lib/libthr/thread/thr_private.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index d6c12348e3ab..926e868293cd 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -562,8 +562,12 @@ struct pthread { /* Deferred threads from pthread_cond_signal. */ unsigned int *defer_waiters[MAX_DEFER_WAITERS]; -#define _pthread_endzero wake_addr + /* rtld thread-local dlerror message and seen control */ + char dlerror_msg[512]; + int dlerror_seen; + +#define _pthread_endzero wake_addr struct wake_addr *wake_addr; #define WAKE_ADDR(td) ((td)->wake_addr) @@ -572,10 +576,6 @@ struct pthread { /* pthread_set/get_name_np */ char *name; - - /* rtld thread-local dlerror message and seen control */ - char dlerror_msg[512]; - int dlerror_seen; }; #define THR_SHOULD_GC(thrd) \ From nobody Sat Dec 28 17:20:22 2024 X-Original-To: dev-commits-src-main@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 4YL8JR0CdGz5jfKT; Sat, 28 Dec 2024 17:20: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL8JQ5Q8zz4mSD; Sat, 28 Dec 2024 17:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406422; 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=sQw7msnOPGKlqjlicGv6sopGgJECbtcGR1epqREsfN0=; b=KEOwgPSOJJKQpcpUK0O0LnBHaO8rRLP5Z2ttwtg0rmI5Ljg4ln7W7hAuBEXlytnYQVPfG9 Wi5HfTAccRQGIhwalzTitlQmHm5yx57cd9q5JPg0XoSyMquqkpCpjrPFTAs9ZeQtGQ8GkT PlJyfvUP1N/rllUN6BtnGfJfkKS7H01JGTNoODDUZltdjvjGk0FZ3q/tCdcgH18pC6xNEY LboDO2aAxDuPpQ14wkki+Q12sxMe1riV2i1PDk88etRTEu9QAHdnMrOzc/CGTmCj2DH/5D tO6G6kCHmYefY6Uv6FlwvvESzTG+6lUSnG/8ZCrv/bWaZy4c2Tk43TSDiwLNdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406422; 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=sQw7msnOPGKlqjlicGv6sopGgJECbtcGR1epqREsfN0=; b=R6TTvrbCbn+/4WUiBUcdbenNLtMA80hiMYD4NdBMml/0hxKhcOrCDyF//tAQthFHtW5bwP 7rMpBAP1YD0d3VysnsSmdXDXZci9qW5rGlrz31pLWcMN5yow0EnxI/2dljDMtSeBZPnCvR o9IEPwXD89KU3whGh7VLCYzqs+AMwK4r88hY1YEgLVBPPneXEYdkCMBBSSgidnAGaqJcKd ywHh78ReDyTldU2JLDkCnZHAwD0TFypwXCAanel44dMipvJ6YWVElJBT9N90dsSLO9rffq /6Vq+7P6yrLsM5pOp8Z5IJ0TsawWwYFYH9Br30aM+0I7p2kpI24az0XXMdUhLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735406422; a=rsa-sha256; cv=none; b=TGV5x1sq57cmfFnyT8kqwt7H9T84O9CllmdgaD9X1pf8Yy5nxiYu/aGfCkw4TuFjXrZasd Mr7jzf+WbFnMd6aGWGeSt3i5GqueCuu8HND1vCRHrnsOcefURQKOfntMY1xHFrKlhgM43M aByW/fw7p1Si9z0/tKebGDi4jgt6bh1wlz9+Vg69bHgNe1j6uR97XtsVrYN7f+D6ekMPGx WSWqqa87167M+xFvfSvBVrPtT1AJTI+Dhe/bhl/2chFqAYA02CK/ajh3GpYaVvgYcOAJku MS7dT3V2gXTXMhk7MSw1bbCcsFgFAUReCF2PbT4YFGNjVgxAO5CKIn/jflcM0Q== 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 4YL8JQ4GvpzZ68; Sat, 28 Dec 2024 17:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSHKMcK061885; Sat, 28 Dec 2024 17:20:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSHKMoC061882; Sat, 28 Dec 2024 17:20:22 GMT (envelope-from git) Date: Sat, 28 Dec 2024 17:20:22 GMT Message-Id: <202412281720.4BSHKMoC061882@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: e32308efa215 - main - thr_sig.c: style List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e32308efa215868d98036c30f73c98ebf67e03d4 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e32308efa215868d98036c30f73c98ebf67e03d4 commit e32308efa215868d98036c30f73c98ebf67e03d4 Author: Konstantin Belousov AuthorDate: 2024-12-22 20:35:26 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-28 17:01:27 +0000 thr_sig.c: style Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D48200 --- lib/libthr/thread/thr_sig.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/lib/libthr/thread/thr_sig.c b/lib/libthr/thread/thr_sig.c index b953c430158c..e69641d8e1b5 100644 --- a/lib/libthr/thread/thr_sig.c +++ b/lib/libthr/thread/thr_sig.c @@ -185,8 +185,7 @@ thr_remove_thr_signals(const sigset_t *set, sigset_t *newset) } static void -sigcancel_handler(int sig __unused, - siginfo_t *info __unused, ucontext_t *ucp) +sigcancel_handler(int sig __unused, siginfo_t *info __unused, ucontext_t *ucp) { struct pthread *curthread = _get_curthread(); int err; @@ -354,7 +353,7 @@ check_cancel(struct pthread *curthread, ucontext_t *ucp) * on getting a signal before it agrees to return. */ if (curthread->cancel_point) { - if (curthread->in_sigsuspend && ucp) { + if (curthread->in_sigsuspend && ucp != NULL) { SIGADDSET(ucp->uc_sigmask, SIGCANCEL); curthread->unblock_sigcancel = 1; _thr_send_sig(curthread, SIGCANCEL); @@ -365,8 +364,8 @@ check_cancel(struct pthread *curthread, ucontext_t *ucp) * asynchronous cancellation mode, act upon * immediately. */ - _pthread_exit_mask(PTHREAD_CANCELED, - ucp? &ucp->uc_sigmask : NULL); + _pthread_exit_mask(PTHREAD_CANCELED, ucp != NULL ? + &ucp->uc_sigmask : NULL); } } @@ -405,9 +404,8 @@ check_suspend(struct pthread *curthread) { uint32_t cycle; - if (__predict_true((curthread->flags & - (THR_FLAGS_NEED_SUSPEND | THR_FLAGS_SUSPENDED)) - != THR_FLAGS_NEED_SUSPEND)) + if (__predict_true((curthread->flags & (THR_FLAGS_NEED_SUSPEND | + THR_FLAGS_SUSPENDED)) != THR_FLAGS_NEED_SUSPEND)) return; if (curthread == _single_thread) return; @@ -664,7 +662,7 @@ _thr_sigmask(int how, const sigset_t *set, sigset_t *oset) } int -_sigsuspend(const sigset_t * set) +_sigsuspend(const sigset_t *set) { sigset_t newset; @@ -672,7 +670,7 @@ _sigsuspend(const sigset_t * set) } int -__thr_sigsuspend(const sigset_t * set) +__thr_sigsuspend(const sigset_t *set) { struct pthread *curthread; sigset_t newset; @@ -698,7 +696,7 @@ __thr_sigsuspend(const sigset_t * set) int _sigtimedwait(const sigset_t *set, siginfo_t *info, - const struct timespec * timeout) + const struct timespec *timeout) { sigset_t newset; @@ -713,7 +711,7 @@ _sigtimedwait(const sigset_t *set, siginfo_t *info, */ int __thr_sigtimedwait(const sigset_t *set, siginfo_t *info, - const struct timespec * timeout) + const struct timespec *timeout) { struct pthread *curthread = _get_curthread(); sigset_t newset; From nobody Sat Dec 28 17:20:24 2024 X-Original-To: dev-commits-src-main@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 4YL8JT2C5Bz5jfKX; Sat, 28 Dec 2024 17:20: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL8JT071gz4mSF; Sat, 28 Dec 2024 17:20:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406425; 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=uDK52fcvPdgE4h32XA/3JOCf6nRHkroxhXFpgdkznoI=; b=bzivFUAr5bsiEvTiuJ7Of+fSmmp6fw7639ia5lZ092+BglKejewn15Pf+DWnGMYeC3rBEK CrXUNOe5W5CU5Ncjq99nvH322af7dd7xm7M3yWUiSf0HleqnyNe4S2GPH7rIaytev6G0QX aRG3ev477F9E4PmLMmldqe5M65wwnrgJf684QVBGsanVmMk4kz2Nyqt4ytXVFYEtxJLzWl IM0SdYf7cnLU87SYuVhBbaMZl/sCTsc1m0Dt2c1lEbRceXN9wsFz8ZF4ubNzFilUFEX860 bXcKVp/Dx+pCt66RKid6vyLYRWFPtgEAJJ4hc7p9aULjN5vhN7WcibUjXil5eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406425; 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=uDK52fcvPdgE4h32XA/3JOCf6nRHkroxhXFpgdkznoI=; b=Ufm1p4s73ywXztZQ8NDh4lCn5V/yFmGTlzigTXFEsne+gUHHkmXYceAXnGx+tdLa6crnDG Nt/PcB1c48kwUwgQeTfdUzRf6kg7i8mDoMl74Po+3ogcj2x6PqYb7lSzOQjlQUihsAu3zM jwpNfDe23rBY6NsF0kTnRJBu8V0473QLHpZFKd7C1Q9mNTtwLKpxT/EUHJxdwGO93oPDB2 lfvSkamjgPxR7fMbLA/ouNx7pV3IQIi6FsW8FHCFpEEcqQqnoI0UFY9YfXjMmqru2WGuXD YwemtY5LCbBiDmMc8t7Ha7xGTTvfDVImDOda7WbF5heXVBG9beczKPHremoGzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735406425; a=rsa-sha256; cv=none; b=te11o64R8w+w8iZaTS/KxjnPpSZh0qnmriLnC6oaubSb53Xf9y4vXyV8OjGnIzfKg/xq4G zLW6pEl2IBFn2U9J0Q0BlRFBbVYE6zly3P+SmJtViJRz31Fj4ngeHp8SuS9YJtFEIx0Mzv BD/wBr2YxmF2xKIY+2oXM54ePdwvX8XGSH7pWYGp/gGvddNpoNDYfBTwLwqvcJgZxPxZ35 eTkq+iv9quBZrl4mioGkYpgZG850cKiEjU373uux65e103O39K5m+t9+U4A4nPYuSS0WKi XnAXnS4+iZ9lFy3NdhbKxVECsAbdLixtalam4vN5pqpZA/LMpibQJ2fZ8Mz50w== 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 4YL8JS6CnQzYdh; Sat, 28 Dec 2024 17:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSHKO9f061997; Sat, 28 Dec 2024 17:20:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSHKOeS061994; Sat, 28 Dec 2024 17:20:24 GMT (envelope-from git) Date: Sat, 28 Dec 2024 17:20:24 GMT Message-Id: <202412281720.4BSHKOeS061994@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: a944e6d5c0c2 - main - thr_cancel.c: use testcancel() instead of manually expanding it List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: a944e6d5c0c27c2a533486062497a40d8f0ae543 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a944e6d5c0c27c2a533486062497a40d8f0ae543 commit a944e6d5c0c27c2a533486062497a40d8f0ae543 Author: Konstantin Belousov AuthorDate: 2024-12-21 17:55:39 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-28 17:01:44 +0000 thr_cancel.c: use testcancel() instead of manually expanding it Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D48200 --- lib/libthr/thread/thr_cancel.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c index 0e00c2c36086..7622e306f937 100644 --- a/lib/libthr/thread/thr_cancel.c +++ b/lib/libthr/thread/thr_cancel.c @@ -166,9 +166,8 @@ void _thr_cancel_leave(struct pthread *curthread, int maycancel) { curthread->cancel_point = 0; - if (__predict_false(SHOULD_CANCEL(curthread) && - !THR_IN_CRITICAL(curthread) && maycancel)) - _pthread_exit(PTHREAD_CANCELED); + if (maycancel) + testcancel(curthread); } void From nobody Sat Dec 28 17:20:27 2024 X-Original-To: dev-commits-src-main@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 4YL8JW3WhGz5jfXk; Sat, 28 Dec 2024 17:20: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL8JW1xf4z4mVS; Sat, 28 Dec 2024 17:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406427; 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=RytXOS2a+VTKl8I4065F/DyohB7yxgIjXHvpYeZ8KSw=; b=aRoKQeZQtWVweO7cCcRMb1+4mOyQY2FxF9CLdbikLO3PpSpMFCrQLQ1Zutz7rjW8WlyozA 0WguM7TuwfBDuVZdp7jsVOohLpmln4zKlE0V3ioyY7cqd66AxC0bGdjQaD72mTmLk+kbY4 w4+RJVtyK5/3vNoJwjOtO73nGNgBhqmNgj/jXTEk5nMXTk3QR889/3yQVyWmBcFkmHPwSM Er9AGXayXzT6qIEgPSYI8AYSmBPUMTGn6ARini5kQAQcKFUlS6D/03pNZPlWBsrPpgZZJt b8B9419vRCt6CZj2JxxNDhnYbEvTjKFLDJqbJnKlhdSDAksp7DgHPqv/XoJhTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406427; 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=RytXOS2a+VTKl8I4065F/DyohB7yxgIjXHvpYeZ8KSw=; b=SxXPRxo9mpVj5XQx3+1ohn2aUCFqR4o6U05zqN5VVXd32pmeg81ykW3ZFe/wGFjdBYFJ+U Teh7U8IEKW9X5C05dwsrZZm+NkJL6PrrILutJQK/twXyMiRUrL7Hu7Ws3NAgPd9298jvRd sq0ObC804ZzFeXlyfgsGp00qWbrrkqW9vE96G8otlIRfNv/AM3Y4ZbxojEyZ4QMjIr4Pa4 /Sf5sBvZZC7ThidJwhd7OoAH7qkrEW7FO1TrmvDWeKzTvvL2wzkV5Awa623SaWvBbYgtcv Gd7hFYbSYayVAUY5Al+h6Tk72tlsr936Qs9SG6efrSUAC/8s21Hui5XerqhPjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735406427; a=rsa-sha256; cv=none; b=U97W2z7WVS9X2bU9fb85X5BjBzvb7HszmR6MlSViJ9MvlzTLnhKBikbnndhMePxFN7F1IB ZNHfEyoDWgbChMhSl0jgSUTjStx4EqVQBizvjRKiGGI3ueopsX28Ubz+y7uNQRWbZYAavB OtuZOyU9hz7bb4REhvJStE9DAIKOmA8ypzWq27nTUqhvrnFbW2XwbwCXwfpxNn0U4205KP Sgu+F4d1A/LNMyjITZBDkXemxP0JcerQvmfVNuMUWVC02cr6J1ONSCFCubpzV83VmE1mXK nDmxgO7VQtrWTnr7z6U32l88Adqa17cRZgvDWozjV1MhH8u+6XOL4ef6KBucZQ== 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 4YL8JW0gtHzYhB; Sat, 28 Dec 2024 17:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSHKR3x062088; Sat, 28 Dec 2024 17:20:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSHKRRF062085; Sat, 28 Dec 2024 17:20:27 GMT (envelope-from git) Date: Sat, 28 Dec 2024 17:20:27 GMT Message-Id: <202412281720.4BSHKRRF062085@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 9f78c837d94f - main - check_cancel: when in_sigsuspend, send SIGCANCEL unconditionally List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 9f78c837d94f73f1485e2ce012a8e64197dae9d5 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9f78c837d94f73f1485e2ce012a8e64197dae9d5 commit 9f78c837d94f73f1485e2ce012a8e64197dae9d5 Author: Konstantin Belousov AuthorDate: 2024-12-24 00:08:17 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-28 17:01:58 +0000 check_cancel: when in_sigsuspend, send SIGCANCEL unconditionally not only when check_cancel is called from the signal handler. _thr_wake() is not enough to get the sigsuspend(2) syscall out of the loop, since it only terminates sleep when an unblocked signal is delivered. PR: 283101 In collaboration with: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D48200 --- lib/libthr/thread/thr_sig.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/libthr/thread/thr_sig.c b/lib/libthr/thread/thr_sig.c index e69641d8e1b5..c5ee5aa8423b 100644 --- a/lib/libthr/thread/thr_sig.c +++ b/lib/libthr/thread/thr_sig.c @@ -353,9 +353,11 @@ check_cancel(struct pthread *curthread, ucontext_t *ucp) * on getting a signal before it agrees to return. */ if (curthread->cancel_point) { - if (curthread->in_sigsuspend && ucp != NULL) { - SIGADDSET(ucp->uc_sigmask, SIGCANCEL); - curthread->unblock_sigcancel = 1; + if (curthread->in_sigsuspend) { + if (ucp != NULL) { + SIGADDSET(ucp->uc_sigmask, SIGCANCEL); + curthread->unblock_sigcancel = 1; + } _thr_send_sig(curthread, SIGCANCEL); } else thr_wake(curthread->tid); From nobody Sat Dec 28 17:20:25 2024 X-Original-To: dev-commits-src-main@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 4YL8JV4bxcz5jfb1; Sat, 28 Dec 2024 17:20: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL8JV3Gdvz4msP; Sat, 28 Dec 2024 17:20:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406426; 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=PHdjr5s/c68XiE+TWM5vvLSi9h/zAVYs0o/TnXJnpno=; b=ewmEL/WSZlVkcnGPD3gkD8M3rboBKcIOa9UOBu+kLOIsMJEJImxvjSvCAJCWuv7W+rWatV 7PGukLYEXUKHcy9AmJmCIMPm9RY/wp7zYiT+0w0DEO0C3+xlzO/7Nl4RbJ8xNfY/itbYcd 87dgw+lblcSpYhRhhj7xDNsP6L6XXEXZep8w916xMc0VjO4oFp3Krnt0LknT1J4tIZBj2R UqHQYfOG4X49HkGPB5CaU3Rb389eHQ7Nx8Mj1dLqaAav00AS4kPY3MO+F44SSg4GzM7vho Pui3m9qRQ5Fs9BJ1eIKs2BryZ8O7S6mwbGvayNc+jxJo4Cj8CRRXJo+atECXWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735406426; 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=PHdjr5s/c68XiE+TWM5vvLSi9h/zAVYs0o/TnXJnpno=; b=fzboAGyvvd6M/ri54Z9K2FZ06/oAVNrGhJ6rH/dwp6oZE1SToYwxD09eQzwvLIOjgR8h8E XXjsE6Ttkhy9nnoTvMAwF3zSNc360Dokt2HeRypiKX5+If3bzXbnU/1NaqFaNq0ziA60rg NxISkp0XiwiacbvXOUGAk/HWVpafwpZ5sAm/QGG7TPlA7EWcdr88XWCENUiFZvs9E1a/yU SSPvlQJVNGse3KireeZSCr4TbD2nfcrWVqiDHO1lcUVN3lG0aXvQH1zEdfEaJ02YjFPeuZ 3AzmqILeFmPSU/ZngqPewBQvUxRpeBALbC3I2w0CHIXGQSKw2l7F4Zakb3SfOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735406426; a=rsa-sha256; cv=none; b=su4zOL7iIxzwq2GlZO6rZkItt6J83yQgvrmNUhok7R/whb9BKAkuXAyAEppBWP0g1q6fCC WrnDya3oJh/NCyY9etfh/Ihz5s1jz7bWTVKEG13GRcXvxjoSb7QOmC74ucbHcxkxcySdbP meP3mQvHGc5q0GFt7kih5OJ8ryorkPpwQyWycHwnF322qV+2Zi9kEXeyG1hSNFWO+nvA+F hUNXLVGwHAGBvDsNJxbYJ/wiXgjmHP91MH2rFG5IEz0fO77P5rmA3la8fF+snSF5xE8ye/ n1f6MkJrOTpUFci+fuAcClrn0hEq2CPg/1C4JuLOHSHt2whMFdGaPs9I82bQ4Q== 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 4YL8JV05BCzZ48; Sat, 28 Dec 2024 17:20:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSHKPiE062036; Sat, 28 Dec 2024 17:20:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSHKPNT062033; Sat, 28 Dec 2024 17:20:25 GMT (envelope-from git) Date: Sat, 28 Dec 2024 17:20:25 GMT Message-Id: <202412281720.4BSHKPNT062033@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 030f48f78f96 - main - pthread_setcancelstate(3): make it async-signal-safe List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 030f48f78f96e0cdb30c960e1a11e5ae01d0eee8 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=030f48f78f96e0cdb30c960e1a11e5ae01d0eee8 commit 030f48f78f96e0cdb30c960e1a11e5ae01d0eee8 Author: Konstantin Belousov AuthorDate: 2024-12-23 06:42:15 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-28 17:01:50 +0000 pthread_setcancelstate(3): make it async-signal-safe by setting new cancel state and reading old cancel state from the curthread structure atomic. Note that this does not play well with async cancellation, since if cancellation is enabled from a signal handler and cancellation request is pending, the thread is cancelled immediately, calling user-defined destructors, which all must be async-signal-safe (but this is a general requirement for async cancellation anyway). Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D48200 --- lib/libthr/thread/thr_cancel.c | 12 ++++++------ share/man/man3/pthread_testcancel.3 | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c index 7622e306f937..4189a2640d14 100644 --- a/lib/libthr/thread/thr_cancel.c +++ b/lib/libthr/thread/thr_cancel.c @@ -83,22 +83,22 @@ int _thr_setcancelstate(int state, int *oldstate) { struct pthread *curthread = _get_curthread(); - int oldval; + int oldval, val; - oldval = curthread->cancel_enable; switch (state) { case PTHREAD_CANCEL_DISABLE: - curthread->cancel_enable = 0; + val = 0; break; case PTHREAD_CANCEL_ENABLE: - curthread->cancel_enable = 1; - if (curthread->cancel_async) - testcancel(curthread); + val = 1; break; default: return (EINVAL); } + oldval = atomic_swap_int(&curthread->cancel_enable, val); + if (state == PTHREAD_CANCEL_ENABLE && curthread->cancel_async) + testcancel(curthread); if (oldstate != NULL) { *oldstate = oldval ? PTHREAD_CANCEL_ENABLE : PTHREAD_CANCEL_DISABLE; diff --git a/share/man/man3/pthread_testcancel.3 b/share/man/man3/pthread_testcancel.3 index 2d2bb06c48e2..c74cdcfe943b 100644 --- a/share/man/man3/pthread_testcancel.3 +++ b/share/man/man3/pthread_testcancel.3 @@ -34,6 +34,7 @@ are .Dv PTHREAD_CANCEL_ENABLE and .Dv PTHREAD_CANCEL_DISABLE . +The function is async-signal-safe. .Pp The .Fn pthread_setcanceltype @@ -248,6 +249,11 @@ function conforms to .St -p1003.1-96 . The standard allows implementations to make many more functions cancellation points. +.Pp +The +.Fn pthread_setcancelstate +function is async-signal-safe as required by +.St -p1003.1-2024 . .Sh AUTHORS This manual page was written by .An David Leonard Aq Mt d@openbsd.org From nobody Sat Dec 28 19:47:47 2024 X-Original-To: dev-commits-src-main@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 4YLCb41Yfxz5j6XM; Sat, 28 Dec 2024 19:48:16 +0000 (UTC) (envelope-from vladimir@kondratyev.su) Received: from corp.infotel.ru (corp.infotel.ru [195.170.219.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4YLCb30VWjz599Z; Sat, 28 Dec 2024 19:48:14 +0000 (UTC) (envelope-from vladimir@kondratyev.su) Authentication-Results: mx1.freebsd.org; dkim=none; spf=none (mx1.freebsd.org: domain of vladimir@kondratyev.su has no SPF policy when checking 195.170.219.3) smtp.mailfrom=vladimir@kondratyev.su; dmarc=none Received: from corp (corp.infotel.ru [195.170.219.3]) by corp.infotel.ru (Postfix) with ESMTP id 08D587736; Sat, 28 Dec 2024 22:48:07 +0300 (MSK) X-Virus-Scanned: amavisd-new at corp.infotel.ru Received: from corp.infotel.ru ([195.170.219.3]) by corp (corp.infotel.ru [195.170.219.3]) (amavisd-new, port 10024) with ESMTP id 9O2U794IyksP; Sat, 28 Dec 2024 22:48:02 +0300 (MSK) Received: from mail.cicgroup.ru (unknown [195.170.219.74]) by corp.infotel.ru (Postfix) with ESMTP id 2B63B7A4B; Sat, 28 Dec 2024 22:48:02 +0300 (MSK) Received: from mail.cicgroup.ru (localhost [127.0.0.1]) by mail.cicgroup.ru (Postfix) with ESMTP id EF81142211F; Sat, 28 Dec 2024 22:47:54 +0300 (MSK) Received: from mail.cicgroup.ru ([127.0.0.1]) by mail.cicgroup.ru (mail.cicgroup.ru [127.0.0.1]) (amavisd-new, port 10024) with SMTP id Ry4LfLsAN6Ya; Sat, 28 Dec 2024 22:47:47 +0300 (MSK) Received: from kondratyev.su (localhost [127.0.0.1]) by mail.cicgroup.ru (Postfix) with ESMTPA id AECD442211C; Sat, 28 Dec 2024 22:47:47 +0300 (MSK) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Sat, 28 Dec 2024 22:47:47 +0300 From: Vladimir Kondratyev To: Andriy Gapon Cc: Vladimir Kondratyev , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 24ae172a5035 - main - ng_ubt(4): do not attach Realtek 87XX/88XX adaptors in bootloader mode. In-Reply-To: <14efd79e-75be-4f96-8a04-7ffc9ed1012c@FreeBSD.org> References: <202411062331.4A6NVuiE070018@gitrepo.freebsd.org> <14efd79e-75be-4f96-8a04-7ffc9ed1012c@FreeBSD.org> Message-ID: <9f9d01299249b41633a080052ee2da59@kondratyev.su> X-Sender: vladimir@kondratyev.su User-Agent: Roundcube Webmail/1.3.5 X-Spamd-Result: default: False [-1.99 / 15.00]; AUTH_NA(1.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; NEURAL_HAM_LONG(-1.00)[-0.997]; NEURAL_HAM_SHORT(-0.99)[-0.990]; MIME_GOOD(-0.10)[text/plain]; RCVD_NO_TLS_LAST(0.10)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_NA(0.00)[no SPF record]; ARC_NA(0.00)[]; DMARC_NA(0.00)[kondratyev.su]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:8299, ipnet:195.170.192.0/19, country:RU]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_FIVE(0.00)[6]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RCPT_COUNT_FIVE(0.00)[5] X-Rspamd-Queue-Id: 4YLCb30VWjz599Z X-Spamd-Bar: - On 2024-12-27 17:41, Andriy Gapon wrote: > On 07/11/2024 01:31, Vladimir Kondratyev wrote: >> The branch main has been updated by wulf: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=24ae172a50352ad4fd22989477f29ecca5aed6e3 >> >> commit 24ae172a50352ad4fd22989477f29ecca5aed6e3 >> Author: Vladimir Kondratyev >> AuthorDate: 2024-11-06 23:28:11 +0000 >> Commit: Vladimir Kondratyev >> CommitDate: 2024-11-06 23:28:11 +0000 >> >> ng_ubt(4): do not attach Realtek 87XX/88XX adaptors in bootloader >> mode. > > Perhaps this change deserves an UPDATING entry? > > Today I upgraded only to find out that my bluetooth related things > stopped working. It turned out that ng_ubt didn't attach to my USB > bluetooth adapter. Definitelly it deserves an UPDATING entry. I did not know that such an adaptors exist. I do have only couple of BT dongles and both of them requires external firmware to be loaded to operate. I think it will be good to print a hint to user if firmware file is missing too. I will add both after ruturning back from vacations in a month. > Only then I discovered this change, installed the firmware package, > etc. > > As strange as it may seem, previously my adapter worked without > uploading any extra firmware. > > Some data points, just in case: > idVendor = 0x0b05 > idProduct = 0x190e > bcdDevice = 0x0200 > iManufacturer = 0x0001 > iProduct = 0x0002 > > rtlbt_is_realtek: found USB Realtek > rtlbt_dump_version: hci_version 0x0a > rtlbt_dump_version: hci_revision 0x000b > rtlbt_dump_version: lmp_version 0x0a > rtlbt_dump_version: lmp_subversion 0x8761 > main: loading firmware /usr/local/share/rtlbt-firmware/rtl8761bu_fw.bin > main: loading config > /usr/local/share/rtlbt-firmware/rtl8761bu_config.bin > main: Firmware download complete > rtlbt_dump_version: hci_version 0x0a > rtlbt_dump_version: hci_revision 0xdfc6 > rtlbt_dump_version: lmp_version 0x0a > rtlbt_dump_version: lmp_subversion 0xd922 > main: Firmware download is successful! It is obviously that firmware has been upgraded but I do not know benefits of this action. Also May be some some values of hci_revision or lmp_subversion means "Firmware is in operationl state, not upgraded". May be no... > >> Attempt to initialize FreeBSD bluetooth stack while such a device >> is in >> bootloader mode locks the adapter hardly so it requires power >> on/off >> cycle to restore. >> This change blocks ng_ubt attachment unless operational >> firmware is >> loaded thus preventing the lock up. >> Sponsored by: Future Crew LLC >> MFC after: 1 month >> Differential Revision: https://reviews.freebsd.org/D46738 -- WBR Vladimir Kondratyev From nobody Sat Dec 28 19:54:46 2024 X-Original-To: dev-commits-src-main@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 4YLCkZ2sc7z5j72j; Sat, 28 Dec 2024 19:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLCkZ2KTXz3wl5; Sat, 28 Dec 2024 19:54:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735415686; 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=fZilXnnVeITovZW0uVFpWqPuMJRX3CRtBWfEE6jX4M0=; b=A1E76qF7koCX68Ka8ryZHqOupymff4co0rItuwuxap5Vgd0gkaDiOpC0LCxYfbmDumxyGB 108UQPo3RH1/FOokcyEcrBiI5QJ3AvpUKp17iqGpkcF87jFdd7kLcyjNM46aNzrrm5bHXC vKhCuFqzxuxgkV95MRw9a2vKMHiudMqVxHYx2n7qQOBk+K3FnGjPKvDBznZVM7zPcm4zC9 qHD1iZvplImyHsWe4g0mc1OcB6zYQ87rDweVoZlPEHPNlubRIpNh2a1FtI3JV7NSdriN0O Ci1s3GKx2v1G/8Ht8L5e+54XWYpeFiebuXODTsGtHnFHR+43IoLyqd9rn3XIIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735415686; 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=fZilXnnVeITovZW0uVFpWqPuMJRX3CRtBWfEE6jX4M0=; b=AXRMYfcdAKyZnUz2NxjcELmHQ9oMRsifurFcnzMmvUjSbhJAH2rcNzq9WWs/f1aMmSB1h4 LdXpKzHBJsGUyeBtt9wD6MdGIdRdqQfsiUJaemdC22tEXb1jS8FeUy4BIPZOA7C9boCHGC q2z/bvTIFWwmyGUNHStWB7QmTdeAFj8+nWmg7P4TjjT+muAfYHeL2kVhcU97sk4JJn9hZf w0VcTJGq9aHh1EhTabX08sxVr9Bv61th7xshqczbu4XDQFvIVwyklrjBupOG/FZFlZ7xkX Mi3596NpSk7FYO7061Y6jfa0ThRGez8tfugbb6pl+lfu1SUpcVUganlLgEdhkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735415686; a=rsa-sha256; cv=none; b=hpfcR7+j41aufb80/qegWXxwYVyGcZX8CrkiTRvcAXjTBiDsAz58WjJaqDvKsuvVQNKy+v wVDEAE/SEhHM6SpKGjqZaCfPy5nM52r2QjH+t+Qq2YwM6VBdpc7hQbtRXQ1tq8luawsFlO hIyyrwkSnDLLHDMmceBdRCqfKJ5+39RYxM9bITxlFhp9ZHJQy1o/u19YV0fJcfECUzr2SN uI5fViH4+wj2RZlShzv8KPxuX9xKeNWzciMjnOxGH8t9FWb7mfnY4YAoeZDJ5+qsyJkMmC 6gt34462Sm0RzRNYDsNtgKRzLXwXOmQstg3qyBtHuvfF7A8/aPI8g7jgDpIb4Q== 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 4YLCkZ1q9wzcnp; Sat, 28 Dec 2024 19:54:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSJskXj050960; Sat, 28 Dec 2024 19:54:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSJskWK050957; Sat, 28 Dec 2024 19:54:46 GMT (envelope-from git) Date: Sat, 28 Dec 2024 19:54:46 GMT Message-Id: <202412281954.4BSJskWK050957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 225c5e535b36 - main - nvmft: Fix typo in error message if an I/O queue fails to handoff List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 225c5e535b36ab506f25761fabc7dbe466609541 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=225c5e535b36ab506f25761fabc7dbe466609541 commit 225c5e535b36ab506f25761fabc7dbe466609541 Author: John Baldwin AuthorDate: 2024-12-28 19:30:16 +0000 Commit: John Baldwin CommitDate: 2024-12-28 19:54:29 +0000 nvmft: Fix typo in error message if an I/O queue fails to handoff Sponsored by: Chelsio Communications --- sys/dev/nvmf/controller/ctl_frontend_nvmf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/nvmf/controller/ctl_frontend_nvmf.c b/sys/dev/nvmf/controller/ctl_frontend_nvmf.c index 3d09ee901886..8a4538e5056a 100644 --- a/sys/dev/nvmf/controller/ctl_frontend_nvmf.c +++ b/sys/dev/nvmf/controller/ctl_frontend_nvmf.c @@ -989,7 +989,7 @@ nvmft_handoff(struct ctl_nvmf *cn) if (error != 0) { cn->status = CTL_NVMF_ERROR; snprintf(cn->error_str, sizeof(cn->error_str), - "Failed to handoff admin queue: %d", error); + "Failed to handoff I/O queue: %d", error); goto out; } } From nobody Sat Dec 28 19:56:00 2024 X-Original-To: dev-commits-src-main@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 4YLCmG34pJz5j6jF; Sat, 28 Dec 2024 19:56:14 +0000 (UTC) (envelope-from vladimir@kondratyev.su) Received: from corp.infotel.ru (corp.infotel.ru [195.170.219.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4YLCmG1lrQz3x5R; Sat, 28 Dec 2024 19:56:14 +0000 (UTC) (envelope-from vladimir@kondratyev.su) Authentication-Results: mx1.freebsd.org; none Received: from corp (corp.infotel.ru [195.170.219.3]) by corp.infotel.ru (Postfix) with ESMTP id C1FF57A4D; Sat, 28 Dec 2024 22:56:12 +0300 (MSK) X-Virus-Scanned: amavisd-new at corp.infotel.ru Received: from corp.infotel.ru ([195.170.219.3]) by corp (corp.infotel.ru [195.170.219.3]) (amavisd-new, port 10024) with ESMTP id I9H8puBawFLS; Sat, 28 Dec 2024 22:56:07 +0300 (MSK) Received: from mail.cicgroup.ru (unknown [195.170.219.74]) by corp.infotel.ru (Postfix) with ESMTP id 6F7127C0C; Sat, 28 Dec 2024 22:56:07 +0300 (MSK) Received: from mail.cicgroup.ru (localhost [127.0.0.1]) by mail.cicgroup.ru (Postfix) with ESMTP id 5E64D42211F; Sat, 28 Dec 2024 22:56:03 +0300 (MSK) Received: from mail.cicgroup.ru ([127.0.0.1]) by mail.cicgroup.ru (mail.cicgroup.ru [127.0.0.1]) (amavisd-new, port 10024) with SMTP id 1pN0SCOrzTLn; Sat, 28 Dec 2024 22:56:01 +0300 (MSK) Received: from kondratyev.su (localhost [127.0.0.1]) by mail.cicgroup.ru (Postfix) with ESMTPA id EC3F642211C; Sat, 28 Dec 2024 22:56:00 +0300 (MSK) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Sat, 28 Dec 2024 22:56:00 +0300 From: Vladimir Kondratyev To: Alexey Dokuchaev Cc: Andriy Gapon , Vladimir Kondratyev , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 24ae172a5035 - main - ng_ubt(4): do not attach Realtek 87XX/88XX adaptors in bootloader mode. In-Reply-To: References: <202411062331.4A6NVuiE070018@gitrepo.freebsd.org> <14efd79e-75be-4f96-8a04-7ffc9ed1012c@FreeBSD.org> Message-ID: <202490cf59b51267e48d98d88e32a31d@kondratyev.su> X-Sender: vladimir@kondratyev.su User-Agent: Roundcube Webmail/1.3.5 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:8299, ipnet:195.170.192.0/19, country:RU] X-Rspamd-Queue-Id: 4YLCmG1lrQz3x5R X-Spamd-Bar: ---- On 2024-12-28 18:54, Alexey Dokuchaev wrote: > On Fri, Dec 27, 2024 at 04:41:35PM +0200, Andriy Gapon wrote: >> On 07/11/2024 01:31, Vladimir Kondratyev wrote: >> > commit 24ae172a50352ad4fd22989477f29ecca5aed6e3 >> > >> > ng_ubt(4): do not attach Realtek 87XX/88XX adaptors in bootloader mode. >> >> Today I upgraded only to find out that my bluetooth related things >> stopped >> working. It turned out that ng_ubt didn't attach to my USB bluetooth >> adapter. >> Only then I discovered this change, installed the firmware package, >> etc. >> >> As strange as it may seem, previously my adapter worked without >> uploading >> any extra firmware. > > I'd also like to hear why some hardware which used to work before > without > explicit firmware upload now may requires these extra dances, Firmware state detection logic is borrowed from Linux driver. If you know better way point me to it. > just to be > prepared if my BT/WiFi cards suddenly stop working as well. > > ./danfe -- WBR Vladimir Kondratyev From nobody Sat Dec 28 21:17:22 2024 X-Original-To: dev-commits-src-main@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 4YLFYt3t8Vz5jD3S; Sat, 28 Dec 2024 21:17:22 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLFYt0zW6z43xg; Sat, 28 Dec 2024 21:17:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735420642; 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=jSfezpO/i0wuhDp0VvdO/EP0QH1gaGnSXYMpXEs9fRs=; b=Ik0LGWGxajC5c4GZuTipywPuJ7SHyRfe2+WHtdMt0t2UPzhMD0w14OyxnY+VEFdQPfhC/R bSN29IhpGaS6cgtGgVZA44b14l8XUJSk3bmJlJJdn9uYuLhi05M2+l2Rga0FVwHI7ilhET BfiG4vFp2yETpYEZ/mtmzDcf/PEp+HS4b08tViy159ts6hZ1zf4TC0pWu2Qtr/JnmyJsl1 swO8Y3P9Nai+2HUgWXIv//s+itn0bQnVJ5AC08/5QUULbwVqKFkVH3AllowCzs/dV0dQXI na/5qa8uSOHrzdk/gRFSh+aYspRtd8S08n4k9aTOnXNe7ShIZF9TJtJRVkj5zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735420642; 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=jSfezpO/i0wuhDp0VvdO/EP0QH1gaGnSXYMpXEs9fRs=; b=BqnrkidniNxrJb+x9kKu0Eq2BhSZhtKBKPxgw5+82NnosTh9gKWHJqIfvEO+xiR3L+4K3q KTVG0ABaQO2DJeflidDMt6xw1cYtmATX5LbDH8HzPkhHWApnHHS6cKeXEdE4kgmAiG3wxB Cg8Hf5LwFLhuvG9WzLOECAEg8I8vGNCJU42H04KCm6i335FcfefWoPApxz6EyhzPl2QSFA ElLL+3ronW8a1aNASRir0EMYvrrBaXAo4Ks822E+wL6C+AA6HZUD7Cr1s9NfYvF/WFZgPF MlBjG/unRRRFhmzvHpDRE30vCQu9xFf5l3MjC/UcTWwpvuTTksBaOd1krOuKsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735420642; a=rsa-sha256; cv=none; b=BD0ImeG+8I04HnEg5YxYIx+agl6dCIX2AHPuVQpFRLpYpt4QkX9SMfaC/OwdAf+xNVjMvq MujCsFguInckmXfifdjx1dugVHAq/hgUKTb/AyJ0efXeAq1UuQLvQmO1t75aETo6HVo7AR tP4+tqOujYv0hrw/PJ88IJDEPDM+3qFU2USM4yAgF9NrW1eWECBMPHJuTslN9it1CwFRV1 O0Jpi+ReyUwWnND6ozmgS5rNUu3tQ9ZNN/UB8/tYOr0drs6/CPJXe/qMajz4T8KODvbc63 f8gm7vit4XTzerhoi1jYcokaj/HWYPEqh9/irTdmyKp9kO5rMSAhQKyeuKxmUQ== 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 4YLFYt0Y3mzh4H; Sat, 28 Dec 2024 21:17:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSLHMxQ001278; Sat, 28 Dec 2024 21:17:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSLHMcD001275; Sat, 28 Dec 2024 21:17:22 GMT (envelope-from git) Date: Sat, 28 Dec 2024 21:17:22 GMT Message-Id: <202412282117.4BSLHMcD001275@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 792e47a51a42 - main - ocs_fc: print instance_index value rather than pointer itself in ocs_cam.c List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 792e47a51a422ed434ee93d1151737c4d5c9761a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=792e47a51a422ed434ee93d1151737c4d5c9761a commit 792e47a51a422ed434ee93d1151737c4d5c9761a Author: Fuqian Huang AuthorDate: 2024-12-28 21:12:35 +0000 Commit: Warner Losh CommitDate: 2024-12-28 21:12:35 +0000 ocs_fc: print instance_index value rather than pointer itself in ocs_cam.c In function ocs_scsi_recv_tmf, print instance_index rather than the pointer itself to avoid printing out kernel pointer to user space. PR: 238659 Signed-off-by: Fuqian Huang Reviewed-by: imp --- sys/dev/ocs_fc/ocs_cam.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/ocs_fc/ocs_cam.c b/sys/dev/ocs_fc/ocs_cam.c index a944c7628d85..772e7ca1c383 100644 --- a/sys/dev/ocs_fc/ocs_cam.c +++ b/sys/dev/ocs_fc/ocs_cam.c @@ -700,8 +700,8 @@ int32_t ocs_scsi_recv_tmf(ocs_io_t *tmfio, uint64_t lun, ocs_scsi_tmf_cmd_e cmd, trsrc = &fcp->targ_rsrc_wildcard; } - device_printf(tmfio->ocs->dev, "%s: io=%p cmd=%#x LU=%lx en=%s\n", - __func__, tmfio, cmd, (unsigned long)lun, + device_printf(tmfio->ocs->dev, "%s: io=%u(index) cmd=%#x LU=%lx en=%s\n", + __func__, tmfio->instance_index, cmd, (unsigned long)lun, trsrc ? (trsrc->enabled ? "T" : "F") : "X"); if (trsrc) { inot = (struct ccb_immediate_notify *)STAILQ_FIRST(&trsrc->inot); From nobody Sat Dec 28 21:18:43 2024 X-Original-To: dev-commits-src-main@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 4YLFbS1QK2z5jCgb; Sat, 28 Dec 2024 21:18: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLFbS0qlgz445J; Sat, 28 Dec 2024 21:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735420724; 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=+0JG3Yq2ENDhCxDYl4r4rfe93+JPO3y6pdYW6N49qYE=; b=QGTclaenv6tEqEnr7jac1cLQeQp6F1N4TxAetgez1c3EWBJY+d0CTXMLLghp+/lU1sLMpZ hlGKsevat7E20hLZP+Eq8Whop90Zoyzvy+WNAUrwgzZAh4YUzPWVRUguLii9LvxSveH7wz CzNVacT5oKWYo0yJ9G5WMgMXC3q5doTwc2eQ9WgpbvVrqvIripD6QhNFQsmUIMp+nmGIB+ +yKoWxiXxcC9qFlj3w2xoeGvkR6mKP3fobWMGT7Rnl9IDT1WO43d9OL6dbWrCPqw5W6YV+ 9Ys2uCreIa+3X1obP6MHFKtYoMD62Lwz/Nkkr5uwzGnmmB/2cEnLXLsH97ONqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735420724; 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=+0JG3Yq2ENDhCxDYl4r4rfe93+JPO3y6pdYW6N49qYE=; b=ozuTz68+HW6yBozajj5v3FHXtkFWkk2u/wmoiXBe0gWRhTUabLpWewtjDFk8T61uwp8Okj n9mdaIvuJddgq4ElC+5GtuYA6GfO9jKSXGHgi1Qgr8bl2zgMjCaVMMHWbI/BoTBRKIwdzt dOjjiPhN0jfSfnAR9VFisHjweYQOtAlRefBEBG42xta2VSFrnXeE/aEEnqlTMrrup35rWl Opt6Bf6V4/ke9HL4G94UDfaqowH5XGpvFn30+S5UvOSQ6pGdYuMD8Yp/voZUbLdpMvrSGk 7fzPtV7j2I8VHPTYb7dsaqNv5HD2k4l3t/w7KciBKw07IaeBnRmP0YO4fs/dtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735420724; a=rsa-sha256; cv=none; b=FOCedLpeESv1c+ThuKMSTInKLydr3crzhZggy8oh6DDJq2vqfNfjvlxScBgzByfmXzqbKQ YMxP9lyowVcmR3NIw4tfU5EW9kvdMBJNDQfCusOMxmHh3ECsVEksH9pwQ/EkDlC7GWaajr 4nSRYaBkkAdOsnhJMnzUNU21Y9B2fKDZkrcxWaeLKs1pSqdMVvSR+XGqhmGiMA9Tn7buRd XNOegMOPg7fCOOhW5cHc7or+BBm65pHdAjSmc6m/3kXknY3E1W+qkZUuZWswRLLUkqv18P 11EwdXbiJsnubQf0TeY/TNgEcw63TvkzD7PY5vEycc2pJ2eoM3H5bmfNDf2NEw== 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 4YLFbS0QrYzhDj; Sat, 28 Dec 2024 21:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSLIhBF001899; Sat, 28 Dec 2024 21:18:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSLIhVr001896; Sat, 28 Dec 2024 21:18:43 GMT (envelope-from git) Date: Sat, 28 Dec 2024 21:18:43 GMT Message-Id: <202412282118.4BSLIhVr001896@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: caab831338f4 - main - Export additional __aeabi_ symbols from arm's libgcc_s List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: caab831338f4eeaa7455e981478be9fd414b7969 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=caab831338f4eeaa7455e981478be9fd414b7969 commit caab831338f4eeaa7455e981478be9fd414b7969 Author: Dimitry Andric AuthorDate: 2024-12-28 21:17:13 +0000 Commit: Dimitry Andric CommitDate: 2024-12-28 21:18:20 +0000 Export additional __aeabi_ symbols from arm's libgcc_s Some programs depend on these symbols, when they are compiled for armv6 or armv7. Closes #1560 (slightly changed due to sorting of the symbols). PR: 271087 Reported by: fuz Submitted by: jfc@mit.edu MFC after: 1 week --- lib/libgcc_s/arm/Symbol.map | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/lib/libgcc_s/arm/Symbol.map b/lib/libgcc_s/arm/Symbol.map index 92b54761d810..a426f823de5c 100644 --- a/lib/libgcc_s/arm/Symbol.map +++ b/lib/libgcc_s/arm/Symbol.map @@ -4,8 +4,33 @@ GCC_3.5 { _Unwind_Complete; _Unwind_VRS_Get; - _Unwind_VRS_Set; _Unwind_VRS_Pop; + _Unwind_VRS_Set; + __aeabi_d2h; + __aeabi_d2lz; + __aeabi_d2ulz; + __aeabi_f2h; + __aeabi_f2lz; + __aeabi_f2ulz; + __aeabi_h2f; + __aeabi_idiv; + __aeabi_idiv0; + __aeabi_l2d; + __aeabi_l2f; + __aeabi_lasr; + __aeabi_lcmp; + __aeabi_ldivmod; + __aeabi_llsl; + __aeabi_llsr; + __aeabi_lmul; + __aeabi_ui2d; + __aeabi_ui2f; + __aeabi_uidiv; + __aeabi_uidivmod; + __aeabi_ul2d; + __aeabi_ul2f; + __aeabi_ulcmp; + __aeabi_uldivmod; __aeabi_unwind_cpp_pr0; __aeabi_unwind_cpp_pr1; __aeabi_unwind_cpp_pr2; From nobody Sat Dec 28 21:26:07 2024 X-Original-To: dev-commits-src-main@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 4YLFlz2ky4z5jDN7; Sat, 28 Dec 2024 21:26: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLFlz1x8Tz44vW; Sat, 28 Dec 2024 21:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735421167; 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=2F5N6PKUiuqL1kdIxhgwzFCu/4KDxqL9IpEDc1b6Tbg=; b=yNP3AToavlr4NbJH6n40fslSYiYeuoDabKBH14u3Ns82YWC7PfNcJk9M7kcD7SZLu1wxzs tbUmZfNXfNIMeRmC2f7yRR4I/1eTE66UGNOYEsoMzGmcccsfoiEe/9KxoKVNtc0YC6kXPJ 1R6dKoaqcea0k0p1ZWH6VljssltfnkWjoHyJCKYNWcoqb8dB9KwE9ylA81JvCkR75xmu5S lfJQ/rD0fBBwshDQMu0v3kLOqcoddG6kcMroIBm2caeLYmpq4mgWR1xqv17ox1iDzGZ+YE xpW7L3wUyAm2tGDBWXfEJH6xOTqomOXjKv5rLcz/swJ7+9McGMXhROjcnUwe+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735421167; 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=2F5N6PKUiuqL1kdIxhgwzFCu/4KDxqL9IpEDc1b6Tbg=; b=AYaWDD6g1OMb8xffZFqjGPcrQEj4GrQvxrHO+iPce0VcS4GpiIGt8+nohXqjnk2GqPfKRx 7x+lhE0yeKREU67WEp51JMb0YVEwhDMobDnZfLzkmyYPVAfiCBRWN49hIyW2swaCgGNsSR ytSH2mVDJyY2xA5f49nTjilvWNnqd1+3vcBxMGEPgVQpAgG8ApyejhLcJ1ytVHP+IBIrzN xnq+y5j4oSTIdoZ4kh3fA7yQKxVfN6d89nwqOzDkVqvM21IDyP4yxmAEkLdbB5/Mdta6RK pAe+pUaPgQ+qyG4vhinlER7TLvMkkDagymOzQ9XPd+FGtpCRdGghY1W8OICghA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735421167; a=rsa-sha256; cv=none; b=tbDb7orPuoDfcxqZPvBvo+//D2RTuyeVcLwqh75PjzvdnQe7UXDhCd0bIlT3N66NEJP339 HQsCi9AxmPU6z1VGcoJ+nTZYQvNDEMFhbjpI6ZHrT1l0VVbqs3RWy8zGfIZb1jSjFwAZyP LWA6ec2WzlZbedReNoqgFEWQEcS8wqS6XjyrsiIuoaL0qkodVi2VfUp852/VEfnmUadDPo ediKMO4JSUVuInMTlS/mDnH76hFL15hjHkSlp2hASOyMi7l30+II1wvspDN5GqXOs6aZBx oCBr520E605bhm3KNM2RxljRw4IkZq1ud4wWMUPB+dvGokIU0iZIScdXw5sKaA== 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 4YLFlz1NPbzh0v; Sat, 28 Dec 2024 21:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSLQ7vA019944; Sat, 28 Dec 2024 21:26:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSLQ77b019941; Sat, 28 Dec 2024 21:26:07 GMT (envelope-from git) Date: Sat, 28 Dec 2024 21:26:07 GMT Message-Id: <202412282126.4BSLQ77b019941@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 07cd69e272da - main - mountd.c: Define a new -a command line option List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07cd69e272da2f116950f2bde6dfcc404f869f0c Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=07cd69e272da2f116950f2bde6dfcc404f869f0c commit 07cd69e272da2f116950f2bde6dfcc404f869f0c Author: Rick Macklem AuthorDate: 2024-12-28 21:24:51 +0000 Commit: Rick Macklem CommitDate: 2024-12-28 21:24:51 +0000 mountd.c: Define a new -a command line option Bugzilla PR#282995 reported that, when a file system was exported with the "-alldirs" flag, the export succeeded even if the directory path was not a server file system mount point. This behaviour for "-alldirs" was only documented in the Example section of exports(5) and had not been enforced since FreeBSD2. (A patch applied between FreeBSD1 and FreeBSD2 broke the check for file system mount point.) Since the behaviour of allowing the export has existed since FreeBSD2, the concensus on a mailing list was that it would be a POLA violation to change it now. Therefore, this patch adds a new "-a" mountd command line option to enforce a check for the exported directory being a server file system mount point. PR: 282995 MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D48137 --- usr.sbin/mountd/mountd.c | 51 +++++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index cb87535f6c3b..4457a925c2ed 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -215,7 +215,8 @@ static int do_export_mount(struct exportlist *, struct statfs *); static int do_mount(struct exportlist *, struct grouplist *, uint64_t, struct expcred *, char *, int, struct statfs *, int, int *); static int do_opt(char **, char **, struct exportlist *, - struct grouplist *, int *, uint64_t *, struct expcred *); + struct grouplist *, int *, uint64_t *, struct expcred *, + char *); static struct exportlist *ex_search(fsid_t *, struct exportlisthead *); static struct exportlist *get_exp(void); static void free_dir(struct dirlist *); @@ -292,6 +293,7 @@ static int sock_fdpos; static int suspend_nfsd = 0; static int nofork = 0; static int skiplocalhost = 0; +static int alldirs_fail = 0; static int opt_flags; static int have_v6 = 1; @@ -320,6 +322,7 @@ static gid_t *tmp_groups = NULL; #define OP_MASKLEN 0x200 #define OP_SEC 0x400 #define OP_CLASSMASK 0x800 /* mask not specified, is Class A/B/C default */ +#define OP_NOTROOT 0x1000 /* Mark the the mount path is not a fs root */ #ifdef DEBUG static int debug = 1; @@ -458,7 +461,7 @@ main(int argc, char **argv) else close(s); - while ((c = getopt(argc, argv, "2Adeh:lNnp:RrSs")) != -1) + while ((c = getopt(argc, argv, "2Aadeh:lNnp:RrSs")) != -1) switch (c) { case '2': force_v2 = 1; @@ -466,6 +469,9 @@ main(int argc, char **argv) case 'A': warn_admin = 0; break; + case 'a': + alldirs_fail = 1; + break; case 'e': /* now a no-op, since this is the default */ break; @@ -1590,6 +1596,7 @@ get_exportlist_one(int passno) v4root_phase = 0; dirhead = (struct dirlist *)NULL; unvis_dir[0] = '\0'; + fsb.f_mntonname[0] = '\0'; while (get_line()) { if (debug) @@ -1650,7 +1657,7 @@ get_exportlist_one(int passno) warnx("doing opt %s", cp); got_nondir = 1; if (do_opt(&cp, &endcp, ep, grp, &has_host, - &exflags, &anon)) { + &exflags, &anon, unvis_dir)) { getexp_err(ep, tgrp, NULL); goto nextline; } @@ -1731,19 +1738,9 @@ get_exportlist_one(int passno) fsb.f_fsid.val[1]); } - if (warn_admin != 0 && - (ep->ex_flag & EX_ADMINWARN) == 0 && - strcmp(unvis_dir, fsb.f_mntonname) != - 0) { - if (debug) - warnx("exporting %s exports entire " - "%s file system", unvis_dir, - fsb.f_mntonname); - syslog(LOG_ERR, "Warning: exporting %s " - "exports entire %s file system", - unvis_dir, fsb.f_mntonname); - ep->ex_flag |= EX_ADMINWARN; - } + if (strcmp(unvis_dir, fsb.f_mntonname) != + 0) + opt_flags |= OP_NOTROOT; /* * Add dirpath to export mount point. @@ -1813,6 +1810,17 @@ get_exportlist_one(int passno) "WARNING: No mask specified for %s, " "using out-of-date default", (&grp->gr_ptr.gt_net)->nt_name); + if ((opt_flags & OP_NOTROOT) != 0 && warn_admin != 0 && + (ep->ex_flag & EX_ADMINWARN) == 0 && unvis_dir[0] != '\0' && + fsb.f_mntonname[0] != '\0') { + if (debug) + warnx("exporting %s exports entire %s file " + "system", unvis_dir, fsb.f_mntonname); + syslog(LOG_ERR, "Warning: exporting %s exports " + "entire %s file system", unvis_dir, + fsb.f_mntonname); + ep->ex_flag |= EX_ADMINWARN; + } if (check_options(dirhead)) { getexp_err(ep, tgrp, NULL); goto nextline; @@ -2836,7 +2844,7 @@ parsesec(char *seclist, struct exportlist *ep) */ static int do_opt(char **cpp, char **endcpp, struct exportlist *ep, struct grouplist *grp, - int *has_hostp, uint64_t *exflagsp, struct expcred *cr) + int *has_hostp, uint64_t *exflagsp, struct expcred *cr, char *unvis_dir) { char *cpoptarg, *cpoptend; char *cp, *endcp, *cpopt, savedc, savedc2; @@ -2921,6 +2929,12 @@ do_opt(char **cpp, char **endcpp, struct exportlist *ep, struct grouplist *grp, syslog(LOG_ERR, "= after op: %s", cpopt); return (1); } + if ((opt_flags & OP_NOTROOT) != 0) { + syslog(LOG_ERR, "%s: path %s not mount point", + cpopt, unvis_dir); + if (alldirs_fail != 0) + return (1); + } opt_flags |= OP_ALLDIRS; } else if (!strcmp(cpopt, "public")) { if (fnd_equal == 1) { @@ -3317,7 +3331,8 @@ do_mount(struct exportlist *ep, struct grouplist *grp, uint64_t exflags, ret = 1; goto error_exit; } - if (opt_flags & OP_ALLDIRS) { + if ((opt_flags & OP_ALLDIRS) && + alldirs_fail != 0) { if (errno == EINVAL) syslog(LOG_ERR, "-alldirs requested but %s is not a filesystem mountpoint", From nobody Sat Dec 28 21:32:15 2024 X-Original-To: dev-commits-src-main@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 4YLFv34Kbhz5jDwL; Sat, 28 Dec 2024 21:32:15 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLFv33qszz45n7; Sat, 28 Dec 2024 21:32:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735421535; 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=++h6bYuonAplIt3BJKrq+VKPGJZACkkF+LIq8Qq4+pw=; b=E8ZgwqbvELKsb2nVjGmCbBfpHGAA459ZaeAVaMYcnbTAbz0srqaLVl7lceiViRX/PFEeQ0 bd+xHXU0jxY6KVHSa1Wl60PX6pPSPoxxYNZBttCDx4xD3VZ3J09DUNz8HgMpAE9lgpogF5 uvzmHYSuFAsNMQcp0UiQElBI7Fh8ES2or0JEodykUnjj2KRZ4nptBfiozEDexYJrBypDjl HIzP+UOqFZyUt0JQMZEBAf+Awx5tuKAy8+NCBJWhEpgMoKEUhg+iuM1CbzhUYta0S/VBed NPrQvXD5z/lDEvuzb/iOq5Ba/tMeedQBML9vRI4tiX94K3lx543LoNKkIN0GdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735421535; 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=++h6bYuonAplIt3BJKrq+VKPGJZACkkF+LIq8Qq4+pw=; b=WeheTvgUPTv9ptgyX+XoLVaKNPmrJzjUUYdpthGSsJ+Z2VT+et/4+V6Sn5vG49x2gtbKBl aaS71s52uTmmiXApqZyAylcFg+YXiZ2AxRUPeBNa3B8CA7J9IcHn32aBRiem3JGw0K27fG wVD8JmPihKBAYjp/AiZdujHsHXYg0NxpSGQPqBND+b0luEKToJOqEw2dGHhb/AMc1eKsJ7 zsNGmdq4qlh/l98Zez1uFOPiuW8gOO4ceZ9XUIP5jKR927CnF4IL8sXusjTr7JLBhRz2Xm WjktRkG691Scs7o5oho9z1HZyDdPMjxG6TwD5h8z9mPqa2Le3oAvmTNYmTutfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735421535; a=rsa-sha256; cv=none; b=GfHctnLdvCLcV65VfBQINsUs4T7lJx57R341G7t9isVH7oBd+0v5YJ4Frgc3zg9BI2TQC3 CpalyNnuLtCK1AOCfbF73wWsSbWYKqDMeVcMmSV+rq+MCGweguOnOMdENNp1yrYrd+qbfa X9pYv1V/XGN52HrtlKlEADuZq02mOmICcdm8Tpx3BtJPmBLjROxoDbC4WJtq9Wwj1LSV/R b9RS93fLgYopkzh6sXWilpJoxKDXTQv2C1KnpcOQhCMYKU6zl5R2CITr21BXhabRaOwrRP ua9PrRQ6RchbTwXeo8XdY5tdeeBlLUtf8o3u4aSSIjB8zpHhWBuO1aq1WXoGjA== 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 4YLFv33R9lzhXs; Sat, 28 Dec 2024 21:32:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSLWFdd036324; Sat, 28 Dec 2024 21:32:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSLWFeG036321; Sat, 28 Dec 2024 21:32:15 GMT (envelope-from git) Date: Sat, 28 Dec 2024 21:32:15 GMT Message-Id: <202412282132.4BSLWFeG036321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 6db916d21a09 - main - mound.8: Document the new -a command line option List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6db916d21a09aebf3e7cb5c95e2ad714ab2b8882 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=6db916d21a09aebf3e7cb5c95e2ad714ab2b8882 commit 6db916d21a09aebf3e7cb5c95e2ad714ab2b8882 Author: Rick Macklem AuthorDate: 2024-12-28 21:30:56 +0000 Commit: Rick Macklem CommitDate: 2024-12-28 21:30:56 +0000 mound.8: Document the new -a command line option Commit 07cd69e272da adds a new "-a" mountd option. This patch updates the man page for it. This is a content change. PR: 282995 Reviewed by: gbe (manpages) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D48138 --- usr.sbin/mountd/mountd.8 | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/usr.sbin/mountd/mountd.8 b/usr.sbin/mountd/mountd.8 index 5c5717063f15..5ff9894b1d7a 100644 --- a/usr.sbin/mountd/mountd.8 +++ b/usr.sbin/mountd/mountd.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 5, 2024 +.Dd December 16, 2024 .Dt MOUNTD 8 .Os .Sh NAME @@ -35,7 +35,7 @@ mount requests .Sh SYNOPSIS .Nm -.Op Fl 2AdelNnRrSs +.Op Fl 2AadelNnRrSs .Op Fl h Ar bindip .Op Fl p Ar port .Op Ar exportsfile ... @@ -70,6 +70,17 @@ actually exports the entire local file system and not just the subtree below the directory exported. (See .Xr exports 5 ) +.It Fl a +Enforce the check for an exported directory being a file +system mount point, if the +.Fl -alldirs +option is specified in +.Xr exports 5 +for the export file line. +With this option, the exports line will fail, whereas +without this option, a warning will be generated by +.Xr syslog 8 , +but the export will be done. .It Fl d Output debugging information. .Nm @@ -244,7 +255,8 @@ the current list of remote mounted file systems .Xr jail 8 , .Xr nfsd 8 , .Xr rpcbind 8 , -.Xr showmount 8 +.Xr showmount 8 , +.Xr syslog 8 .Sh HISTORY The .Nm From nobody Sat Dec 28 21:52:05 2024 X-Original-To: dev-commits-src-main@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 4YLGKx4mgHz5jFxJ; Sat, 28 Dec 2024 21:52:05 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLGKx4Jnlz46xK; Sat, 28 Dec 2024 21:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735422725; 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=pZW7gCr4fWO1cFZ6ONFtJbayD7EWxE0/OcHVvUlc1/I=; b=y2AuVkY0x2d0DrHFUI8ZwoHr802N4nNAFCpMEAUd3WsUCsMTtSh6ezJInhgtpYkYoc43Fx f028SAAi/kyc7ov5vF96bkmu3xUuNFjQt1k2+mGIPQh88kdhcwdjVaQJzdKqoxUI+H4X5O 2I7EM+nHjzL8y+Xhk8eFuuYR/DHHqGsRPUIMosYhGwQAVLRhlE3xJY3mYd4CpweBGHC1WQ kEV38kCZNlfGq3aaU05b338ITZIkY3AFN8KVUy1NTf0ArZnfFNWbkIuEIQhg1Uj4PmfWC/ QKdp30pMkpoSu1woFaakvAwIoci58l0VUl9a5AWV/uEohTf+3fNcKnjKOFGZnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735422725; 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=pZW7gCr4fWO1cFZ6ONFtJbayD7EWxE0/OcHVvUlc1/I=; b=R9VRNCNl6n544rCJEJW+7bPGIyq4vdt/0tDQqJQkQvGMcirwEOhOe4Hi/U00QNq2y8wmNl 6lONJ94dVILPpFeWcIZCJDITPapBvQdz1Ib1g9RiJCVpgBMXqK0epEiycSSx9dN5bjBMoI sl4/n6Fgj2DzoLoNlof5JGHZdFS3YIYDceRjEp+IaJG9i3TBukp/PBpzsXHOgshJLCSewa FPmGnqjdXglTxl7J8XHeTW6kh3TJm7Y7g0rL+GWeSTdzDtwJNc0Txjj5VVtOLIo2/36XLs sCFcMRSll3MLA9WtOT3GeZ+4H2Xud1QdR1DafcmTS9kqd05odfTd6jpE2d+u1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735422725; a=rsa-sha256; cv=none; b=WA2StTHT95WE9vgmSaUKuPIzOPK7hnMS+jx5CgJGa0E+7COw+L4CMDSoPmUgUVR4/oNY4Q /jw/vEY9TsJSig01av46yNH7PhFyG3rKumxUWZRSfI5zh0ryizsfrfxrF6QWHRmti5QOrb TCgkmo6MnQSz9FuqBZxpUTpWjT0HsvHcKPTVNHLpbHpRyX2I3cQ2lBy8OSsEutGUESx95Y cYAxBx+Q+NRN9MmxKCIipZB0ck0yTNc3/34rGTuMLCB2bCQbM58qKc769PVx+TnvL+GOCd dZZM/YwTUT/izoH6fp7g2ZXPoxIh49IG8amzwjDT2f59suhQ7KLoCooOVYNVVA== 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 4YLGKx3bznzhw6; Sat, 28 Dec 2024 21:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSLq5e8074220; Sat, 28 Dec 2024 21:52:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSLq5cM074217; Sat, 28 Dec 2024 21:52:05 GMT (envelope-from git) Date: Sat, 28 Dec 2024 21:52:05 GMT Message-Id: <202412282152.4BSLq5cM074217@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 295934eaa92c - main - exports.5: Document the current behavior of -alldirs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 295934eaa92cd917ae42a446899c0d527ad9c0c9 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=295934eaa92cd917ae42a446899c0d527ad9c0c9 commit 295934eaa92cd917ae42a446899c0d527ad9c0c9 Author: Rick Macklem AuthorDate: 2024-12-28 21:51:08 +0000 Commit: Rick Macklem CommitDate: 2024-12-28 21:51:08 +0000 exports.5: Document the current behavior of -alldirs Commit 07cd69e272da adds a new "-a" mountd option, which changes the behavior of mountd when file systems are exported via -alldirs. This patch updates the man page to reflect the actual behavior when -alldirs is used when mountd is started with/without -a. Prior to the above commit, exports(5) documented that, when -alldirs was specified, the exports line would fail unless the directory was a server file system mount point. This behavior was only documented in the Examples section and has not been implemented since a change between FreeBSD 1 and FreeBSD 2 was done. This is a contents change. PR: 282995 Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D48139 --- usr.sbin/mountd/exports.5 | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/usr.sbin/mountd/exports.5 b/usr.sbin/mountd/exports.5 index 6436e586cab9..a90d81c4db99 100644 --- a/usr.sbin/mountd/exports.5 +++ b/usr.sbin/mountd/exports.5 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 08, 2024 +.Dd December 16, 2024 .Dt EXPORTS 5 .Os .Sh NAME @@ -84,6 +84,15 @@ to limit exported directories to server local file system mount points. When exporting ZFS datasets with the .Sy sharenfs property, this is auomatically the case. +If the +.Fl alldirs +flag is specified and +the +.Fl a +command line option is specified for +.Xr mountd 8 , +the export will fail if the directory path is not a local file system +mount point. .Pp There are three forms of the directory path specification. The first is to list all mount points as absolute @@ -550,12 +559,18 @@ will be exported read-only to the entire network 192.168.33.0/24, including all its subdirectories. Since .Pa /cdrom -is the conventional mountpoint for a CD-ROM device, this export will -fail if no CD-ROM medium is currently mounted there since that line +is the conventional mountpoint for a CD-ROM device, +for the case where the +.Fl a +option has been specified for +.Xr mountd 8 , +this export will +fail if no CD-ROM medium is currently mounted there +since that line would then attempt to export a subdirectory of the root file system with the .Fl alldirs -option which is not allowed. +option. The .Fl quiet option will then suppress the error message for this condition that From nobody Sat Dec 28 23:33:03 2024 X-Original-To: dev-commits-src-main@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 4YLJZR3STJz5jNyP; Sat, 28 Dec 2024 23:33: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLJZR2msDz4Jbj; Sat, 28 Dec 2024 23:33:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735428783; 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=bLZb2mfSAePu6bkyKGfRGG+D9e3+L+K5lRt6oiBZfI4=; b=x3Up1opp2L0fG5ZKWyV7MGALqPUoL1kVPIXJZxOvDHHe9tdA7JwbUis+6w7vXHuPQkDIYm Wc69/pNVkqQwP4TOr+4P9M6dVw28D96bLsMao4b/HQWWGxAuymRE9bMQdcfYFPZvRi+MQi 3hCSlpebH0Fm/k7UlKt2CepCP/eHm1qL0K0R4lASOKSj0UuI/n4xns3E73+q6oiOkWsc9I +5xC7raw6n+oIpI9C2n3vRUZ1RHJOOgJ0NbyeRYsE3BpfcUb5AuguoqGC+QT8S312Nq4Fn ZkDG+feCWHc6frLOfiY6MZ+HSH51QtYMP3kI81Ael8Xt6rGzhmFwZ13DwTOhRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735428783; 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=bLZb2mfSAePu6bkyKGfRGG+D9e3+L+K5lRt6oiBZfI4=; b=qMokco1nN0VCz9+c7Lv+SeI+poPFPVwcmfeo3rjMFHJartW9xNyZIpG1+91JM2nPD/hW7D QGobF9M13WaNqqPa31dvV4KZN9l3u3RCmi/3dTocM/Op7vYfmhovCV7fKIPwC84A6KJW0Z o8F9Kp+bfssTZkOpm0v4tSDJ4UhG5kWsLv/riREGZbPw/+JTfcwnwSV2TG5DaHbGnJu4AL J4saDrm/57FGSHwAcbUOy+XC764jTUfjjBeTDwBQKOvLMR6vXu0xuy21aerPUFfYFLYTiv ROxQltgxkCIlZfkXHyHpEIcpyRYP0wIt/l9BDHFdzo9aYUFb8tWWSGdjKwYpHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735428783; a=rsa-sha256; cv=none; b=RCtxmHoMNMkz0O+DQoSuC6lZUpRdGlHnuU5jvAJ2sp2SrxOJYmBIxCEp1FZKIF5rJBqY4S CTe0e5+Scd8aHKMEf/CjL2jisZl/aaM4fVsMHHO/Fkzaed6UDDda5y/fMjOrExtl+vpluO 9raufvA6ym4A25D7uNH6gBuK0eTdTfNaQn1dXmq6V7d/rod3VQ+dm2C++yLguLyRXtO+c/ Fv0N4lsmdp9teMTU1769RlrCJjg4MIRxt98UGxyG2hMQizVXdrO/9lpNBLmHt3UyXt5/nr 48kXHX93E5K7k2T00PNgRqN2HU4OlcMzszAzAUNGxblukMnn/E2vvGM/ccZ4xA== 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 4YLJZR2NhYzl0l; Sat, 28 Dec 2024 23:33:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSNX3Ho062537; Sat, 28 Dec 2024 23:33:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSNX3tc062532; Sat, 28 Dec 2024 23:33:03 GMT (envelope-from git) Date: Sat, 28 Dec 2024 23:33:03 GMT Message-Id: <202412282333.4BSNX3tc062532@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 39d3c81c43c7 - main - ping: correct minimal payload size for the sweep ping List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39d3c81c43c794aab00fbde9b4079749e6a08f6f Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=39d3c81c43c794aab00fbde9b4079749e6a08f6f commit 39d3c81c43c794aab00fbde9b4079749e6a08f6f Author: Maxim Konovalov AuthorDate: 2024-12-28 21:10:04 +0000 Commit: Maxim Konovalov CommitDate: 2024-12-28 23:32:31 +0000 ping: correct minimal payload size for the sweep ping The -g flag specifies a minimal payload size for the sweep ping and its default is zero. Make it possible to do ping -g 0 ..., i.e., start with no payload. Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D48231 --- sbin/ping/ping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index d9d544bc75c8..c11113fdd72d 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -328,7 +328,7 @@ ping(int argc, char *const *argv) options |= F_SWEEP; break; case 'g': /* Minimum packet size for ping sweep */ - ltmp = strtonum(optarg, 1, INT_MAX, &errstr); + ltmp = strtonum(optarg, 0, INT_MAX, &errstr); if (errstr != NULL) { errx(EX_USAGE, "invalid packet size: `%s'", optarg); From nobody Sat Dec 28 23:33:04 2024 X-Original-To: dev-commits-src-main@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 4YLJZS5hB0z5jP0h; Sat, 28 Dec 2024 23:33: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLJZS3Nknz4JfG; Sat, 28 Dec 2024 23:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735428784; 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=mVgmvl/+DogDcfuMRhltaiLDsI+npLB9Lp/xYgQU5ZQ=; b=gBrEdcS4i7Ul1i31EepjNk3ES2znByL4o1FLdF7wj1z2wmlm21tVkSjFolNrHQhC7twLUz eDREHCpmLaF9lnQ5SruJVGIwZDS8SYZTXkQ0vWoj0/ui6g+OFxU7W3YBog2m58CxHLUxsL H03ZZt3nh9OT2zfB4hqEoFC7P86Y6o1xlSOJWIMCAwDPAtL6qhXRBwi5nTl0+elDpRCIim IHLqKc3xrYPoa6Iswnh8yllijR/RLopGIAiBFufDX6KQSbfoTW/aUvczXemGTc509bpkt4 4iibX6cYwkXjBOwg7b03KZnqtwDPlgernS0YpVKS3jmRurrfT0ZbI18qoNoQVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735428784; 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=mVgmvl/+DogDcfuMRhltaiLDsI+npLB9Lp/xYgQU5ZQ=; b=XwAflVJsTRy7jqB74HLvyLFF4RLnu8nHsptIp0I6U8Fudo/0t4UHFabUsC41aelBaGBLER gDBcEdxF3wW2Z028eHQYRgh3Z63pTtqJMo4SkJPOuhfI/L4OJndp7+FpKjgIRJPG53fOIk amafED0o7qu03aSaWym3C/mPi/Isy+Qw2IiyYgLwc4TQpBIw9Do2Cnw3oQtXrlCOlkJxSq fYPQb3P/5x4ni7ecGMqfcVIXf5s8uKdgIl8preDLQ4t4EXpv7DPARpVy/RHQT276WJJV6M 5/Jdjxp0gJqEbA18mtKY0K2M2iLEHWhihYbaKhHmmD0GuXUFIlH1hh/hZk4Kgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735428784; a=rsa-sha256; cv=none; b=I41SdgwMHQK4dl6ju9EQZ0voTfLOHiheJwSfLwPmoyXoU/h85mRfUckBxJndfdTIbZha9y dzPkCbIbYiqCvQBrDp/X1xWhlW1/OH79BoIazxqt3P4lCA5v/OL7aS/8m3KTTSocmttgwz 3LAHXOex7fZzShoX4PYG9a0uMIg/eob/S6tBBbn/ven20f69SH5wP+NadVvgAeSQNRKxS7 wgFyg80rl+1HIULrflQD0NXxfAAuyq8VIHTRC5sUDIWsJ8HboOp7cK6GQqG1ncFo0yVh0T HwAB9VQtQj6QUWq9jFdZXwAp2QymRR0XUAA9Gson1h9hZBUienNl1eAaxye+Yw== 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 4YLJZS30YrzlfB; Sat, 28 Dec 2024 23:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSNX4TH062591; Sat, 28 Dec 2024 23:33:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSNX4nJ062588; Sat, 28 Dec 2024 23:33:04 GMT (envelope-from git) Date: Sat, 28 Dec 2024 23:33:04 GMT Message-Id: <202412282333.4BSNX4nJ062588@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 8408510c7769 - main - ping: adjust error messages and comments for -gGh flags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8408510c7769e5d78f882de9c7c30e93af25aedc Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=8408510c7769e5d78f882de9c7c30e93af25aedc commit 8408510c7769e5d78f882de9c7c30e93af25aedc Author: Maxim Konovalov AuthorDate: 2024-12-28 21:19:28 +0000 Commit: Maxim Konovalov CommitDate: 2024-12-28 23:32:32 +0000 ping: adjust error messages and comments for -gGh flags The -gGh flags are used for sweep ping to specify minimal, maximum and increment sizes for the ICMP payload, not the packet size. Adjust the error messages and comments accordingly. Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D48232 --- sbin/ping/ping.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index c11113fdd72d..2efe8d41f160 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -313,30 +313,30 @@ ping(int argc, char *const *argv) options |= F_DOT; setbuf(stdout, (char *)NULL); break; - case 'G': /* Maximum packet size for ping sweep */ + case 'G': /* Maximum payload size for ping sweep */ ltmp = strtonum(optarg, 1, INT_MAX, &errstr); if (errstr != NULL) { - errx(EX_USAGE, "invalid packet size: `%s'", + errx(EX_USAGE, "invalid payload size: `%s'", optarg); } sweepmax = (int)ltmp; if (uid != 0 && sweepmax > DEFDATALEN) { errc(EX_NOPERM, EPERM, - "packet size too large: %d > %u", + "payload size too large: %d > %u", sweepmax, DEFDATALEN); } options |= F_SWEEP; break; - case 'g': /* Minimum packet size for ping sweep */ + case 'g': /* Minimum payload size for ping sweep */ ltmp = strtonum(optarg, 0, INT_MAX, &errstr); if (errstr != NULL) { - errx(EX_USAGE, "invalid packet size: `%s'", + errx(EX_USAGE, "invalid payload size: `%s'", optarg); } sweepmin = (int)ltmp; if (uid != 0 && sweepmin > DEFDATALEN) { errc(EX_NOPERM, EPERM, - "packet size too large: %d > %u", + "payload size too large: %d > %u", sweepmin, DEFDATALEN); } options |= F_SWEEP; @@ -344,16 +344,16 @@ ping(int argc, char *const *argv) case 'H': options |= F_HOSTNAME; break; - case 'h': /* Packet size increment for ping sweep */ + case 'h': /* Payload size increment for ping sweep */ ltmp = strtonum(optarg, 1, INT_MAX, &errstr); if (errstr != NULL) { - errx(EX_USAGE, "invalid packet size: `%s'", + errx(EX_USAGE, "invalid payload size: `%s'", optarg); } sweepincr = (int)ltmp; if (uid != 0 && sweepincr > DEFDATALEN) { errc(EX_NOPERM, EPERM, - "packet size too large: %d > %u", + "payload size too large: %d > %u", sweepincr, DEFDATALEN); } options |= F_SWEEP; From nobody Sat Dec 28 23:33:05 2024 X-Original-To: dev-commits-src-main@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 4YLJZT65SXz5jP0m; Sat, 28 Dec 2024 23:33:05 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLJZT3t1Mz4JRL; Sat, 28 Dec 2024 23:33:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735428785; 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=VmDqXs4gkMehz/30gv7s56s464H/XXVHED+8Q1lwT3g=; b=XpSqpzawDnWto7heieENazJsSFT9xHGrqxq4UsIfwYtmphL4dkukkxXbanqHKiZx0GOo/1 QyA+Sz+l26o5ysZ0+Lq9MevzitIJCJ2AiNesbvhhznljLSsdJWDvW4rrd7ce4UvXN8/WbQ o7HviCQ68bURgdCwNGW7C6N1mMdFhYiM+QQsRixP78XuK/p/WneGs1alr53IBHoZT0r1OV nwBonrKs730Z9s/p1HNVz5tlkWxMkogElyDkEaqPi5wynOmKfIa3PnawhR+pA/tEEWpVWZ GKW9TvpKtI5mjaG8jH24IOc4Iy0gLYoMYiw1ifKd6Czsu6QR8v6G9uTlBN1UWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735428785; 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=VmDqXs4gkMehz/30gv7s56s464H/XXVHED+8Q1lwT3g=; b=DgAQvYXgxaP/TlP1k3S9jMRGOoYq55MH9ovVVsU9VVjk/J5l/XtzvEPQYmRdhBZ9yqyr1k cccH/SpsRhA0qJU8XouUqY1NdPRZQM1Av02wn75GU8x+k1w/TaKU3QtHXuauujolBua65G pJABmW+h1SzgUlOqv6QC35alsieXxWBCLabaUP6HUbxnfJiWFzmlubPJJJ3v9KPuoJ7W5x /22He7Gnmlk32oz22jks+qn60VjGbnO9UFSy2E3bVbfJNedo5MyDagriltlp2X6IL2dncy xVZEmz4hHSouGHSgkIjIjNMdhKy5s/3gfknKxkPc8yldcDLmL+4vOXzl9cxjJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735428785; a=rsa-sha256; cv=none; b=lpnL0M/vu7GTjcTGbCg43suPvbkDxOT7M/L1hucaxL06PR9FXM5oJUud+Nk0pqtdVGowLM Npn3o42vu3hOr1c3K34r0VTvE2gIQAQEXFzP5Wcyo+r79C/YYwZpx8kLvvZq3yFJRjUzN6 0pXVqj0GuLMt/Bx6jIoXMw9LfqZDhWgaFyTgtqZ8ZZ0Ikf0O7fdKiSUAF6cHs0cxfgxVKk 3Q/pg1czTXi5azF0I4toZOJX0XD+t5h2j9D2utCPKOj5RTTp62ZSpkiGw7UAuL9p+bLTaN onFKjF90xE5f72UXuy3/E83vu8obM3kapc2JaEI6YlQGaQrgh0Lyh97ilpcXnQ== 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 4YLJZT3VHgzlfC; Sat, 28 Dec 2024 23:33:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSNX5RO062640; Sat, 28 Dec 2024 23:33:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSNX5tE062637; Sat, 28 Dec 2024 23:33:05 GMT (envelope-from git) Date: Sat, 28 Dec 2024 23:33:05 GMT Message-Id: <202412282333.4BSNX5tE062637@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 14d370c9d72a - main - ping: remove a stray tab List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14d370c9d72a8cd72dff2dbf2c1aa6ee6f5253aa Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=14d370c9d72a8cd72dff2dbf2c1aa6ee6f5253aa commit 14d370c9d72a8cd72dff2dbf2c1aa6ee6f5253aa Author: Maxim Konovalov AuthorDate: 2024-12-28 21:27:20 +0000 Commit: Maxim Konovalov CommitDate: 2024-12-28 23:32:32 +0000 ping: remove a stray tab Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D48233 --- sbin/ping/ping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index 2efe8d41f160..d10e3c85c9bd 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -174,7 +174,7 @@ static int send_len; /* counters */ static long nmissedmax; /* max value of ntransmitted - nreceived - 1 */ static long npackets; /* max packets to transmit */ -static long snpackets; /* max packets to transmit in one sweep */ +static long snpackets; /* max packets to transmit in one sweep */ static long sntransmitted; /* # of packets we sent in this sweep */ static int sweepmax; /* max value of payload in sweep */ static int sweepmin = 0; /* start value of payload in sweep */ From nobody Sun Dec 29 03:57:08 2024 X-Original-To: dev-commits-src-main@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 4YLQR90DNjz5jk5X; Sun, 29 Dec 2024 03:57:09 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLQR86tqDz4lbv; Sun, 29 Dec 2024 03:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735444629; 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=2OnoFWT47+oe3bcFpzTDUGdMU7JGfnqt3xOc2GvV5Vo=; b=HUtbmlw+qrvKkLMCbSoMuwwgbGBl6Ls3OvDGOKIbr5I93PaRmAwTX1/skjKZPbZyeNlykf NlKa2eFtKiNl4BBGS/jnbQYMGGZvidbvai6K3RmSwy3JDFoH2RARleGzxLHl4+/6vGlaxD 9PcfyvpwBryHkpeXj1jLBVzSY30+dvmZcYvw3q0jUFKBvpmIAUwETcFYpHxxpjKx75jEB9 eZbjhTdmGbqHG6r/ONfG5G4dV9U55mzob3Qt9x9Nb8OuimDwl7E8aU7PeABERDAj+zC+rz ROZ0Ro6nP5CrEXbDTJ2qeELAedVRlKyULhchmKoYDPUm8qSPVRR1ue3kKLU5nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735444629; 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=2OnoFWT47+oe3bcFpzTDUGdMU7JGfnqt3xOc2GvV5Vo=; b=abELR22+w9Ktbr+n58EhShmiku5pxoTONOiFfGzgBYA7+TTVr5yb5kn/oPNLOlIa8kVL88 eTJ6sN2D4+GOkXu6efK6cxlofmbHilGA6JHG4m6RDoMEZjmgF5LfMgbHgd2sf10aDh8RU4 JTzKuyh3wcBKCypKc36gcKyHJJTq7ZiX2x17am0umTpb1rE2+9Mese7RkMTA9a1RdNJQEP DSXWiC2Wo3iFz2hv/jBDcfxYZsFYAp+st1h1yXXhq7deSY3s3OyIKpYMQ5Y+tQFXBVQw2D P6eOSO6eZjPGb6YvKUqfjbMjQZf+jb8houIPuUqaBf0zxUFG1XduhOEpYe9JSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735444629; a=rsa-sha256; cv=none; b=dnMYdbtxJQejLUOhVdhhFWVLAmsR35Z/qlaN1LBD8DX9UCZsXU49AIQwLqu5WYH7uoI39d STFQSfhfIZHkPLKgf8oH9lYktSGJXe9qGN95u6nOZzASJyrj6xww5MWz0ikrRdcUqHFaCC 9KPypXh9RJLzBGJd3FQglqJmgkuCMqD07Ien5Rg5mWMSZIVogZLzsm6SoQiN+TQnxIn+s5 a9odlDoXSLyTznsTlfo3gSfTkZqSimUXTKJ6mWne58sqL3+Kh7BPNuyVqtrvM8mrDk8P5L wPXh9Q8LxIxEo/DdWkECm7o+n1N5SQBtVEwdQoagWZkOnuZk0SdkkI2EtWQeNA== 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 4YLQR86VrHzsw6; Sun, 29 Dec 2024 03:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BT3v88i049939; Sun, 29 Dec 2024 03:57:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BT3v8SG049936; Sun, 29 Dec 2024 03:57:08 GMT (envelope-from git) Date: Sun, 29 Dec 2024 03:57:08 GMT Message-Id: <202412290357.4BT3v8SG049936@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: b313229969cc - main - pci: avoid accidental clobbering of regs on some fdt platforms List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b313229969cc56a057dfea28506784fd5468c6f3 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b313229969cc56a057dfea28506784fd5468c6f3 commit b313229969cc56a057dfea28506784fd5468c6f3 Author: Kyle Evans AuthorDate: 2024-12-29 03:57:03 +0000 Commit: Kyle Evans CommitDate: 2024-12-29 03:57:03 +0000 pci: avoid accidental clobbering of regs on some fdt platforms Most pci controllers will just have a single reg for the config space, but others (e.g., on Apple Silicon) may have more following that to describe, e.g., controller port space. Bump the "ranges" rid space up to avoid overriding these other memory resources. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D43921 --- sys/dev/pci/pci_host_generic.c | 22 +++++++++++++++++----- sys/dev/pci/pci_host_generic.h | 1 + sys/dev/pci/pci_host_generic_acpi.c | 1 + sys/dev/pci/pci_host_generic_fdt.c | 1 + 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c index 373a54a25a4d..884ab25548ce 100644 --- a/sys/dev/pci/pci_host_generic.c +++ b/sys/dev/pci/pci_host_generic.c @@ -59,6 +59,12 @@ #define PCI_RF_FLAGS 0 #endif +/* + * We allocate "ranges" specified mappings higher up in the rid space to avoid + * conflicts with various definitions in the wild that may have other registers + * attributed to the controller besides just the config space. + */ +#define RANGE_RID(idx) ((idx) + 100) /* Forward prototypes */ @@ -173,7 +179,7 @@ pci_host_generic_core_attach(device_t dev) phys_base = sc->ranges[tuple].phys_base; pci_base = sc->ranges[tuple].pci_base; size = sc->ranges[tuple].size; - rid = tuple + 1; + rid = RANGE_RID(tuple); if (size == 0) continue; /* empty range element */ switch (FLAG_TYPE(sc->ranges[tuple].flags)) { @@ -210,6 +216,7 @@ pci_host_generic_core_attach(device_t dev) error); continue; } + sc->ranges[tuple].rid = rid; sc->ranges[tuple].res = bus_alloc_resource_any(dev, type, &rid, RF_ACTIVE | RF_UNMAPPED | flags); if (sc->ranges[tuple].res == NULL) { @@ -246,7 +253,7 @@ int pci_host_generic_core_detach(device_t dev) { struct generic_pcie_core_softc *sc; - int error, tuple, type; + int error, rid, tuple, type; sc = device_get_softc(dev); @@ -255,8 +262,13 @@ pci_host_generic_core_detach(device_t dev) return (error); for (tuple = 0; tuple < MAX_RANGES_TUPLES; tuple++) { - if (sc->ranges[tuple].size == 0) + rid = sc->ranges[tuple].rid; + if (sc->ranges[tuple].size == 0) { + MPASS(sc->ranges[tuple].res == NULL); continue; /* empty range element */ + } + + MPASS(rid != -1); switch (FLAG_TYPE(sc->ranges[tuple].flags)) { case FLAG_TYPE_PMEM: case FLAG_TYPE_MEM: @@ -269,9 +281,9 @@ pci_host_generic_core_detach(device_t dev) continue; } if (sc->ranges[tuple].res != NULL) - bus_release_resource(dev, type, tuple + 1, + bus_release_resource(dev, type, rid, sc->ranges[tuple].res); - bus_delete_resource(dev, type, tuple + 1); + bus_delete_resource(dev, type, rid); } rman_fini(&sc->io_rman); rman_fini(&sc->mem_rman); diff --git a/sys/dev/pci/pci_host_generic.h b/sys/dev/pci/pci_host_generic.h index 7aa8852fd30a..6579cd0918c4 100644 --- a/sys/dev/pci/pci_host_generic.h +++ b/sys/dev/pci/pci_host_generic.h @@ -64,6 +64,7 @@ struct pcie_range { #define FLAG_TYPE_MEM 0x2 #define FLAG_TYPE_PMEM 0x3 struct resource *res; + int rid; }; struct generic_pcie_core_softc { diff --git a/sys/dev/pci/pci_host_generic_acpi.c b/sys/dev/pci/pci_host_generic_acpi.c index 1ff3a6bda707..f12632e7205b 100644 --- a/sys/dev/pci/pci_host_generic_acpi.c +++ b/sys/dev/pci/pci_host_generic_acpi.c @@ -182,6 +182,7 @@ pci_host_generic_acpi_parse_resource(ACPI_RESOURCE *res, void *arg) /* Save detected ranges */ if (res->Data.Address.ResourceType == ACPI_MEMORY_RANGE || res->Data.Address.ResourceType == ACPI_IO_RANGE) { + sc->base.ranges[r].rid = -1; sc->base.ranges[r].pci_base = min; sc->base.ranges[r].phys_base = min + off; sc->base.ranges[r].size = max - min + 1; diff --git a/sys/dev/pci/pci_host_generic_fdt.c b/sys/dev/pci/pci_host_generic_fdt.c index 4e933dec35db..73c6201dc14b 100644 --- a/sys/dev/pci/pci_host_generic_fdt.c +++ b/sys/dev/pci/pci_host_generic_fdt.c @@ -215,6 +215,7 @@ parse_pci_mem_ranges(device_t dev, struct generic_pcie_core_softc *sc) sc->ranges[i].flags |= FLAG_TYPE_MEM; } + sc->ranges[i].rid = -1; sc->ranges[i].pci_base = 0; for (k = 0; k < (pci_addr_cells - 1); k++) { sc->ranges[i].pci_base <<= 32; From nobody Sun Dec 29 17:58:34 2024 X-Original-To: dev-commits-src-main@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 4YLn622jfgz5jXBy; Sun, 29 Dec 2024 17:58: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLn622Cmgz46yq; Sun, 29 Dec 2024 17:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735495114; 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=vXg4XLLWa+tLR6SdWfZ+cUjDh9/U2sFoO3iBW41CyDA=; b=ykWOXPjQd5spwK1NZUtrWSY5JGLA7nygJe+7A91AT1Ff/6Gk5NeGs4x3VML2zIJ4F0a+r9 FkHWrUXhRH9Cem51xZtqibFaFKhorXPqDn7stKM4G73h3ilxrlds4LRdaN95MtXYFAANsb d8eb0pWkBRy22uIjeCzx+pN/TsPSOL4qGgNqLjeJrkLz2umIvfciesqOnwE9f/4l1tGOOl 8tdS84WcibAXISqkwJUQUaE72F23pJGiryDjm9TUZOjg5eJLsNdCZ2NSybmQXeXivQzfFB DJUDMIc+vSeUn4O5CDUpjobD/iyXMe3KAyxhGszl2CmczKIitiJCZRrx5wxMRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735495114; 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=vXg4XLLWa+tLR6SdWfZ+cUjDh9/U2sFoO3iBW41CyDA=; b=X/a/6oljLQrkJham2Gqm6HByabcpC9/lEn03FG221cYpou7lcMXsgiMBt/hiWCtv5FkWla ZxL6/UdPwkjqmfVEfP2ATPy3nU6bb5ZoxRt5GVOixmeYu4HC8wUHI4pwU/ByMqPd5kpjy/ P2OkSFKxo0sXx88ByHmHLLskQYFKvtH4y8pNEOp9l3CRpHOHHVkqMyrZA7SNGLIjuJyM7W HHufqAZgDMPFSCmQTBSI8eL7/BK5emd0Of8D64stCkKSug70c7ee7IG3J9IjhSZnBeQPQd Zl7T/fZ/4+jmM8fKwX1bG+NshLu8OPkKNiQmmXds/serbaUa/TTwEQ/xFJxyGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735495114; a=rsa-sha256; cv=none; b=Rdb6zu+6ihxKi37ms6XQqCKkL6BbLkakfiyRRo/ajtQF4KAV4gMuP3sGfMjkjXaDXRdBJT P2oMH4dRSf82MgGuHC7PwOyrgK7BZyK4i/CGmDwNJCaUFBkhb64txoQKwObESYujxHgcXg nR87Nlo0VaOSviZ1+BSvRVSkkycIa8M2U03f6aIqlzFBFmuC8t8i8PBGWfRu1Qx8gKEXH1 P1B0eYtvxp/zm31Jego/9qDflQvhoVN2yd5p7PkRWBO6JSlzecAOnJxWZ1Q3w5N3qvzlnu Gs8LaPoEi++LcWvcBl3LkoswLHLTX+LOZWUDZt17ySoX/J+MOa/TfCRyYUkocg== 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 4YLn621jw8zK36; Sun, 29 Dec 2024 17:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BTHwYqN017863; Sun, 29 Dec 2024 17:58:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BTHwYBs017860; Sun, 29 Dec 2024 17:58:34 GMT (envelope-from git) Date: Sun, 29 Dec 2024 17:58:34 GMT Message-Id: <202412291758.4BTHwYBs017860@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 9ba7351fcfd7 - main - ssp: Make ssp.h more self-contained List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ba7351fcfd7ccd6cdb5ca2b774a338ab12b1ee8 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9ba7351fcfd7ccd6cdb5ca2b774a338ab12b1ee8 commit 9ba7351fcfd7ccd6cdb5ca2b774a338ab12b1ee8 Author: Mark Johnston AuthorDate: 2024-12-29 17:57:46 +0000 Commit: Mark Johnston CommitDate: 2024-12-29 17:57:46 +0000 ssp: Make ssp.h more self-contained Include a header to provide __size_t. Fixes: c10d567ea022 ("include: de-macro __ssp_overlap(), improve semantics and checking") PR: 283653 Reviewed by: kevans, imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D48226 --- include/ssp/ssp.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ssp/ssp.h b/include/ssp/ssp.h index 6856c5ce6961..489f49a90218 100644 --- a/include/ssp/ssp.h +++ b/include/ssp/ssp.h @@ -87,6 +87,7 @@ __ssp_redirect_raw_impl(rtype, fun, symbol, args) { \ #define __ssp_redirect0(rtype, fun, args, call) \ __ssp_redirect_raw(rtype, fun, fun, args, call, 1, __ssp_bos0, __len) +#include #include __ssp_inline int From nobody Sun Dec 29 20:14:57 2024 X-Original-To: dev-commits-src-main@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 4YLr7P2lNsz5jkPt; Sun, 29 Dec 2024 20:14: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLr7P28s4z4JQS; Sun, 29 Dec 2024 20:14:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735503297; 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=xAceabjXhIZSnLfeILjWYr484FhooX6udUdc/QabtDY=; b=FrCr9mHWTFXiZo/m1Qit14kbEomblue4+lxwsvmEWTNsv2tj0efsndJyZ9cPvfB3Vl0NPx UeA6dk9myJvNAYtu+AR+B/MTGs2AaDrznDBLXW9Q24GhseAjksdQsZuV5qnnbR6UmmOTym T4TTf/TIyt2dWAjp8OoQxJqgj77vh5CVHV/rCxsXvlg43ye7HBwsvpWorfW8jviDafhriW alj4g4DfqNPcFsJmtLJgdrrKjP/VZdMCIKUu6cuVaK/7JjoGSwh6YH9vn94kQF/ifJmewJ u3b2S6pffjt1h61TnWtT8COsPugQNpIo0vBlvFzNQFa7xGzU9E1fEQlE/8th9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735503297; 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=xAceabjXhIZSnLfeILjWYr484FhooX6udUdc/QabtDY=; b=E8m6FLaCszHwx1xK0ij6JjYGYfKpp9WHx/UFUw4bu+Chwmsqc18JgBQUrKjufJDHlfRXF9 loLSx44/1qH2POEO3q+lLjZgqdj3aznyo2w/9VAdtAhXNshTACpA6QVwV0/ye7/Gf/psaf f2pKU4y8ENk90uyO9GfhVmEXrVTXLktvDT4uGRoyDTeEZwBIz5+LY5Ddsglt5xXkjZe9Yz bNshLVz84ya/4WL72rXpBKRGa8I2ABTIlT2E22h//kSQX+o51eSMpCVWg+k0t/r7qPzYLT IRHiJ/i2BMaRaunBbUrixTAF/QcKhVfYZ0MgoaHVjL7WU0k+zuUXdWDdK6+8cA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735503297; a=rsa-sha256; cv=none; b=SDRIiTHc1EwkcxLpf34iHZn37hQU4R6JmRD15tUCO20Rk2HEi7bejv+OQMfs/jEvHIlioo YorZCG3bGz28kHnuUdyktIxlNXpy16s5oFNaVsfuaSuYYUCwA/pWKYOpoHgmKhpCXy/7cK IVEdnypPMNZX3PIXJouyoiNKPBUt51iLGmz5bEps26jpngJhp+ZldxLpJuIo2ceJ8xLcHF 0AAyi9zkBpCoElBHT+Lyb15WR3GcQNLBs/Tu9cgCbL7twebw33w5rEsfkaSBrt1o8OI0Vu jaOD+6dviHdK6LEDbYF5ivuSZX1GMM19LxCzsfW4Qwq5ISOFEJ4T6M3K2YdZ0g== 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 4YLr7P1bkKzNsm; Sun, 29 Dec 2024 20:14:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BTKEvhj078252; Sun, 29 Dec 2024 20:14:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BTKEvAu078249; Sun, 29 Dec 2024 20:14:57 GMT (envelope-from git) Date: Sun, 29 Dec 2024 20:14:57 GMT Message-Id: <202412292014.4BTKEvAu078249@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 6ba2a0846fe3 - main - ping.8: typo fix, indentifying -> identifying List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ba2a0846fe304be8e7aa933fbfd25fb0ae16091 Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=6ba2a0846fe304be8e7aa933fbfd25fb0ae16091 commit 6ba2a0846fe304be8e7aa933fbfd25fb0ae16091 Author: Maxim Konovalov AuthorDate: 2024-12-29 20:13:15 +0000 Commit: Maxim Konovalov CommitDate: 2024-12-29 20:13:15 +0000 ping.8: typo fix, indentifying -> identifying --- sbin/ping/ping.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8 index 0eaec196e1e3..43dca1148e16 100644 --- a/sbin/ping/ping.8 +++ b/sbin/ping/ping.8 @@ -230,7 +230,7 @@ option. .It Fl I Ar iface For an IPv4 target, .Ar iface -is an IP address indentifying an interface from which the packets will be sent. +is an IP address identifying an interface from which the packets will be sent. This flag applies only if the ping target is a multicast address. .Pp For an IPv6 target, From nobody Sun Dec 29 20:30:24 2024 X-Original-To: dev-commits-src-main@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 4YLrTD31zFz5jlgR; Sun, 29 Dec 2024 20:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLrTD29dYz4KWY; Sun, 29 Dec 2024 20:30:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735504224; 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=0xwT1URBGEspE8zUsrtmNNCxOSh43l1AWMfGsRqJUj0=; b=N3jqZYpwVmUieTSPwqLaNhIerwO+6wfaNEX6TrjvX7GhbVdUxhz0BwoNuMAQGwLR0Ml1nB 17gXkA5W7SZ4+7OsuONIJjOKLDI99pZS4+re4zbnDkS6xJ7NfuAV9Q2cNbd7HmW9u8DYJZ PARvmNoVqECqUQeXQtA/rB04fqqZMW/fYVoybcEpOV6XyFKswugO65wW6Xwx8qu5Nc1rw6 qkyil6EJXWfvPD9SXrPvHO8oYc5jfALJ/qjHZ59cai/+R4BOWiTcnZ6mjBKCSrHny/5YYA Wvh4huOSB8hfeGIqx4J6w8BCsjtb8CU6dSzTUSX+cb9Fr7FgTT/VX7Ht4ZFVXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735504224; 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=0xwT1URBGEspE8zUsrtmNNCxOSh43l1AWMfGsRqJUj0=; b=hPxPaIWKWC6jvtc8YwcOSddszuaxGa2RPpeWvtvj/gguUgj9Dti/omarr+i7zC7dZQOAJS sJLXN0KNldMssTpqBK9seHGtYbnjph+tfStvdTiz+k2N+Lg7rn/Br3Qk2wDU+q1aUWOKv4 B65o7LP9wMTusZlI7Jqdc79q7lt/OauUfM47UPc9N+ITiFVwJ7vLava+6DYmvP1k00IbXR ZgIkv3S8PSzjURim+RezTLvP36xEPkFf7Jx4YCcuuR0hYqL3FzusiU0lN/H1x/ivKWNPVu /oNR6npYxdYxk0ny8pD/e+RKHeSwWhuk/LzpzaTIHAxePY8zrc1Qd0mJc1SWiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735504224; a=rsa-sha256; cv=none; b=sc1YRkAS/E8E0uzDPk5tDTYku3Yz9mnzYLR5tnsd9jWZ1NSt54cj/fuY9k8fX7+KqDLtqS j1DVCC+ecs2KmBibzkjdmayE9fbIXv60GykirikaHooLjZKxTi1v1bl7YwWrtt2FWrpwEn FARtSf8G+66FKX/D8GClj2cUCyM85DrRS83rbTv3Zl+8t7VGAfOwuR0cpTJZf1Fv5XPS6z 67LNejS+FRwrd7hZs5oOOifW3jjBS4i9GdEzMQG20xPb6g615di9iun6MRPRi6IOkoANW/ smliCMjAz0/rC66SUxiaI+X/1SkhcF2pHWCPE1CVnttGrWsrQel+YRU4o27OVA== 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 4YLrTD1TF1zNw1; Sun, 29 Dec 2024 20:30:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BTKUOKW006783; Sun, 29 Dec 2024 20:30:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BTKUO9P006780; Sun, 29 Dec 2024 20:30:24 GMT (envelope-from git) Date: Sun, 29 Dec 2024 20:30:24 GMT Message-Id: <202412292030.4BTKUO9P006780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 788e1eb7c199 - main - makefs: Remove impossible if condition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 788e1eb7c199297aa438fc5cb6caabc9be01b419 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=788e1eb7c199297aa438fc5cb6caabc9be01b419 commit 788e1eb7c199297aa438fc5cb6caabc9be01b419 Author: Ed Maste AuthorDate: 2024-12-24 01:58:37 +0000 Commit: Ed Maste CommitDate: 2024-12-29 20:28:32 +0000 makefs: Remove impossible if condition This test is inside the else block for `if (*oldname == '.')`, so *oldname cannot be '.' here. Reviewed by: kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48243 --- usr.sbin/makefs/cd9660.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index bc9895730b84..63f2e33b978b 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -1664,12 +1664,8 @@ cd9660_level2_convert_filename(iso9660_disk *diskStructure, const char *oldname, else if (isupper((unsigned char)*oldname) || isdigit((unsigned char)*oldname)) *newname++ = *oldname; - else if (diskStructure->allow_multidot && - *oldname == '.') { - *newname++ = '.'; - } else { + else *newname++ = '_'; - } if (found_ext) extlen++;