From nobody Sun Mar 5 13:22:29 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PV2SQ0ynhz3wTMx; Sun, 5 Mar 2023 13:22:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PV2SQ0Bmzz4Rxt; Sun, 5 Mar 2023 13:22:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678022550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+0a51WkoIQHktm4cUpoqFgxL8yWqb2UnaSFK5HnD0b8=; b=bqaOKCTeW4H63kVP70nGxeSYBWT40lK+H+OCZIcWfuKBVJwdw+FlhlFnmXFohXCAw+UYhI bEvgxKbXiZpSDxosM9sTKUAHa1hUWqkxjluSe9TnmlmOSuN4DAX5JtTBlXID5HqnbDNyYt +xLZTR3M9YuHJdQ01XfnprOO8/C14ZE7m5J5eV5TdBJIKInpvgKHxfqSg6+3beX5+A3sWf +80sKUjaZifQQLKQ/5dThpzzUsg37HDrI3aMeLQMDyPpUDuaz575dGbjXLbGrIfIiy+8G7 seHbzjRAxn/QRfSmx/ukch6u+c2kHjEpMuRNk47u8Qg5FF/roLlvEA1LQvVpHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678022550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+0a51WkoIQHktm4cUpoqFgxL8yWqb2UnaSFK5HnD0b8=; b=En6eechgb4NaSxvIsC8gPj81py4YfheNUFqVvf/SrZXNUuI+XFeiBjLQ09IXLUcUhY4AAz nga0BWYTYPqDlcGQ29VN4CNJN3+Rrz5NswQsbx8jc9dbcz2EDcxgmwaN2HEqPss8Y1dlHb VV4+WI5kNQ5BTQ9QIelTnucUdX/hzYdf71zhg6U3Bdy0YBJMHu15hxtCij2L1Q7whhySB+ TIgFtQsaya0MTND6x2dutIinIAus9fELUNbQESJf3jKVrz7jG2fp7lci1BRlci340GNPtv WPXEcePE4jnhVQNw2DuhN0Ja303PPjg45+L4Klh+coYTXLyNkmnoHf2PwMykEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678022550; a=rsa-sha256; cv=none; b=jd8HtDMtDB2HEQkS2rNHliLOGWyeQZnPmMf+9m0tupyJ1VFNO2BYe3Ezawy39/UJLwMU3H 1Z99ggDwzSKxWhkz9vzZXXj+fYQZXDXaeUi9e8uxxiwl1Sm4Rho4v1HiyTnO2s4IemlgP7 tEnwiQZdGQqIjprBClXazPmLm1kUUwLJ/cNGDr80H1eDYy2hSrUHKNTq2sNkpWz8WD2OuP r7hBdyUy+HKLh9iZMGTbpr/7lrbTQOCCVgDkzztwHdr1Ax1e8eJ8vxHZD5Si2jBx+b2YMO 9picuJhYvQb9aGraVYhRiGRF+9AyQ2vDfAYt3Xfjlr9AglbCR43ThK0PXSiUGw== 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 4PV2SP6M4xzNCx; Sun, 5 Mar 2023 13:22:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 325DMTNZ049307; Sun, 5 Mar 2023 13:22:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 325DMT83049306; Sun, 5 Mar 2023 13:22:29 GMT (envelope-from git) Date: Sun, 5 Mar 2023 13:22:29 GMT Message-Id: <202303051322.325DMT83049306@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: c079c0ee94d0 - stable/13 - inet6_opt_init.3: Some enhancements List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c079c0ee94d0dcdb92eb1c5579337e4bb2b824a2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c079c0ee94d0dcdb92eb1c5579337e4bb2b824a2 commit c079c0ee94d0dcdb92eb1c5579337e4bb2b824a2 Author: Gordon Bergling AuthorDate: 2023-02-25 13:11:27 +0000 Commit: Gordon Bergling CommitDate: 2023-03-05 13:21:04 +0000 inet6_opt_init.3: Some enhancements - Be consistent with RFC references, so add a space after 'RFC' - Add a LIBRARY section - Use standard integer types in the SYNOPSIS section Obtained from: DragonflyBSD Differential Revision: https://reviews.freebsd.org/D27548 (cherry picked from commit 211ceb62e85d8d01ea89af0de8e43430de550e72) --- lib/libc/net/inet6_opt_init.3 | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/lib/libc/net/inet6_opt_init.3 b/lib/libc/net/inet6_opt_init.3 index 484767f781fa..0813e6ca7838 100644 --- a/lib/libc/net/inet6_opt_init.3 +++ b/lib/libc/net/inet6_opt_init.3 @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 1, 2021 +.Dd February 25, 2023 .Dt INET6_OPT_INIT 3 .Os .\" @@ -43,20 +43,22 @@ .Nm inet6_opt_get_val .Nd IPv6 Hop-by-Hop and Destination Options manipulation .\" +.Sh LIBRARY +.Lb libc .Sh SYNOPSIS .In netinet/in.h .Ft "int" .Fn inet6_opt_init "void *extbuf" "socklen_t extlen" .Ft "int" -.Fn inet6_opt_append "void *extbuf" "socklen_t extlen" "int offset" "u_int8_t type" "socklen_t len" "u_int8_t align" "void **databufp" +.Fn inet6_opt_append "void *extbuf" "socklen_t extlen" "int offset" "uint8_t type" "socklen_t len" "uint8_t align" "void **databufp" .Ft "int" .Fn inet6_opt_finish "void *extbuf" "socklen_t extlen" "int offset" .Ft "int" .Fn inet6_opt_set_val "void *databuf" "int offset" "void *val" "socklen_t vallen" .Ft "int" -.Fn inet6_opt_next "void *extbuf" "socklen_t extlen" "int offset" "u_int8_t *typep" "socklen_t *lenp" "void **databufp" +.Fn inet6_opt_next "void *extbuf" "socklen_t extlen" "int offset" "uint8_t *typep" "socklen_t *lenp" "void **databufp" .Ft "int" -.Fn inet6_opt_find "void *extbuf" "socklen_t extlen" "int offset" "u_int8_t type" "socklen_t *lenp" "void **databufp" +.Fn inet6_opt_find "void *extbuf" "socklen_t extlen" "int offset" "uint8_t type" "socklen_t *lenp" "void **databufp" .Ft "int" .Fn inet6_opt_get_val "void *databuf" "int offset" "void *val" "socklen_t vallen" .\" @@ -67,9 +69,9 @@ The advanced sockets API defines a set of functions to help applications create and manipulate Hop-by-Hop and Destination options. This man page describes the functions specified in -IETF Draft RFC3542. +IETF Draft RFC 3542. These functions use the -formatting rules specified in Appendix B in RFC2460, i.e., that the +formatting rules specified in Appendix B in RFC 2460, i.e., that the largest field is placed last in the option. The function prototypes for these functions are all contained in the @@ -206,7 +208,7 @@ inserted into the extension header, and the argument indicates how much data to copy. .Pp The caller should ensure that each field is aligned on its natural -boundaries as described in Appendix B of RFC2460. +boundaries as described in Appendix B of RFC 2460. .Pp The function returns the offset for the next field which is calculated as .Fa offset @@ -281,7 +283,7 @@ or functions. The .Fa val -argument points where the data will be extracted. +argument points to where the data will be extracted. The .Fa offset argument specifies from where in the data portion of the option the @@ -289,7 +291,7 @@ value should be extracted; the first byte of option data is specified by an offset of zero. .Pp It is expected that each field is aligned on its natural boundaries as -described in Appendix B of RFC2460. +described in Appendix B of RFC 2460. .Pp The function returns the offset for the next field by calculating @@ -305,7 +307,7 @@ All the functions return on an error. .\" .Sh EXAMPLES -RFC3542 gives comprehensive examples in Section 22. +RFC 3542 gives comprehensive examples in Section 22. .Pp KAME also provides examples in the .Pa advapitest @@ -318,20 +320,20 @@ directory of its kit. .%A E. Nordmark .%A T. Jinmei .%T "Advanced Sockets API for IPv6" -.%N RFC3542 +.%N RFC 3542 .%D October 2002 .Re .Rs .%A S. Deering .%A R. Hinden .%T "Internet Protocol, Version 6 (IPv6) Specification" -.%N RFC2460 +.%N RFC 2460 .%D December 1998 .Re .Sh STANDARDS The functions are documented in .Dq Advanced Sockets API for IPv6 -.Pq RFC3542 . +.Pq RFC 3542 . .\" .Sh HISTORY The implementation first appeared in KAME advanced networking kit. From nobody Sun Mar 5 17:24:37 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PV7qn2Xl7z3wjbl; Sun, 5 Mar 2023 17:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PV7qn21MQz3LT8; Sun, 5 Mar 2023 17:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678037077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ydZGGkV5Fe40Pa90LKSUzo1o8iC97ZE/t7ypQuRqvts=; b=UpsqJoGxpBh8Q+WCDS8COor/EYWa4/UQJmRC5CgwSLpvTeKTRMWP1RM3+dh8iWI+cnjIek kk1ywXNMW1fqH8uRm8Sa8VdMYSEKaBGiWbkYIz/OvGxr5FhnBiEGpHreDYcJXrxHgWaVdX DaN1f3FtE/pw8XOMFf7keGz5Vd9g/dNpABit61GwMhSOddskkHUCfD9i1t4SAmQ1INVOS5 nD1eVuEGmaLgwfFho+2e1hDsRQarJ0WQb57aqH0CsjiQRMKnvXa7K5aZZhw56zRhVSPX5x AC3sUO1T1X0+i+cvxm1h4hfyAlYOJozCEywhHnx7UmQyHKMfOdfd0f+/HCsmKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678037077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ydZGGkV5Fe40Pa90LKSUzo1o8iC97ZE/t7ypQuRqvts=; b=UKar1eyhKjuVyoXdxbiJBILwEobcbhSeKeZkq9Br7AHL6ONZqoVAyvOHHdEvBFkx55Ysg+ W8GfzS+0GBU/ylCp7BNvEowWukYV0AECGVxmH9lUXtu9kM0uzekjYYxnTGRc4Io/4eWZiX HpeQFpsk7snXJQSU1Kb9vJ1e0osK3sJxZY3CiUS1Cqa8e3Pi0FxCNNcx5r+d/HVoIBo17J NBhZz94xtpZ3Nz19RwJokrNo7NxHc7VI3S2UQWQj5zTiR1nfcNKsO6tEbldSBwv/x4jkl0 pvU86pshSU6EE/CfZRlyPAtIEUwHcxqUIUnIivZ546+TbJVCavIEzGqWTVK6Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678037077; a=rsa-sha256; cv=none; b=kKPWo7pt1MXm4niHDkd0be2YUMx2p7zB1huuL4UKTMDdUkVjkAWwUJiBRx1DhqxA/iZOPJ llqP0MgwFxTBlvFhe7EL+JjisMKI3OHA2wx2QRRZLWzm7IzsmGa0bclrpheVhO/m2MBHg6 NEY2lkdGfcghTbYtMQLvQH594UiHZUHbLlVnsYky+BzAeTVE2Dk3gntmu6JpMLV2JStlG3 FlXSvHbYn+ePVAXLD9qt5j9SHlMH7zjhlgYJwmsxSUrdELYGyucsvXmhIG+0kkraAU2cOG hx+YA8VO0+ZlALznLroIKhWglVwCA3jE4ojh2lCXIiRSuEFVMciitCtXR3yXbA== 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 4PV7qn13bPzVPl; Sun, 5 Mar 2023 17:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 325HOb7e043301; Sun, 5 Mar 2023 17:24:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 325HOb7c043300; Sun, 5 Mar 2023 17:24:37 GMT (envelope-from git) Date: Sun, 5 Mar 2023 17:24:37 GMT Message-Id: <202303051724.325HOb7c043300@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 04e14db22425 - stable/13 - lockstat: Use the correct type for a symbol size List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 04e14db22425484a96b31688203f8f5b67dba287 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=04e14db22425484a96b31688203f8f5b67dba287 commit 04e14db22425484a96b31688203f8f5b67dba287 Author: Mark Johnston AuthorDate: 2023-02-25 01:11:08 +0000 Commit: Mark Johnston CommitDate: 2023-03-05 17:24:17 +0000 lockstat: Use the correct type for a symbol size No functional change intended. MFC after: 1 week (cherry picked from commit f4f5e69c84df74e8834aed173af1127b1ff50970) --- cddl/contrib/opensolaris/cmd/lockstat/lockstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c b/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c index 2fd29843b8ce..2cbad3442efb 100644 --- a/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c +++ b/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c @@ -632,7 +632,7 @@ predicate_destroy(char **pred) } static void -filter_add(char **filt, char *what, uintptr_t base, uintptr_t size) +filter_add(char **filt, char *what, uintptr_t base, size_t size) { char buf[256], *c = buf, *new; int len, newlen; From nobody Sun Mar 5 17:24:38 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PV7qp5RZBz3wjbt; Sun, 5 Mar 2023 17:24:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PV7qp2bt4z3LTS; Sun, 5 Mar 2023 17:24:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678037078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9gH5DRYLZkolYQeu6pBAOZy60N+wcITUOxEkjTApS/4=; b=GYySl9Mvaj6TE894WG2sPBa4sIEHCGWJpnz1GBn7kYZdNkDc9lmM6RuTe2Gn+EuZrCE5ca 4kZE530uEjyiYFCe5J37QaO8nvYvRop1Nc8z2vuG/3+sWAkvgV2NmwnRES8+Eoz7zIXFuY e9bokQcWUG0Ahnv5IbfZgpq+5NUy9xIdIz0P4a4e3x/XJrFK0yglcU5b19ONEC/04OoUZY oeS5efuYIMZpiJ94qrhPLPfCfiVMVDwNl/2eCCrNRWeFVut2897VNJ4GEi0cJKVp6usMcj UbzudTKSRyU3H0jyqnyDFOVxrEUDFOz03WIlRccbdrO74tKzi/K3nkKAf6TwuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678037078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9gH5DRYLZkolYQeu6pBAOZy60N+wcITUOxEkjTApS/4=; b=ZzWJUNBEEvHLLja4ntFjjaVgjsrW3lUQ4OIBjzF0OuH9WOLug1ugzJ3qdHcdUrkeE0tfDc EG1CZuiqDAp0B6gze9n8Dlo9zE6yvvGhpLREXo0npXce02Br4agCtusnc4UMDVQhr6eiZE KrERtgI9R0uTk/1DzwmUgLQCPh79zmp2KSUhrY8LVSDCSP2AB+bfKbQDPhg/lMSzfkillS ZpF1/xkcLP2SWSgUvHPJyrizkBO1Tvo7mSaOEzjIcbIdZqME8q9QHx6gjJl7p3r4bHVSQX u4KU08OdncL0NC0G9Upq+8yOQsbO38FbfCKxxcsqE5sc6x5Ze8rJHxChSEYC+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678037078; a=rsa-sha256; cv=none; b=W95aRcICX0Zz/j5Y1EpTbTEC7E7gSq+jTqhZHCfAdr5SvHBaxFdIrBZWAMcsu8x9h3yLg0 tYNoM7YsVbVy55QQ49dRvNgcc1qQdOxmeOT5iZ+4kaeQJgZwqbU99dl3bu+2AUhgVThJ5y K2ZOwjP9ok1AiLictJGtLyBjxbk6UNL3eK1VItqzbIrlDkaKsrAS7w+8qItkoBcNwe8W1u CGLxFivYDNQr5s5vaWbSAH4QVb4arOFwSaMEZmTW3lvd1QLWHID33Ky9XXANFMpWB1llNe FLOx/WQta41SvlAMriLobNeKGzeBCoGcMLxp+ERpRSRjMPDV9CUEgH4p6x6NEg== 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 4PV7qp1jm9zTQM; Sun, 5 Mar 2023 17:24:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 325HOcRE043327; Sun, 5 Mar 2023 17:24:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 325HOcpK043326; Sun, 5 Mar 2023 17:24:38 GMT (envelope-from git) Date: Sun, 5 Mar 2023 17:24:38 GMT Message-Id: <202303051724.325HOcpK043326@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1a0e3257ca9d - stable/13 - lockstat: Use gelf.h instead of playing games with the preprocessor List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1a0e3257ca9d321a822aa787c48ef922f2b60345 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1a0e3257ca9d321a822aa787c48ef922f2b60345 commit 1a0e3257ca9d321a822aa787c48ef922f2b60345 Author: Mark Johnston AuthorDate: 2023-02-25 01:15:21 +0000 Commit: Mark Johnston CommitDate: 2023-03-05 17:24:26 +0000 lockstat: Use gelf.h instead of playing games with the preprocessor This reverts a portion of 1477dd823ee ("Merge OpenZFS support in to HEAD."). No functional change intended. MFC after: 1 week (cherry picked from commit 49e3972afc1112f95863a04cea7a4401b78dfd1f) --- cddl/contrib/opensolaris/cmd/lockstat/sym.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/lockstat/sym.c b/cddl/contrib/opensolaris/cmd/lockstat/sym.c index b5366c566857..7516e7d435f4 100644 --- a/cddl/contrib/opensolaris/cmd/lockstat/sym.c +++ b/cddl/contrib/opensolaris/cmd/lockstat/sym.c @@ -42,6 +42,7 @@ #include #include #include +#include #ifdef illumos #include @@ -54,7 +55,6 @@ #endif #include - typedef struct syment { uintptr_t addr; char *name; @@ -73,11 +73,6 @@ static char maxsymname[64]; #endif #endif -#define __sElfN(x) typedef __CONCAT(__CONCAT(__CONCAT(Elf,__ELF_WORD_SIZE),_),x) x -__sElfN(Sym); -__sElfN(Shdr); -#define elf_getshdr __elfN(getshdr) - static void add_symbol(char *name, uintptr_t addr, size_t size) { @@ -174,7 +169,7 @@ symtab_init(void) { Elf *elf; Elf_Scn *scn = NULL; - Sym *symtab, *symp, *lastsym; + GElf_Sym *symtab, *symp, *lastsym; char *strtab; uint_t cnt; int fd; @@ -198,13 +193,13 @@ symtab_init(void) (void) elf_version(EV_CURRENT); elf = elf_begin(fd, ELF_C_READ, NULL); - for (cnt = 1; (scn = elf_nextscn(elf, scn)) != NULL; cnt++) { - Shdr *shdr = elf_getshdr(scn); - if (shdr->sh_type == SHT_SYMTAB) { - symtab = (Sym *)elf_getdata(scn, NULL)->d_buf; - nsyms = shdr->sh_size / shdr->sh_entsize; - strindex = shdr->sh_link; + GElf_Shdr shdr; + (void) gelf_getshdr(scn, &shdr); + if (shdr.sh_type == SHT_SYMTAB) { + symtab = (GElf_Sym *)elf_getdata(scn, NULL)->d_buf; + nsyms = shdr.sh_size / shdr.sh_entsize; + strindex = shdr.sh_link; } } From nobody Mon Mar 6 00:31:29 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVKJK65YMz3w9B4; Mon, 6 Mar 2023 00:31:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVKJK5V0hz4KDH; Mon, 6 Mar 2023 00:31:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678062689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xx18VvtybgCYIOWYIKaRiHWhfYZbSRy5PIBviORpxes=; b=LsG3DZW9D+yrJZJUzomJtoOpwgWBToKPHT8PeOX8z2u7/ZJdUHbIZYZRa9ANAtXKx50aEK Xmsky/OZXaaYNXBam4ZXdbY1Sa24Q94/XOEsbZHeLQsW3v4ok46ooyrrwbyZ/1YIsowwYO 2IPbx9DieXG4oLqH6mNznsQS7CPZr1N5J+stl143tZ2YdkXCFqygL8GvSItQvNpWG7K5Fj SYVUkh0JP2Hyns7qXkTG0SiXy0NlWWkSK4aqErlGLCJ9tyao8z13ESc+ITNx1cAoU2w5hf uywsfhlX9EMwPaAFwr+Z5RU8uqzgQBj2BdjFyM6In7yxvxNmi/5itNLX4w88bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678062689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xx18VvtybgCYIOWYIKaRiHWhfYZbSRy5PIBviORpxes=; b=E4SxCQFfORyLoFPPj2DKNLimeLTR7m1eXIr18xf2tfoicmTScod/2+u65bQTqkWXrE+PFm iuZ3KkqoybDu+0mUGJyAsX5HIF0FmdpL6RPW/0Ft/1RdG06+V1jkjuuTTkeDHB2MdEhIPk H0z3ZHRCggVL6nK21owqhpH4IUzgSaoC5O0jtAMIVP6dvIPbSREAv1adzkXIz7eWr5hk7P 2fiMNetdD+XCx24KJEELSIlcZFO1xAVEzEYu8MfsghpW2zqqbYMTfZc4KiwkWxLnezdRgd XFS4/u6DOXUpQV/2AEykYkLMbHe9SUsjRmhDUJz/HIYcZ8zDIFsdmY9o0Oazww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678062689; a=rsa-sha256; cv=none; b=Bj8f8FgFlugvIkHEQtKRdX6QiBWwa9MWpOomNYMcZIhhabI4edyDAkHPa0qrQ42thnI2Oj cjlDRwHO3p7USHMWhqIn/TWNHAxhUcjDb4wV1sxtyVjOzwUAVg6cUYfnOBxeAwP2PCgrOn ocleKvsFFzb9f6O7IIiu2sF/d/c1k4r2FS5FcOjVaLbgsn1gMtdBXwMvjSyoWEefGjhnEY t5efhvxUQs6M3ixB7IUx2P1w5E1rhdzSoR32gpIpGq2aO58Ec0m1SNT7YxWnqapmX/CjaL bR6LTXa2jUzeX7t1klNyC6lIHZzURc1J8qpQUcUMAEjdurwfGqWQednkpogQcw== 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 4PVKJK4YFjzhSb; Mon, 6 Mar 2023 00:31:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3260VTm3043763; Mon, 6 Mar 2023 00:31:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3260VTAV043762; Mon, 6 Mar 2023 00:31:29 GMT (envelope-from git) Date: Mon, 6 Mar 2023 00:31:29 GMT Message-Id: <202303060031.3260VTAV043762@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: ab53efd14237 - stable/13 - mergemaster: add deprecation notice to man page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ab53efd14237b71c3c0e4e212ada6526ef14402c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ab53efd14237b71c3c0e4e212ada6526ef14402c commit ab53efd14237b71c3c0e4e212ada6526ef14402c Author: Ed Maste AuthorDate: 2020-01-22 21:04:03 +0000 Commit: Ed Maste CommitDate: 2023-03-06 00:30:57 +0000 mergemaster: add deprecation notice to man page PR: 252417 Reviewed by: bapt, gjb, kevans (all earlier) Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D23327 (cherry picked from commit 398b12691b4f1e7a73afca4c051c182bfcaf9671) --- usr.sbin/mergemaster/mergemaster.8 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index b76799e39cd5..60c4b9e8ac63 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 27, 2018 +.Dd March 2, 2023 .Dt MERGEMASTER 8 .Os .Sh NAME @@ -43,6 +43,17 @@ .Op Fl A Ar Target architecture .Op Fl D Ar /destdir/path .Sh DESCRIPTION +.Bf -symbolic +The +.Nm +utility is deprecated and may not be available in +.Fx 14.0 +or later. +Users are advised to use +.Xr etcupdate 8 +instead. +.Ef +.Pp The .Nm utility is a Bourne shell script which is designed to aid you From nobody Mon Mar 6 00:31:30 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVKJM0P5Tz3w9Mk; Mon, 6 Mar 2023 00:31:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVKJL6sgPz4KTc; Mon, 6 Mar 2023 00:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678062691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wb6jIMXOdcSTkP1LRUQoy2UTF8dMUqY867jWAQFV4n8=; b=hrLpTYx0rCQ3yDPu0aTUFIGpiVV6vGZ0gogs4dMNDhCni9VrNaGPKOMd3nxlh1HG0DSzZl in8CsQqW5pPCFhBHTfkyIBtb8xZAyw+OyrlhSj+/ykElLpigaWBQoWd/l9n/fr3tUnWZLt CK/S/YpA5xeabCFDHQ3rI7p66AFIrdtJw24Viot8mE5I67flEstb6i6ahNjRnNtykT432+ lXxutJfnPA4YntleXm9j6yAZyOBw3GOrFvtasdA0on1rK4Xm/ofgo1TuICjvCd8AV5bm+d cBU7NRt9zdh943gJEiNAMFLuEwz4jE5qNXpEC7NghzroRCoYS1sRZDfSu9soQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678062691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wb6jIMXOdcSTkP1LRUQoy2UTF8dMUqY867jWAQFV4n8=; b=ees41B8nNrq7PamSAv5O8OlgHas30Vlddae0FXYKVS9Jg/S6USPN5sqAWrJ5k+yQbcKRVb vLzF97ewf1YALdZLu4+6zkTnlagF/n33fhysu7eLe9JYl5wNLFKEY29KhAf6J6qg2hubaa VtRpbiAjjYaT5R6pVinoD5OPKe9fwqpSKgUgB50nxuF4i+05Yx/+5a4MuFagsSVxzF4Y8O Fyc2Z2195VgXIWuIGoDmXD3s8Am+CNqg34tFfSHBW/YYL20jU3jupbTVHEkmK4fV3e0EEH QzbO/8bKMkPispesdjZkDMI7v0XvukqjaIxKjuo8c1H+R0jv3dK3yKaB411Qzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678062691; a=rsa-sha256; cv=none; b=A5n/Ij3B3/Fn2XkpwMeJCu0WN8U80ROjiaW9oYkf2I3x3FimurTT146Rh8v6KnbvqowF1T 1ftRI6qSePiW3i0rLRpbNgObPM1ayM8LIA8TcRwPB7a304MDVVhUDcb8z4y4lhcCTlc2TR slD3kHXYVFmfRpl/iJid4I5TVfLUACb/3NXn5L/Ou+T+IEfdBAOaR3Hjg2RVd9xwE2s2ZH MPTB9C3P7q4ynMsIhwoK07OSzuC+iDU87mkEiof1vkJjdnlB0KiAb8CgjfwSCJno538MCC 0HcLqPWABgej9f+4AIyoQZaOu30YF3I46QA8dmIEFcwu87R8rm8Aln4yEQsJcQ== 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 4PVKJL5kbzzhMg; Mon, 6 Mar 2023 00:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3260VU17043782; Mon, 6 Mar 2023 00:31:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3260VUDN043781; Mon, 6 Mar 2023 00:31:30 GMT (envelope-from git) Date: Mon, 6 Mar 2023 00:31:30 GMT Message-Id: <202303060031.3260VUDN043781@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: b562307b7034 - stable/13 - freebsd-update: use grep -E instead of egrep List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b562307b70346030f59fe6a05d125814c74da47b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b562307b70346030f59fe6a05d125814c74da47b commit b562307b70346030f59fe6a05d125814c74da47b Author: Ed Maste AuthorDate: 2023-03-02 23:54:52 +0000 Commit: Ed Maste CommitDate: 2023-03-06 00:30:57 +0000 freebsd-update: use grep -E instead of egrep GNU egrep emits a warning that it is obsolescent and suggests grep -E instead. Switch to grep -E in case we end up invoking GNU (e)grep (and for consistency with other invocations in this file). Reported by: Steffen Nurpmeso Sponsored by: The FreeBSD Foundation (cherry picked from commit e27ded83c76a609687a3d9e82b80fe7e1b782bf6) --- usr.sbin/freebsd-update/freebsd-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 225d1e31e3ec..4ef44d1ad000 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2547,7 +2547,7 @@ manually... read dummy >>>>>>)([[:space:]].*)?$' $(pwd)/merge/new/${F} ; then + if ! grep -qE '^(<<<<<<<|=======|>>>>>>>)([[:space:]].*)?$' $(pwd)/merge/new/${F} ; then break fi cat <<-EOF From nobody Mon Mar 6 00:31:31 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVKJN17w4z3w9Mn; Mon, 6 Mar 2023 00:31:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVKJN0dHZz4KVM; Mon, 6 Mar 2023 00:31:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678062692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JYvutkjxw4ggskCGRtmqVCpwVrcruccFMIIrlijjC1g=; b=E/Oh/UjbAXzX2yvfaD3rhSSRzp85geMx22KrBkkYClmsGgcX05OW8EaIMgajBT+l9W2R3u tFeXrN/ZjCyoUcTmQE4loEqK7dj3kVRucZKRGGQJ1yOhV5JNEU9ux/FAYGbJ1+baZpRk8q Y2XsKR6aJM3q5chD0Rcnrqh7BOkIlo4JAwq0PAgJO5E2dj84YJOCaLjngYGcGqNBVO90k5 EPaxZK6b+LnQpEiT0I7FncIlduLD85/2c8o2r+8hoVQ6dZQHVQ/f/4uWy8ucnWnSxknZPJ mPytHT8ae57GSfiSjlIYHF/3PmwsS0cWOATAcKkZbD/lfeZVTdihCyViQznuAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678062692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JYvutkjxw4ggskCGRtmqVCpwVrcruccFMIIrlijjC1g=; b=iIaWtcPmjeQPuiCqgnJ/VZz6l6zoMmiGTJ/xwBmygkfac4D9eYXDsx++qlFGIe43vVhMzi sbDumwqYFFbrwhHEE0QF/9om+mcfvaswovplTQJgSccyNJCSGPpD2erIlH0sCFOHs5tu6l YtJajhmQQm+8YtaPjiIHp/NaEkXRqrM4sN45Uv+LwTGZRmPo6Y8QeePp1yA0SHO1rA0p2g 6oiPokNQSFmvxIu2Dyr25cLJQ2dqAvyS3MdVXZAgkIxZE+wHnJJJnNYkXD/hRW1WQi2pyD Vkil1gemnJCG7C/uo08+5EwvuAyc4ug0LxybD2ilcn44AceMWQm+jQaPXt0iJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678062692; a=rsa-sha256; cv=none; b=otCwoI22rU+y+eAUwrHfTdnCYNKdHyXgXQW3NuVnqsj+di/j+KNvl9KxqfAqBwh1sliicI ZZiPzFvocXTtjnGQt5fgFEabi97Of6hsC5NbaZn1Bl8mxVK2wCvZDY/Ezp0TmiKHHBz9MS OmFEgFimq1WTNxQe+GdB64HW6zoVddgEJu2TJxTH+EEyGskiT3+Ol8hYgI/tM3u0m0o91t hZH/9sxc0SjRXOXWnb2tYLLZO3ln+c/znR/w37smTz0OLJhdcVzDMADX7ENJK2/1wlC6kj GSIspyLgzeE3FiqKiaO/B/bYJ1S34/F7y8nAycR0FOnOtdQgtdYK7V9fflXgsQ== 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 4PVKJM6d5WzhQR; Mon, 6 Mar 2023 00:31:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3260VVNE043808; Mon, 6 Mar 2023 00:31:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3260VVRa043807; Mon, 6 Mar 2023 00:31:31 GMT (envelope-from git) Date: Mon, 6 Mar 2023 00:31:31 GMT Message-Id: <202303060031.3260VVRa043807@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 02a57b183020 - stable/13 - thunderx: fix potential sign extension issue List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 02a57b183020d6c889f794f876a0c000597e01b4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=02a57b183020d6c889f794f876a0c000597e01b4 commit 02a57b183020d6c889f794f876a0c000597e01b4 Author: Ed Maste AuthorDate: 2023-02-28 19:17:30 +0000 Commit: Ed Maste CommitDate: 2023-03-06 00:30:57 +0000 thunderx: fix potential sign extension issue Coverity reported a sign extension issue on rq->caching << 26 in the Linux ThunderX driver. (It appears Coverity Scan doesn't build arm64 objects in FreeBSD.) As done in Linux, add a cast. Fixes: 3c0086b81391 ("Raw import of ThunderX VNIC networking driver...") Sponsored by: The FreeBSD Foundation (cherry picked from commit 5e95f5f5315083baa7d98d3286f6c0a82621a68e) --- sys/dev/vnic/nicvf_queues.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/vnic/nicvf_queues.c b/sys/dev/vnic/nicvf_queues.c index bb3eacb75fad..84e1d132da5a 100644 --- a/sys/dev/vnic/nicvf_queues.c +++ b/sys/dev/vnic/nicvf_queues.c @@ -1337,7 +1337,7 @@ nicvf_rcv_queue_config(struct nicvf *nic, struct queue_set *qs, mbx.rq.msg = NIC_MBOX_MSG_RQ_CFG; mbx.rq.qs_num = qs->vnic_id; mbx.rq.rq_num = qidx; - mbx.rq.cfg = (rq->caching << 26) | (rq->cq_qs << 19) | + mbx.rq.cfg = ((uint64_t)rq->caching << 26) | (rq->cq_qs << 19) | (rq->cq_idx << 16) | (rq->cont_rbdr_qs << 9) | (rq->cont_qs_rbdr_idx << 8) | (rq->start_rbdr_qs << 1) | (rq->start_qs_rbdr_idx); From nobody Mon Mar 6 08:05:03 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVWMg6cYZz3wZxQ; Mon, 6 Mar 2023 08:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVWMg6Bgqz3y7s; Mon, 6 Mar 2023 08:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678089903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qWI5va198miP/5UKMeYcU2si+0KfQiHGjgmT78H+h4g=; b=tfvo4U+sQzgHKemCBfFAg6DTyTtl0NLjC3vUCuz0jG3iI84UeRwxPZ0nbYHuQnZ7VpHQpQ SIBCzTedMY5v7MFU+lvweuzd/Ueuf8IuqVcTD25CdShkPkuV5mxrOgT1D140AVdnuwjPYc ERIjI28qxHwsS5AplVEkp9o31Kv7H7syLIrfP1ZY8vTWvsXb+1Gnel3I0RVLZcbyf2Bj5u L4rTm4RPHI7Sz6WdIm6Hii7CiUfcUu58dOHWcVaY48xd/GE17ZzZ3FNc0ylVAT9UoFioTR R/ukTWOqYjNrwqsj/Sp60aIFoKM2EAURRYn2CMj2fGGOfgK4Qy0y156Fcd3RlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678089903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qWI5va198miP/5UKMeYcU2si+0KfQiHGjgmT78H+h4g=; b=dbyzLUQFlr7eMtOBN+ZBCYb6JyJ1uUu1iyYMvxG0o1DKtEIix8lN5pYmUIPyObFLO91DnQ MIwgjCg603iBLGdxOtHVqZIRp4DytDrEvTg8S97fHPN5VW54mnRRyEGQA04VqCP613/5M9 775Wxb3iw8+Rot5rferwYANmPRenr5oYS3L1DgNAqR1tjFhoTnIi6vKjF+MHihdpXIhoQj x8PxiGmofrg1Ic7JAGHOdqNP5bu9P2l13xeyrJo2EaXIsiLZ7bPZYb4jCOKbOpT6a/GAE8 tYS9uvIqs3bKajlZfd0HqcFIyuoU3bHI0hcYZH3tUewh0pSzJ0W0ASqKzTRY/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678089903; a=rsa-sha256; cv=none; b=UEHkyln79C2+dtN1WpWFHR14PCfhoM9vsvarhdkKcE6Gc571GOw6l7SM/nmB4bjEZ5rk5L uRN+OW9/XO+5B2vdIpGoyzog7QVa/lMWfvR1QlrCrki6y/0Wkub+vlQMLcVxqPKXxFBF3c nTZk9EpDEQHkUsJBqwNtmEvVRYtpTyvWBTkoWNDnt09YZWfu4foA9aMjxQvtacHKMPIGeI N88uQUszdG2Hsqq8ciJ+lblbCDkTcbtsifik7HCgjE7XTD2Wsa05t4oQOOfFBR6Y+fpuC6 ji2mVSBk3UIKKA+kIEZhOu3A1C3YY9XSOJfER2PlCDYcIk4K+B22YufzmqfL6Q== 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 4PVWMg5GhmzvH1; Mon, 6 Mar 2023 08:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326853CC086893; Mon, 6 Mar 2023 08:05:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326853RR086892; Mon, 6 Mar 2023 08:05:03 GMT (envelope-from git) Date: Mon, 6 Mar 2023 08:05:03 GMT Message-Id: <202303060805.326853RR086892@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 551a3a645645 - stable/13 - uuidgen: add -c for compact uuid List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 551a3a645645e4652c33dc0fda11a57aa56ad4f2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=551a3a645645e4652c33dc0fda11a57aa56ad4f2 commit 551a3a645645e4652c33dc0fda11a57aa56ad4f2 Author: Baptiste Daroussin AuthorDate: 2023-02-28 10:29:51 +0000 Commit: Baptiste Daroussin CommitDate: 2023-03-06 08:04:42 +0000 uuidgen: add -c for compact uuid It generates the uuid string but without the hyphen MFC After: 3 days Reviews by: tcberner Differential Revision: https://reviews.freebsd.org/D38820 (cherry picked from commit b2b294f27cf4618d6f7510007b41882860a080b9) --- bin/uuidgen/uuidgen.1 | 5 ++++- bin/uuidgen/uuidgen.c | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/bin/uuidgen/uuidgen.1 b/bin/uuidgen/uuidgen.1 index 83326e3a189a..75fd02703175 100644 --- a/bin/uuidgen/uuidgen.1 +++ b/bin/uuidgen/uuidgen.1 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 23, 2012 +.Dd March 1, 2024 .Dt UUIDGEN 1 .Os .Sh NAME @@ -34,6 +34,7 @@ .Nm .Op Fl 1 .Op Fl r +.Op Fl c .Op Fl n Ar count .Op Fl o Ar filename .Sh DESCRIPTION @@ -53,6 +54,8 @@ instructs to not generate them in batch, but one at a time. .It Fl r This option controls creation of random UUID (version 4). +.It Fl c +This options contols creation of compact UUID (without hyphen). .It Fl n This option controls the number of identifiers generated. By default, multiple identifiers are generated in batch. diff --git a/bin/uuidgen/uuidgen.c b/bin/uuidgen/uuidgen.c index 061907f57109..6dcfdde92a5f 100644 --- a/bin/uuidgen/uuidgen.c +++ b/bin/uuidgen/uuidgen.c @@ -46,6 +46,31 @@ usage(void) exit(1); } +static void +uuid_to_compact_string(const uuid_t *u, char **s, uint32_t *status) +{ + uuid_t nil; + + if (status != NULL) + *status = uuid_s_ok; + + if (s == NULL) + return; + + if (u == NULL) { + u = &nil; + uuid_create_nil(&nil, NULL); + } + + asprintf(s, "%08x%04x%04x%02x%02x%02x%02x%02x%02x%02x%02x", + u->time_low, u->time_mid, u->time_hi_and_version, + u->clock_seq_hi_and_reserved, u->clock_seq_low, u->node[0], + u->node[1], u->node[2], u->node[3], u->node[4], u->node[5]); + + if (*s == NULL && status != NULL) + *status = uuid_s_no_memory; +} + static int uuidgen_v4(struct uuid *store, int count) { @@ -85,16 +110,20 @@ main(int argc, char *argv[]) uuid_t *store, *uuid; char *p; int ch, count, i, iterate, status, version; + void (*tostring)(const uuid_t *, char **, uint32_t *) = uuid_to_string; count = -1; /* no count yet */ fp = stdout; /* default output file */ iterate = 0; /* not one at a time */ version = 1; /* create uuid v1 by default */ - while ((ch = getopt(argc, argv, "1rn:o:")) != -1) + while ((ch = getopt(argc, argv, "1crn:o:")) != -1) switch (ch) { case '1': iterate = 1; break; + case 'c': + tostring = uuid_to_compact_string; + break; case 'r': version = 4; break; @@ -162,7 +191,7 @@ main(int argc, char *argv[]) uuid = store; while (count--) { - uuid_to_string(uuid++, &p, &status); + tostring(uuid++, &p, &status); if (status != uuid_s_ok) err(1, "cannot stringify a UUID"); fprintf(fp, "%s\n", p); From nobody Mon Mar 6 08:05:04 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVWMj0fpWz3wbF6; Mon, 6 Mar 2023 08: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVWMj0B3Xz3xy0; Mon, 6 Mar 2023 08: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=1678089905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yd6tidVVthGpfwPo1Pd5fgbD3ZRY/sp3pqJsCukV2dU=; b=rrC+VP15N66L0Elo1TOByfldapkXCEPrSn0xUw38JnjC9zPF56LVrpmm8rR4GEcT8DLFXd rbjWd9D6q8Yk8M2qzC0GhEs+IffglzJhI0rmIzeeId8R/DMMw3EZwDhD+p7KYPM7onQyGS qRW1gEmXAv8bqkc9K0LvIJoNDxAa3bcg9NHMVLQ7g9oQPzLL84clZe6Pq7qtrwI6/G7yUi wIK12/Q4WcMsvYQV5hjTrFxC6pTnANUUO6u1vG84+NbrPiqD23sDDVcLsmmZNDxiJ46gAb ByxcHl5QCoY+w+8a4ZGZwR0rBI9qSCK2Ozj2nTZbj7B+Un+SR83xGdxUKC6haQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678089905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yd6tidVVthGpfwPo1Pd5fgbD3ZRY/sp3pqJsCukV2dU=; b=kHONfDVm1X8rNA2edavdhl6uQDZoG7eMSqBXGAGzNmhiMTzYlvUO0KAMlpsTd2PXs2RlmB KYGfqp+JcuEAcOG6RdvPvEwndAMOfRnr+n9vTBUnamEHz8X44QJbQL/ObnuCi45/sXxigb uCeQ8Arxg2D6UniyaSdTRAUg9W6P3WKWYNNKxPqP0JIM/dOrmJ3Ab5WwLlYS1mwaEey2e9 yO4+wjXyDg5EpFVxLIwRApB0FovGe4v6e1G/bxOHsIziQ8MCrEe919PpRRoHuiFzWjAjIj 4P80rF96ioILf9T4rHmT6rvDoCfgn9rZHn56KgrEqMspNbmXOMW560eHrsEzDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678089905; a=rsa-sha256; cv=none; b=ocuw453+G3rv6tfBdCP4rWx0SkdNYAcwWqQ7+Y7ErsRJAmR791BTG1NBIKK2dnR5EAt1rD 8PjOFFZqdgorccROwzCP447h2Me2utHNhqPGLs0JIgm7rTiqAznEDY9vQ0G+mln8KTTMj1 BtLvaxD9bM6m23y3X2EdRIaIpYgCHWM13QPBG7TqFt6nPALeKSIo7EG6J8gwqSTnry2RLF oJOym/eZ9yd/FyajspCRDk4T1T2ks6k462azJ61qLvWa0vfr0O0aaMxSuB0yshZfiWCDEi L7gQ9AeKXKvVev1i56toULAHWWN+clRa9Yqcr78MNKWRVJNMu2/btdhOocqGqg== 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 4PVWMh6Pvrztxd; Mon, 6 Mar 2023 08:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326854NP086912; Mon, 6 Mar 2023 08:05:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3268549S086911; Mon, 6 Mar 2023 08:05:04 GMT (envelope-from git) Date: Mon, 6 Mar 2023 08:05:04 GMT Message-Id: <202303060805.3268549S086911@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: ebca19e71d8b - stable/13 - machine-id: generate a compact version of the uuid List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ebca19e71d8b58c2da1ac1bb34ed37a647903797 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ebca19e71d8b58c2da1ac1bb34ed37a647903797 commit ebca19e71d8b58c2da1ac1bb34ed37a647903797 Author: Baptiste Daroussin AuthorDate: 2023-02-28 10:31:06 +0000 Commit: Baptiste Daroussin CommitDate: 2023-03-06 08:04:44 +0000 machine-id: generate a compact version of the uuid dbus and other actually expect an uuid without hyphens Reported by: tijl MFC After: 3 days (cherry picked from commit a28ccb32bf5678fc401f1602865ee9b37ca4c990) --- libexec/rc/rc.d/machine_id | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/machine_id b/libexec/rc/rc.d/machine_id index 7cfd7b2d92f8..8bf3e41d0603 100644 --- a/libexec/rc/rc.d/machine_id +++ b/libexec/rc/rc.d/machine_id @@ -23,7 +23,7 @@ machine_id_start() if [ ! -f ${machine_id_file} ] ; then startmsg -n "Creating ${machine_id_file} " t=$(mktemp -t machine-id) - /bin/uuidgen -r -o $t + /bin/uuidgen -r -c -o $t install -C -o root -g wheel -m ${machine_id_perms} "$t" "${machine_id_file}" rm -f "$t" startmsg 'done.' From nobody Mon Mar 6 08:05:05 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVWMk4CHxz3wbF7; Mon, 6 Mar 2023 08:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVWMk154sz3yDt; Mon, 6 Mar 2023 08:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678089906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V19rQQQnqn4m/QzDOm0+pFlcerBJqf0lMskR3pxubXA=; b=Bq160SvoBLY4nMD8Ah1HMo0egSqeAW2IJ1xavNyRW+KPE0C05fpWAeApy9d3Q1+CaPwsmk SXNViy5NAa8e7ggFutRjIYdk9ZlSqQJa+fJhnVqYmeIIrPKCxaVCsyCohc6W9ImxglvBm1 U5tcXDXAzb5qgNhWvnnQFQmZM1zN50PzpfhrFWig7dm7aC+G4qyg7T2fDptNFWU2+NHiqJ hxjK0xZuLw2n6dQId9cIY61bSG8L+T44+4PsR52136DbxpxbctYENRMcSOmq16pqDW8aM5 qfJ6OrLL4i/1+1KJ1keqDwq+qLXaCFmd2mekrln4Xfy+zxZ7rVcuka/8Rtedxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678089906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V19rQQQnqn4m/QzDOm0+pFlcerBJqf0lMskR3pxubXA=; b=HqrWxbMQWzhqYxAPc7C3vLlULspesmTebPUaopifBW5YLnJmDtGhUEcaT2epcAiq8GdPfc 2TSLp/RH5veQmYcVA/qHxxB9hwvSHh8NaQwPK+zTlWHjEsGwqIw9Dr0CgtE4XrqwtMU8BY 8GRR6vYd7rUSZFXX1f5q0exhhnFM8mBW8KgFyfImDaSsXyS7eLSebrBa48bwnxmWMakAjp 92cbUnUBmgTtSOhqEwpQ1gGAnVWYmno34qjEyIE386IXdxJibGAIW9MgiXQojTWD/FEaFw 6xZ5ffxPUVKA/5f1fg1tvBwdG6IUsMtT6HrKjPAZBjUSPCUJY0tOiveFvVeu8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678089906; a=rsa-sha256; cv=none; b=qYC84y0fgE+vkfrhykiOPuCVsMNDTreWKPDzAwRwhXDrP/dvFS/sZIwAUfXByKBHH/BB+4 244qrAhLkJVVHHRtVo/FltPY9XFP3m8l6Ra3uVn3Nlkw4Pevv9aeFPubDMexYd2RQW/mnt CVFqwZY6H6U3SNDd7m5Z6la0YnhT0cJqUWAebZ73H7JLkLYerM1YmONT36fP2B4hnJSmAr K1+W5qHdBlZIyDqNRphw1LsJQcnxcPZetOKl21OSzPIJxveXHTOuynvy4yVOoV1ZTgpjgT pOtMRv8mvTwQ5Gb71PZUOWHwHkFOTTW8OQlUG8tcf3BBF8naPK7usrDVLFy2yA== 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 4PVWMk0C2fztgR; Mon, 6 Mar 2023 08:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326855JJ086931; Mon, 6 Mar 2023 08:05:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326855dl086930; Mon, 6 Mar 2023 08:05:05 GMT (envelope-from git) Date: Mon, 6 Mar 2023 08:05:05 GMT Message-Id: <202303060805.326855dl086930@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 131a68738513 - stable/13 - uuidgen(1): back to the past and fix typo List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 131a68738513e42e4f92974164f4c2c25c348e51 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=131a68738513e42e4f92974164f4c2c25c348e51 commit 131a68738513e42e4f92974164f4c2c25c348e51 Author: Baptiste Daroussin AuthorDate: 2023-03-02 08:35:30 +0000 Commit: Baptiste Daroussin CommitDate: 2023-03-06 08:04:48 +0000 uuidgen(1): back to the past and fix typo Reported by: ceri (cherry picked from commit 0ba66872bea87abdf13660d5a7946769fd7b118f) --- bin/uuidgen/uuidgen.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/uuidgen/uuidgen.1 b/bin/uuidgen/uuidgen.1 index 75fd02703175..da174f24a3ba 100644 --- a/bin/uuidgen/uuidgen.1 +++ b/bin/uuidgen/uuidgen.1 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 1, 2024 +.Dd March 1, 2023 .Dt UUIDGEN 1 .Os .Sh NAME @@ -55,7 +55,7 @@ to not generate them in batch, but one at a time. .It Fl r This option controls creation of random UUID (version 4). .It Fl c -This options contols creation of compact UUID (without hyphen). +This options controls creation of compact UUID (without hyphen). .It Fl n This option controls the number of identifiers generated. By default, multiple identifiers are generated in batch. From nobody Mon Mar 6 08:05:07 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVWMl55Xyz3wZxX; Mon, 6 Mar 2023 08:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVWMl1M5sz3yF3; Mon, 6 Mar 2023 08:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678089907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oINtfJ5sc3jXV7jCMF43iOgkP3pmHOA61y23qXTeNJs=; b=I/Erku3aBLPwdlRhMwT/tV44jOEjV7nn1xw862XJkzcNOoFxx1RZRffCfq4TewJbb9L4+n 4NTN1xitoXw65PTjUrwmv9jdTreRK29KJdP4mQLOggSllYvp68H9A3Dk/45yDbqxxexLZk iTNto3eTGFIoIYmoI5dqMsVG2x65edANzoLHE6pe49zKSZz5jTId8pc84CB4+CYLXGxkTZ NOHzTeu5SuHYp4w4jBqu8E1qXXT4XlUEcg1BnfKjd8oXBejPolQOMacw7uJoHe+AZcFkWH b4EL6b5a70+yVmaeIKDzyeW0yPBCHAFg+ajcSCXyxIo8zkEdb7VPS2vNfUUvmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678089907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oINtfJ5sc3jXV7jCMF43iOgkP3pmHOA61y23qXTeNJs=; b=RqV+ox+auyhqZ8Tezbl1Fb7mB1UqxbMF8IK7drkXwJNiBd9OoMk29vQco9LEbJmazVLGpu 5hZ9kSHpoQsJPnj/v2fU6Mf5SjO9fAxWP9/0ZEkLQOzvzUdGC2wmJPQMwrt4iY31PJWTXM HTo9j8t/syJ8L/3TLay+ISU180glZeJiMvsQ69J6cM6tBFBI1P9SrxtMZmqmnmfhKBlfz/ 59sb0mt4TjKpJjOFMNjaR8YRQaNdmLwr4o4mN8XtKDm49A9zh/KTWj+AcuW/kV5ejSzPyn GYsEa0G3sG8aDLMZmBmywLTPDrq7EZoY4SS4WtWEx8JOAgZp+BH7GFvTt30Wpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678089907; a=rsa-sha256; cv=none; b=IpKoztA5dx9ISoBp9GsjHa2ek1WgdznpnL4GK4ha5mPYsuC7K3qcAu9p/acXarMU27q1lV wXITKUXKTgTmsnXZOz6GnaCHvqxoPI/P6i8W1I3RpvW30fOKb2s9IpPdLlXiaxz5ufjMxt NrbNhvZab0QRztlndqLGQS/5UxDa2R5QR6IpAqwNTLNFUChlDstqlTilr+XGBxzlRAqX2p VJBLDrMqrGAyyzWSdTXqEws+thOMsTCmy05d7KxrVCqKUniikwF3OMbOCh9aMhJZQVKLRz Rs5uD3jGyW2hGgq+IF6EU9hOBo2SmUXSVvfPcWCpGBlM5erLa3uxm+cJPneD9A== 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 4PVWMl0Sxdzv0w; Mon, 6 Mar 2023 08:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326857RZ086950; Mon, 6 Mar 2023 08:05:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326857CS086949; Mon, 6 Mar 2023 08:05:07 GMT (envelope-from git) Date: Mon, 6 Mar 2023 08:05:07 GMT Message-Id: <202303060805.326857CS086949@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: bf6280a74400 - stable/13 - uuidgen(1): fix another typo List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bf6280a744005f4da2ba3061b8c51bcc505abf3f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=bf6280a744005f4da2ba3061b8c51bcc505abf3f commit bf6280a744005f4da2ba3061b8c51bcc505abf3f Author: Baptiste Daroussin AuthorDate: 2023-03-06 08:03:32 +0000 Commit: Baptiste Daroussin CommitDate: 2023-03-06 08:04:54 +0000 uuidgen(1): fix another typo (cherry picked from commit 4cd30c640db978355cf2da666e2749189babda5e) --- bin/uuidgen/uuidgen.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/uuidgen/uuidgen.1 b/bin/uuidgen/uuidgen.1 index da174f24a3ba..6d373cf3de41 100644 --- a/bin/uuidgen/uuidgen.1 +++ b/bin/uuidgen/uuidgen.1 @@ -55,7 +55,7 @@ to not generate them in batch, but one at a time. .It Fl r This option controls creation of random UUID (version 4). .It Fl c -This options controls creation of compact UUID (without hyphen). +This option controls creation of compact UUID (without hyphen). .It Fl n This option controls the number of identifiers generated. By default, multiple identifiers are generated in batch. From nobody Mon Mar 6 13:03:26 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVdzy6884z3wt9f; Mon, 6 Mar 2023 13:03:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVdzy5J5Nz3G7X; Mon, 6 Mar 2023 13:03:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678107806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NzFs4HHn/PxiYGSYCV2DWkZ9splRLmYy+pWE4nKPhmQ=; b=Zze8S32Osf/EbOhZcGw9DFqTqjOiw9BHcDLvzwjq0RlNgYrvYspNqSQGLm9KqEs9wHsRxv ALKJWDtP0fvxAi7bDMPI+EmOtcrnVSdSUyVPn7X0dy3edlSbJ6gDgNR5Dru2quW59Yzep6 4zonOFlF/w0A86lvRQp654xbPElgNbensDJz1NMWxOP03id9pjvXC7z3fWScgXAsokw3Vh 9rqa2ovOIXj/U8Uvbu2kN1wRZHDD0ZtghHGN6ED2VZwQ+gX7kzhMVvQWAtstiPRn1xTApP h0qho+2JyxIqIY1vlQhDVE7kMT4dKxYEWcARXNbL5LChKMsCnigdT4SkUDBJog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678107806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NzFs4HHn/PxiYGSYCV2DWkZ9splRLmYy+pWE4nKPhmQ=; b=UsWkdb2pmhnKl5HEhwGOg4bSmDIMopQ40oX/3fmIr20C8P2KeF51jaHtIU/XC8LGqK41QE /H6e599woSm3CgciEyBRFCMeEIbid6RJxsiyidBAo+CrxvO5jPO4knmhl9pwBFB/SlwUh1 N6dpGHW0Qd5dshSdKP/f7IwGKAyi78hskUGuXEXZxBJaks4p/tEmGBxIPfs7E/omp40AAC DWWv+FO6eQsozgs2FR949ngoKTAB4HB9clAdzJEPLqSzy6uaTLoRBVH2433CXXcEaZaYuT GUNT8HYjB6JtFJUd1clvb3R3i2T9BtKMjMYtv36Jq5k1HZpCL+Qgw/Y2/Bi3SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678107806; a=rsa-sha256; cv=none; b=MJS7jPCtiaLB2ZMZdILDX8VPZYvTijaIblhuiTneQ6nFX8tM2ax6tOMXUWw82fpiVeiViR oBuNqs5Fseo74TI1TQHDU/Z3GBWoyr0XXx45jMhCfgCLCD6vLtp6hg4zuVcUVtdfjbT1LI Y5ND45oAMUN4cYHAYEhzUpJeZJ1i/Zq/gwNJDv7QQQQNaS195wFgvCdWymnqCALaNkpg3a e5w7HxY/Dwz4Dusp5Cjkf6OYB85prfJ7wx/IPvDWjjFThiyb0zbA29PgKR5Y0OIwaO6Pa0 yWLgWFUwRAzyV+vT+IqCGnO39pKMsEwofJlpnVbtQ1vScbj7TU26rx5n1x41nQ== 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 4PVdzy4MFMz13Cx; Mon, 6 Mar 2023 13:03:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326D3Qk8078864; Mon, 6 Mar 2023 13:03:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326D3QRZ078863; Mon, 6 Mar 2023 13:03:26 GMT (envelope-from git) Date: Mon, 6 Mar 2023 13:03:26 GMT Message-Id: <202303061303.326D3QRZ078863@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 5fa16e3c50c5 - releng/13.2 - mergemaster: add deprecation notice to man page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 5fa16e3c50c5083acd52a61a76f726c759c82ffd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5fa16e3c50c5083acd52a61a76f726c759c82ffd commit 5fa16e3c50c5083acd52a61a76f726c759c82ffd Author: Ed Maste AuthorDate: 2020-01-22 21:04:03 +0000 Commit: Ed Maste CommitDate: 2023-03-06 13:02:01 +0000 mergemaster: add deprecation notice to man page PR: 252417 Reviewed by: bapt, gjb, kevans (all earlier) Approved by: re (cperciva) Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D23327 (cherry picked from commit 398b12691b4f1e7a73afca4c051c182bfcaf9671) (cherry picked from commit ab53efd14237b71c3c0e4e212ada6526ef14402c) --- usr.sbin/mergemaster/mergemaster.8 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index b76799e39cd5..60c4b9e8ac63 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 27, 2018 +.Dd March 2, 2023 .Dt MERGEMASTER 8 .Os .Sh NAME @@ -43,6 +43,17 @@ .Op Fl A Ar Target architecture .Op Fl D Ar /destdir/path .Sh DESCRIPTION +.Bf -symbolic +The +.Nm +utility is deprecated and may not be available in +.Fx 14.0 +or later. +Users are advised to use +.Xr etcupdate 8 +instead. +.Ef +.Pp The .Nm utility is a Bourne shell script which is designed to aid you From nobody Mon Mar 6 13:03:27 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVdzz6tB1z3wstF; Mon, 6 Mar 2023 13:03:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVdzz6GSPz3GDf; Mon, 6 Mar 2023 13:03:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678107807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=voQm4OLTFAOaCnsq/xR3Y0D9+4bHN3w0Mo5cvvuKZ+0=; b=fg9uWekRwhWsQpxSqpWbkOGteGBJbjf+PLLPh8wiQGi/bdwyrSfraH4ZTWNzCS9addKl/F kXTxQOP5ZY5yITGJwRsXWHAibPNxYwvtkTxhIfAwsRYzh8qr2w+4ArWAR+UrTOygiIqDMN n5U9WOCZyOiTgreKgXb/D+n1bHywNb49cz5HDTfO2MHN4bdS+fonzAi8vIntcRzeyFIZqb xBX6LA3qGK3amJfzaPGvOdHR342W6PjfrHqxDCspuMOOeS0Qjvf3s6lSzgFLvCA3LRNu+1 rU2ZViAFThWJUgQ5q1r7OGq0wgjvt2D6M4ptTE2Zp4tpE0PMO1dPXS1Lqhvw+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678107807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=voQm4OLTFAOaCnsq/xR3Y0D9+4bHN3w0Mo5cvvuKZ+0=; b=U+K5snqgG6oSrzvpXv0q8xzdTke2ByGhbDm3rFxb8PssfuNl7gbovK/dlLGgk9KN3rQ9NG WG0jfxrpgE7BKSRE/Zy4BJSD8vJyFZ713GHcXmQuo6cSry5j20U6G9i3cx3Ai9v2pMqfIH epNviHXG7rnHp3prtgbWYb084lCsm/zmevxSXFmkDOM+QTRp3z/1g17cs767Rr+LhXypMK Tz9QMIl/5e4ELtGMcCYagWCYXW+mNh3+EEKD89nIwPiiu/S0IxfFC/FwdT3LpWFukeiSEO 5XtFSHMxnGvVr0bHM+JAdYa7za7XhJLSo1UgLQ0xWU3MMEDsFXoh2kYr0Irs5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678107807; a=rsa-sha256; cv=none; b=OyuooYLtSmOm8ZLkeNl3Vn41V6rULaSArFf1hEgh5GrGZi/3EYx6UMCe4bp6uj46pg1Wyd 9ZXFFTerCTuKxOrlHSZdh0OH0+Rl1Mll/rF9pPlKx5el0ejw0XXw63JnqoanSdecnQcP+8 0PBRzepweYTKVPwAZfqg3BHx89++QD4vW5cbtDS6ahRg8octnH1JdAgTpdif3JVRN8esmO QtqdrncuD5mrj1euRCX08wVkrphGRc0DyWFSqFN2hHUJ+/AUCQ3yexBSp42bP9S5jPYc7y opyBAcQuEacxkFwYNVQ/L0R0bl7H+bH+Jrhf1Ngl1C0v1C3D1aCD/dzCQrwWjg== 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 4PVdzz55PGz134s; Mon, 6 Mar 2023 13:03:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326D3RNS078884; Mon, 6 Mar 2023 13:03:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326D3RrP078883; Mon, 6 Mar 2023 13:03:27 GMT (envelope-from git) Date: Mon, 6 Mar 2023 13:03:27 GMT Message-Id: <202303061303.326D3RrP078883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 46a79e80414c - releng/13.2 - freebsd-update: use grep -E instead of egrep List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 46a79e80414cdf9830c3afc402f3e4a6c24df6e9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=46a79e80414cdf9830c3afc402f3e4a6c24df6e9 commit 46a79e80414cdf9830c3afc402f3e4a6c24df6e9 Author: Ed Maste AuthorDate: 2023-03-02 23:54:52 +0000 Commit: Ed Maste CommitDate: 2023-03-06 13:02:51 +0000 freebsd-update: use grep -E instead of egrep GNU egrep emits a warning that it is obsolescent and suggests grep -E instead. Switch to grep -E in case we end up invoking GNU (e)grep (and for consistency with other invocations in this file). Reported by: Steffen Nurpmeso Approved by: re (cperciva) Sponsored by: The FreeBSD Foundation (cherry picked from commit e27ded83c76a609687a3d9e82b80fe7e1b782bf6) (cherry picked from commit b562307b70346030f59fe6a05d125814c74da47b) --- usr.sbin/freebsd-update/freebsd-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 225d1e31e3ec..4ef44d1ad000 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2547,7 +2547,7 @@ manually... read dummy >>>>>>)([[:space:]].*)?$' $(pwd)/merge/new/${F} ; then + if ! grep -qE '^(<<<<<<<|=======|>>>>>>>)([[:space:]].*)?$' $(pwd)/merge/new/${F} ; then break fi cat <<-EOF From nobody Mon Mar 6 13:50:57 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVg2n3mxXz3wwHd; Mon, 6 Mar 2023 13:50:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVg2n32pnz3NfC; Mon, 6 Mar 2023 13:50:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678110657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X8nD/G5O9qldDkIUQ7/Dcebx3R4exxcIWt2aeMsBYGw=; b=bpWTnUbfEXWo8nZLB7KDftE62zXWza2wmfKnA5T/wQ2OCSlFfBAduRt+MRIEwn2BYEi8rf yNGG5ST0ePPCMqn7C8VxQ8oR4B9j3Z/c7o8M4lr3UfJ05CZRu7oLMwAVeWFSw0F4d1fidh 6sIzaxaeyun9ynOUc9fOZXiBU1QKV9HB3hyA6MlfaRweF8i1gDxZ/mPmOmpUIQ7FPDzo1b XLVg1oouMALkVoYqXP96pdCPY4gFLI7FlzqQbfZZ4olh7U/1CzHBLhnf+f9n3LmH2tjCrr tae1E9VKjmVeEiQ0C+lrkDpD2BQRQIMvBaGZKQQbAi3YsLETbdVl/QO8Yac7IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678110657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X8nD/G5O9qldDkIUQ7/Dcebx3R4exxcIWt2aeMsBYGw=; b=EMXAv+VQykYGfNwpCn9f95wnxmZDBQ5jmjH7jbgAgRji/9ZELOP7sayB1MJae9/0kRp2Mt ua/hDGeRvBjL5sKYdCjfdTjmOnzJhKVsktZ8yGTMzU1mwWXaoYs4E7OQ5WMwAO/6yipAcL Z9Ur4uqQqNa6pGjz9zLjb6INV80WK6YUHW4iWhHaYataQx3iiI6VAHLRPOZuhRLwMN+xVb 4oa/qj7tD1V8YXmpRF4PM8WcRYoYw6jL7k3g0zR6C3eMp/AJ0vcgGJ/PvKem2PH+9fhOqJ wwraw6+SP//jIW2TN0yJSul2JIK8ezm3nFaLJdzmZlMLin69R58hzxH/kJrWHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678110657; a=rsa-sha256; cv=none; b=wII4dJa4JHauRUfigUZiTF0Olkk5xgiUKp3lTXNGgrwvv4e5dQM8daGnYlwq5dnH6CpbkL Zuo5Y/bdVqwV/ZTTmvRZarunpvjd/MqmgAufMBmKSFjDF2AdLytyPPjQHbte3Mkd64Lunh 6fegSb23UeL+gr7ZbYycTDMbcCrx5SQBK/vMD5eovcVAw1KRHb9R1PDly8hgF33bltEP2V eR4GNuJDT3OElXeQXD8xSyclwZNS6sOb8GHA3hrSHzV1LotsKXRPOf90xj9NOnfY0FPFY2 17GbyT1vhTeBMKT4qDyqlDEH+kPKE1QIdpdVl8Y5umH9U0j+y/ID/Sc3+RpETA== 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 4PVg2n1nqgz13YK; Mon, 6 Mar 2023 13:50:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326Dovp8055589; Mon, 6 Mar 2023 13:50:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326DovvN055575; Mon, 6 Mar 2023 13:50:57 GMT (envelope-from git) Date: Mon, 6 Mar 2023 13:50:57 GMT Message-Id: <202303061350.326DovvN055575@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 44454bad8cab - stable/13 - bsnmp: Remove "All Rights Reserved" from FreeBSD Foundation copyrights List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 44454bad8cab8208785b2d5aa8acc3df31e13b7a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=44454bad8cab8208785b2d5aa8acc3df31e13b7a commit 44454bad8cab8208785b2d5aa8acc3df31e13b7a Author: Ed Maste AuthorDate: 2023-03-03 13:10:44 +0000 Commit: Ed Maste CommitDate: 2023-03-06 13:50:33 +0000 bsnmp: Remove "All Rights Reserved" from FreeBSD Foundation copyrights (cherry picked from commit 4530e0c3e78d0616367d37273d6c1f47f627839b) --- contrib/bsnmp/lib/snmpcrypto.c | 1 - contrib/bsnmp/lib/tc.def | 1 - contrib/bsnmp/snmp_target/snmp_target.3 | 1 - contrib/bsnmp/snmp_target/target_snmp.c | 1 - contrib/bsnmp/snmp_target/target_tree.def | 1 - contrib/bsnmp/snmp_usm/snmp_usm.3 | 1 - contrib/bsnmp/snmp_usm/usm_snmp.c | 1 - contrib/bsnmp/snmp_usm/usm_tree.def | 1 - contrib/bsnmp/snmp_vacm/snmp_vacm.3 | 1 - contrib/bsnmp/snmp_vacm/vacm_snmp.c | 1 - contrib/bsnmp/snmp_vacm/vacm_tree.def | 1 - 11 files changed, 11 deletions(-) diff --git a/contrib/bsnmp/lib/snmpcrypto.c b/contrib/bsnmp/lib/snmpcrypto.c index 92c7ede7b97f..f29fa89bf603 100644 --- a/contrib/bsnmp/lib/snmpcrypto.c +++ b/contrib/bsnmp/lib/snmpcrypto.c @@ -1,6 +1,5 @@ /*- * Copyright (c) 2010 The FreeBSD Foundation - * All rights reserved. * * This software was developed by Shteryana Sotirova Shopova under * sponsorship from the FreeBSD Foundation. diff --git a/contrib/bsnmp/lib/tc.def b/contrib/bsnmp/lib/tc.def index 1c408b844122..b43d467eba48 100644 --- a/contrib/bsnmp/lib/tc.def +++ b/contrib/bsnmp/lib/tc.def @@ -1,6 +1,5 @@ #- # Copyright (C) 2010 The FreeBSD Foundation -# All rights reserved. # # This software was developed by Shteryana Sotirova Shopova under # sponsorship from the FreeBSD Foundation. diff --git a/contrib/bsnmp/snmp_target/snmp_target.3 b/contrib/bsnmp/snmp_target/snmp_target.3 index c9e01a39bc51..262023c185a6 100644 --- a/contrib/bsnmp/snmp_target/snmp_target.3 +++ b/contrib/bsnmp/snmp_target/snmp_target.3 @@ -1,6 +1,5 @@ .\"- .\" Copyright (C) 2010 The FreeBSD Foundation -.\" All rights reserved. .\" .\" This documentation was written by Shteryana Sotirova Shopova under .\" sponsorship from the FreeBSD Foundation. diff --git a/contrib/bsnmp/snmp_target/target_snmp.c b/contrib/bsnmp/snmp_target/target_snmp.c index 7ea47db0491a..8d733d4b733e 100644 --- a/contrib/bsnmp/snmp_target/target_snmp.c +++ b/contrib/bsnmp/snmp_target/target_snmp.c @@ -1,6 +1,5 @@ /*- * Copyright (c) 2010,2018 The FreeBSD Foundation - * All rights reserved. * * This software was developed by Shteryana Sotirova Shopova under * sponsorship from the FreeBSD Foundation. diff --git a/contrib/bsnmp/snmp_target/target_tree.def b/contrib/bsnmp/snmp_target/target_tree.def index 14424b00bdc6..d7baedd189b2 100644 --- a/contrib/bsnmp/snmp_target/target_tree.def +++ b/contrib/bsnmp/snmp_target/target_tree.def @@ -1,6 +1,5 @@ #- # Copyright (C) 2010 The FreeBSD Foundation -# All rights reserved. # # This software was developed by Shteryana Sotirova Shopova under # sponsorship from the FreeBSD Foundation. diff --git a/contrib/bsnmp/snmp_usm/snmp_usm.3 b/contrib/bsnmp/snmp_usm/snmp_usm.3 index 03959ede0cd2..4dd88b68e8ea 100644 --- a/contrib/bsnmp/snmp_usm/snmp_usm.3 +++ b/contrib/bsnmp/snmp_usm/snmp_usm.3 @@ -1,6 +1,5 @@ .\"- .\" Copyright (C) 2010 The FreeBSD Foundation -.\" All rights reserved. .\" .\" This documentation was written by Shteryana Sotirova Shopova under .\" sponsorship from the FreeBSD Foundation. diff --git a/contrib/bsnmp/snmp_usm/usm_snmp.c b/contrib/bsnmp/snmp_usm/usm_snmp.c index 67a971644e7d..6304af021375 100644 --- a/contrib/bsnmp/snmp_usm/usm_snmp.c +++ b/contrib/bsnmp/snmp_usm/usm_snmp.c @@ -1,6 +1,5 @@ /*- * Copyright (c) 2010,2018 The FreeBSD Foundation - * All rights reserved. * * This software was developed by Shteryana Sotirova Shopova under * sponsorship from the FreeBSD Foundation. diff --git a/contrib/bsnmp/snmp_usm/usm_tree.def b/contrib/bsnmp/snmp_usm/usm_tree.def index 84b52956e167..2d6929f63c1a 100644 --- a/contrib/bsnmp/snmp_usm/usm_tree.def +++ b/contrib/bsnmp/snmp_usm/usm_tree.def @@ -1,6 +1,5 @@ #- # Copyright (C) 2010 The FreeBSD Foundation -# All rights reserved. # # This software was developed by Shteryana Sotirova Shopova under # sponsorship from the FreeBSD Foundation. diff --git a/contrib/bsnmp/snmp_vacm/snmp_vacm.3 b/contrib/bsnmp/snmp_vacm/snmp_vacm.3 index e1213d90097d..b184e30d808e 100644 --- a/contrib/bsnmp/snmp_vacm/snmp_vacm.3 +++ b/contrib/bsnmp/snmp_vacm/snmp_vacm.3 @@ -1,6 +1,5 @@ .\"- .\" Copyright (C) 2010 The FreeBSD Foundation -.\" All rights reserved. .\" .\" This documentation was written by Shteryana Sotirova Shopova under .\" sponsorship from the FreeBSD Foundation. diff --git a/contrib/bsnmp/snmp_vacm/vacm_snmp.c b/contrib/bsnmp/snmp_vacm/vacm_snmp.c index 192de2d63722..39371176e493 100644 --- a/contrib/bsnmp/snmp_vacm/vacm_snmp.c +++ b/contrib/bsnmp/snmp_vacm/vacm_snmp.c @@ -1,6 +1,5 @@ /*- * Copyright (c) 2010,2018 The FreeBSD Foundation - * All rights reserved. * * This software was developed by Shteryana Sotirova Shopova under * sponsorship from the FreeBSD Foundation. diff --git a/contrib/bsnmp/snmp_vacm/vacm_tree.def b/contrib/bsnmp/snmp_vacm/vacm_tree.def index 5418a5a6cac1..a68cc8eed103 100644 --- a/contrib/bsnmp/snmp_vacm/vacm_tree.def +++ b/contrib/bsnmp/snmp_vacm/vacm_tree.def @@ -1,6 +1,5 @@ #- # Copyright (C) 2010 The FreeBSD Foundation -# All rights reserved. # # This software was developed by Shteryana Sotirova Shopova under # sponsorship from the FreeBSD Foundation. From nobody Mon Mar 6 13:50:58 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVg2p4VSJz3ww4D; Mon, 6 Mar 2023 13:50:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVg2p3bhfz3NZP; Mon, 6 Mar 2023 13:50:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678110658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ACfH6bx3me7GfAJDxDa7ZSYBQzvxFxVaXL2v3d8+sTA=; b=NFPz9oBlQ+AlwO/R2PhO4bMfSp9N7KnjrTmNkhgDD8yY+wy6jpNpWXjusD35vFjhPnCCek P9ZS9Vk2AqXbSFJcWgHLEyT4Em1vdIuoSj0TYAzEdLq9PzwvceLGvLVXDFhvlbmS0L02qM yN5WMgrwx3Lake0CRuJd69AL8gzSBvbyBHfeIiEzxre4QA8zj9U/iXp3YtUfNw3BAnTfs9 4tScOGRQjLe8i8AQvhKeIhIIfxcu0aA2GyD536FB27mTJgaJytGgnDO81iEjj0nYWHfwuW gUmkX7Aq/Q08EpJHAkqLGMSfGE73WP4G4x/Euv49EkBe5ENEonnotExawVKEtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678110658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ACfH6bx3me7GfAJDxDa7ZSYBQzvxFxVaXL2v3d8+sTA=; b=P/vUsQoGtB4u7sC+bOSdwNpwWW4nWN4eFmbG54koGewwNLn/bIGnt9qOg9U2TwTs+eSOHE hsLoACQcohV9aSCUIwEzxQw5fv8sdk03fn24gyBocPTUWvz/+LQlEQkUnA4/XCJZ4DR/db PP6xx9QfvZzQoRpDHQ8TcKBMa3d68ocWFEU1xoGDhDPrgffNHmyMUJQTY8FfCyC+RObSiv iMwAYUtytXtUf3m9MUn/OwsWy8w+gQgO5AsK+AgG5as0ViPwv1gKuykZNJKnwaxl2P6dBn TXLJajQwWJ55q7W7/I+BgOdyxJ1PFOheGCJ9gKNpjGKV5pa2Jerw4wGFcNCXPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678110658; a=rsa-sha256; cv=none; b=Bo22vM/AhxYIElBN1/Zwjzd4lsc0montZ8E0pNFgrw8PUfr4sjxEm1FkPRbckeCi4GEqMp gHgRL/KGiS22VlGCAFmiyH7RjSEZz/KxSwTP0IZK01GExvLQD2pIaLFZ88fuXosREw9iAi Z/W+SwSpem1lO3AVCuUtsgJEac9BeW6YqV18i+IYW6hftpHyR/cVF0zw02H4oIiAfL20C2 VQU8D9Irve0xBjqS40b4hqeK3JAdg8WMnkjML5g0TNl2ZUe0VVC7RAb/1peHoqRvcEztj+ o2geiLrRMTFOX3ZJs0stCEakD27wNjBees4t8rF4qfVPutsH031RRCKDSYN+jA== 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 4PVg2p2hdBz14TK; Mon, 6 Mar 2023 13:50:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326DowfO056214; Mon, 6 Mar 2023 13:50:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326Dowh2056213; Mon, 6 Mar 2023 13:50:58 GMT (envelope-from git) Date: Mon, 6 Mar 2023 13:50:58 GMT Message-Id: <202303061350.326Dowh2056213@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 1ee4ec78c22d - stable/13 - g_part_ebr: always create "compat" aliases List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1ee4ec78c22d8f50583a0e17cace9ddcb1d99fc0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1ee4ec78c22d8f50583a0e17cace9ddcb1d99fc0 commit 1ee4ec78c22d8f50583a0e17cace9ddcb1d99fc0 Author: Ed Maste AuthorDate: 2023-02-27 19:13:09 +0000 Commit: Ed Maste CommitDate: 2023-03-06 13:50:33 +0000 g_part_ebr: always create "compat" aliases The "canonical" EBR partition names like `ada0s4+00002081` are not particularly meaningful. The "compat" aliases share the same namespace as the parent MBR, resulting in user-friendly names like `ada0s6`. These names are consistent with the way Linux names EBR partitions. We previously provided a sysctl kern.features.geom_part_ebr_compat (enabled by default) to control the "compat" names. Remove the sysctl and always create the aliases. Relnotes: yes Reviewed by: cem, imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38812 (cherry picked from commit 6c7bc93da699054bb8ead58fdc226e084d929515) --- sys/geom/part/g_part_ebr.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/sys/geom/part/g_part_ebr.c b/sys/geom/part/g_part_ebr.c index f7aaf1c45cb6..1eb8e30d8adf 100644 --- a/sys/geom/part/g_part_ebr.c +++ b/sys/geom/part/g_part_ebr.c @@ -59,11 +59,6 @@ SYSCTL_DECL(_kern_geom_part); static SYSCTL_NODE(_kern_geom_part, OID_AUTO, ebr, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "GEOM_PART_EBR Extended Boot Record"); -static bool compat_aliases = true; -SYSCTL_BOOL(_kern_geom_part_ebr, OID_AUTO, compat_aliases, - CTLFLAG_RDTUN, &compat_aliases, 0, - "Set non-zero to enable EBR compatibility alias names (e.g., ada0p5)"); - #define EBRNAMFMT "+%08u" #define EBRSIZE 512 @@ -284,12 +279,10 @@ g_part_ebr_add(struct g_part_table *basetable, struct g_part_entry *baseentry, ebr_set_chs(basetable, baseentry->gpe_end, &entry->ent.dp_ecyl, &entry->ent.dp_ehd, &entry->ent.dp_esect); - if (compat_aliases) { - idx = 5; - LIST_FOREACH(iter, &basetable->gpt_entry, gpe_entry) - idx++; - entry->ebr_compat_idx = idx; - } + idx = 5; + LIST_FOREACH(iter, &basetable->gpt_entry, gpe_entry) + idx++; + entry->ebr_compat_idx = idx; return (ebr_parse_type(gpp->gpp_type, &entry->ent.dp_typ)); } @@ -301,11 +294,9 @@ g_part_ebr_add_alias(struct g_part_table *table, struct g_provider *pp, g_provider_add_alias(pp, "%s%s" EBRNAMFMT, pfx, g_part_separator, baseentry->gpe_index); - if (compat_aliases) { - entry = (struct g_part_ebr_entry *)baseentry; - g_provider_add_alias(pp, "%.*s%u", (int)strlen(pfx) - 1, pfx, - entry->ebr_compat_idx); - } + entry = (struct g_part_ebr_entry *)baseentry; + g_provider_add_alias(pp, "%.*s%u", (int)strlen(pfx) - 1, pfx, + entry->ebr_compat_idx); } static struct g_provider * @@ -317,11 +308,9 @@ g_part_ebr_new_provider(struct g_part_table *table, struct g_geom *gp, pp = g_new_providerf(gp, "%s%s" EBRNAMFMT, pfx, g_part_separator, baseentry->gpe_index); - if (compat_aliases) { - entry = (struct g_part_ebr_entry *)baseentry; - g_provider_add_alias(pp, "%.*s%u", (int)strlen(pfx) - 1, pfx, - entry->ebr_compat_idx); - } + entry = (struct g_part_ebr_entry *)baseentry; + g_provider_add_alias(pp, "%.*s%u", (int)strlen(pfx) - 1, pfx, + entry->ebr_compat_idx); return (pp); } @@ -573,8 +562,7 @@ g_part_ebr_read(struct g_part_table *basetable, struct g_consumer *cp) entry = (struct g_part_ebr_entry *)baseentry; entry->ent = ent[0]; memcpy(entry->ebr, buf, sizeof(entry->ebr)); - if (compat_aliases) - entry->ebr_compat_idx = idx++; + entry->ebr_compat_idx = idx++; g_free(buf); if (ent[1].dp_typ == 0) From nobody Mon Mar 6 13:50:59 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVg2q53p3z3wwC6; Mon, 6 Mar 2023 13:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVg2q4dP2z3NcV; Mon, 6 Mar 2023 13:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678110659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UQaDeC6adreercYMAOV/efoJ+p66X1erDdip+C92qrk=; b=SAwoxDNYkpRWe5ZzjMzg3aMur78tj+Wiy7vDA6HzR1eXEGKURzhtcnZlL5iuHdOneK+7Vm ryDj5yJ/duoXxCpb/L2yZ8nHmEk0WKTRQ1ftq2T/BP+Rlz8zdCc/aOfCCo0VRdCyZGNOi6 rB771dhhpjBYXFPOM4U6g0L1YrR7PwiqbS+si7z0bbv1ZhCXQ3iotJXI+0OrJ8HWmb7LUB jRU/FYTbWGj5AbQFh0Ek5avL20nZNR6nlgQq92EaXx/6FxV1yVehp86uk4kHuJ38Avtkx2 9SXYdWyjBRxL/XGciOvuGojKJKl/loH1HCINFq40Xl0Kq4gAAV8yQzOr3IAq1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678110659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UQaDeC6adreercYMAOV/efoJ+p66X1erDdip+C92qrk=; b=LAwCgL7VaofaYrK7hUz6Uml3tebMdHjWVBDDihwADR+3svAWjDv+jAIjr3BiwoF/xps9Nu TxjwJwNM8In5KKiNUjR8hsz8g2NMNrDvjb/ceqSyGQJ/aylVS3YFyr7Fh6T75+LSwNjcNG uCbbIVZPbGCNfAcN3/86m4OPAkGN5FCqvbcMiUq22Od0XI9IraQlO9n9MfDD7FHrPKwP/e njArpq3WcsX3HkRPRsAA+O7QuZM0/MsN2AzMNxSHM19lbzWitu300vUwJmH2/8BhYczyRW ozaw3y+stgFqjfSCGKdWIYIaptdrdsZW6E40hXMxJlzA7pYtyGxMd240U6zeGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678110659; a=rsa-sha256; cv=none; b=gR6TCmqqB9kam298o/vXYRvsjyZvh5yagfPcjt0wMb5USbSp8iLRPi4To1Z1lvzzqoEnev xa+kwkat7tQZ0f8/EPeOoWK8b2E0aQBXt+spAE1Jk6CrTIr7hshQG/buH94MH1zeDQgasg T7wQaEuQO5xvdKjZL1KsbQyvCoW/dApMnaWaMLrcMDN45HVUj0UNNN4Qp2Qts6zyMNGQ54 rqWrj/4fCCJS20bATKDiXhuJniBxbZatkYabU6T/Wq73v+75G26v5Mfw1zn7gqaGAOewO5 3wHkfeY7R7Xi2NoBpPchXp/p3VYYWNqsewzt6J8y8aPe29XkojPRwsdh7yhoJQ== 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 4PVg2q3d1jz14TL; Mon, 6 Mar 2023 13:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326Dox4M056234; Mon, 6 Mar 2023 13:50:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326DoxL8056232; Mon, 6 Mar 2023 13:50:59 GMT (envelope-from git) Date: Mon, 6 Mar 2023 13:50:59 GMT Message-Id: <202303061350.326DoxL8056232@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 2d415b019617 - stable/13 - tools/build: Hide spurious errors if sys/stat.h does not exist List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2d415b01961711e7e2c6a1bfc997cef12f2c135c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2d415b01961711e7e2c6a1bfc997cef12f2c135c commit 2d415b01961711e7e2c6a1bfc997cef12f2c135c Author: Ed Maste AuthorDate: 2023-02-24 14:43:57 +0000 Commit: Ed Maste CommitDate: 2023-03-06 13:50:33 +0000 tools/build: Hide spurious errors if sys/stat.h does not exist Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38757 (cherry picked from commit c5e54e56e68aa50beb7d2a7b8ae6611490a7ba9e) --- tools/build/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/build/Makefile b/tools/build/Makefile index 746f294aafba..1a74bcc7d9b4 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -68,7 +68,11 @@ INCS+= stdlib.h SRCS+= reallocarray.c .endif +.if exists(${HOST_INCLUDE_ROOT}/sys/stat.h) _WITH_UTIMENS!= grep -c utimensat ${HOST_INCLUDE_ROOT}/sys/stat.h || true +.else +_WITH_UTIMENS= 0 +.endif .if ${_WITH_UTIMENS} == 0 SYSINCS+= stat.h SRCS+= futimens.c utimensat.c From nobody Mon Mar 6 13:51:00 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVg2r6DDGz3wwGH; Mon, 6 Mar 2023 13:51:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVg2r5QYQz3NdC; Mon, 6 Mar 2023 13:51:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678110660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P/LC2TCAkgKkFLPiCrFr+jQl/tODLdreFL6TDvOCg4I=; b=fIUcwJjjt09H9UzS2dfxFU7QCCu1X0byFcySgYs2/sbGucefOdLCCj2gWTx7pVljHPqM+b pec+Lok0unciDfkgTfHbPNaO3QsSNDmO1qoHcBDUzhTiO3wYGWpv5/iX3PBYV+C5PBoatt bXCFEipSbTx0M6kfhIPEZmYbTaYED2Zp98B0FY9pSvFw/4yIC6AH6kPuqgAhquZlyUSvaW iVHvKHEOuxpniT8rKnH9mBH7LufN1zafHjmRvAygSXNg70S4QFbI11BvIy2ChZLqFPvS/x Dt71vjmRRggeL+/H5IpFkJJb77PCzvLRvIWvBBKZqBmlpPJQqM9kuqM7x6E2iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678110660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P/LC2TCAkgKkFLPiCrFr+jQl/tODLdreFL6TDvOCg4I=; b=ZHfQHUfWG0JSJp4fIqDy3xlnNR6Ht20heEPffMz0+ThFfSgPolR/m/0y6RgMWMmCbbwKIe yW+cr8Apy4eHmTEM2JBLvpJ59yLphHPXXKTL7Ag0AXPWuOPLyKkgsfsifFuN0pXkuUKD5t VWh7qkrR+8pUQVs9fYUtQk2cEwWpjC1RGdXOaQzTVQLkxFUNp4Ii3NXlnKqkCtzp47PsDA vAmZxRfESw7nTiOEDsQa2vxYczV7C/dz8DQ4KSveUR2DlBMORKy6KZRdGOVEn/Fptwbp2X 7NP2WL3++hPDaPxahcAbdmtJSYndbE73WGV3yoWuz/RNrEE+fQXL7KcYG5/zpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678110660; a=rsa-sha256; cv=none; b=Y24vfguYTUdJhkoRA70agL9QekXIkGXG/u00FThUjBfrOnV4X8+TKIUQoQNJVtCGwSrkn7 keFlxzEvpt+U4JHPM7+xveG9D8V9ibvGMyFn7w13E+4ro0HUEdUzz5lKglMqrXbrZDCa+c ew9HuaXGDlFlWNjOrMeeYdu7Hl8DvVgSD+8XVuc0+hhU82EnvXohYa9bs4q0VgM+2HDNYR Kq7kyszawc8fhHfzawVCDlJkK9hRe300QP2k+mnwgjHeTo5k2uhXCVIVqEcpiu9rO0+XMs N7HJ5Lds1vra54C9Z89TXZR43ki141/XArKtuzka3ZqE0UAGgaEcGJ+tTqtr8g== 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 4PVg2r4Wjsz14V5; Mon, 6 Mar 2023 13:51:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326Dp0s2056260; Mon, 6 Mar 2023 13:51:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326Dp0Vh056259; Mon, 6 Mar 2023 13:51:00 GMT (envelope-from git) Date: Mon, 6 Mar 2023 13:51:00 GMT Message-Id: <202303061351.326Dp0Vh056259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d8644a5d2458 - stable/13 - Enable kernel reproducible builds on stable branch List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d8644a5d2458588dd7d8e44bd23c6cacaead19b7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d8644a5d2458588dd7d8e44bd23c6cacaead19b7 commit d8644a5d2458588dd7d8e44bd23c6cacaead19b7 Author: Ed Maste AuthorDate: 2023-03-06 13:38:17 +0000 Commit: Ed Maste CommitDate: 2023-03-06 13:50:33 +0000 Enable kernel reproducible builds on stable branch When the stable/13 branch was created the userland knob (in share/mk/src.opts.mk) was changed to default to yes, but the kernel default was not changed. These two should always have the same default. Regenerate src.conf.5, as the differing defaults previously confused `makeman`. Fixes: bfd15705156b ("Create the stable/13 branch") Sponsored by: The FreeBSD Foundation --- share/man/man5/src.conf.5 | 10 +++++----- sys/conf/kern.opts.mk | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 62439ee77a41..b7ea2be546ab 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd March 2, 2023 +.Dd March 6, 2023 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1437,10 +1437,10 @@ Do not apply the Relocation Read-Only (RELRO) vulnerability mitigation. See also the .Va BIND_NOW option. -.It Va WITH_REPRODUCIBLE_BUILD -Exclude build metadata (such as the build time, user, or host) -from the kernel, boot loaders, and uname output, so that builds produce -bit-for-bit identical output. +.It Va WITHOUT_REPRODUCIBLE_BUILD +Include build metadata (such as the build time, user, and host) +in the kernel, boot loaders, and uname output. +Successive builds will not be bit-for-bit identical. .It Va WITHOUT_RESCUE Do not build .Xr rescue 8 . diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index a6e0a48d3272..2f452b432f42 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -43,6 +43,7 @@ __DEFAULT_YES_OPTIONS = \ NETGRAPH \ OFED \ PF \ + REPRODUCIBLE_BUILD \ SCTP_SUPPORT \ SOURCELESS_HOST \ SOURCELESS_UCODE \ @@ -57,8 +58,7 @@ __DEFAULT_NO_OPTIONS = \ INIT_ALL_PATTERN \ INIT_ALL_ZERO \ KERNEL_RETPOLINE \ - RATELIMIT \ - REPRODUCIBLE_BUILD + RATELIMIT # Some options are totally broken on some architectures. We disable # them. If you need to enable them on an experimental basis, you From nobody Mon Mar 6 18:12:05 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVmr609kKz3wCZ7; Mon, 6 Mar 2023 18:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVmr56rpNz4C94; Mon, 6 Mar 2023 18:12:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678126326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KLFB8uwjmN7jnEirk98vPjCx9yaZ70QDJa6ZjpIgH1o=; b=vjNXPo/yq4m/9U1yYMEES3nEBAmsDMdqOiy/9QoLFQ/4bXX0tcVPHFdKV1m7nt3GYzd8jL DnyjL/Hg3LF3YPNTm+DV2tgPl7qQykthjI08LANFVJV469ylsDpMOWfSfI6vpNtNS8BRqk GzLCSxe1dtM4WcOHrKoeFvzPeV2AseZWtwfO149sF1iXNcf/SYtedvReoSJHnWIWZFK4ih d0OFVirJRY/7DtV5HOWvvUwdMQaFhRqaB2ugy6iZXK/E29BqxDeZTrLP0NcuExQ5ipJ1E6 X9h+Oje48/74ADpZgah83BNM7+gEwOckYnq49nCGm2Z4o9+q2rSW4S2cP1wjUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678126326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KLFB8uwjmN7jnEirk98vPjCx9yaZ70QDJa6ZjpIgH1o=; b=X8XrGlqiNnFZTpioNYthf/VqH+p2X77ycE/H6KR4xGOd7kzLt+r1a023PmaeJ2lzobXikH +LyLMpCG81SJ5P0uAhUl5dMW8M60MTZObm0yK22Zwl7hW8c3/HKnGPTGOK5M4PmW1RejOU Mj8zr0irE967Qrmd/ofonJ/UVFVkMpZvcALcbfqGhwX2zBONFr2s1oIJ0976Oqb3QcaRhr GpIAA4ZTmky01Bq9K+c8BsgVtDVUJb8puxlfV651dfEs0DDbnWHPZAxwCQXcmFlaVHlgFC M/9AgD3jJwqh+9N1vYNf4btsZysGNAEu0/WMJtLPOBK2k4nxnxAEwbf54qneTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678126326; a=rsa-sha256; cv=none; b=tZIghUGMBAXi+QpWCABKe7sD9FsW3jqp8qoVhi40rDtSbUlSm9WEV56B+WQZO89+cUtmML htsrYtH5fD+axThCI+3KLx29umK/U8Gi3BZC9r51qCX6bAsDEZngpafAib2oJfDWNvBOCj VqEq9wxqLMoZ6ot1MyiOCjrSBwisYQGl8NcwHpQNWH/bYCSTWOODkMb6SLVy7wgiXJqI3G buk9Lhh8xB4AsGE3nqzKT5ydA8HNad8hoTP4lzAKrGP701TwNbs7K7ux4v90UmR9jMqsco PBOesvGtVSkzuWNGh115g4FYNoc13Z/FDkBgAiKjrsDNQhx517od4FOU2dc55Q== 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 4PVmr55vpNz19v4; Mon, 6 Mar 2023 18:12:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326IC50H087721; Mon, 6 Mar 2023 18:12:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326IC5ga087720; Mon, 6 Mar 2023 18:12:05 GMT (envelope-from git) Date: Mon, 6 Mar 2023 18:12:05 GMT Message-Id: <202303061812.326IC5ga087720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 305aaa93e0c8 - stable/13 - netlink: do not memcpy 0 bytes from a NULL pointer List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 305aaa93e0c805294c8bcbb5fe8b9f7caa28b349 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=305aaa93e0c805294c8bcbb5fe8b9f7caa28b349 commit 305aaa93e0c805294c8bcbb5fe8b9f7caa28b349 Author: Ed Maste AuthorDate: 2023-03-06 16:30:26 +0000 Commit: Ed Maste CommitDate: 2023-03-06 18:10:29 +0000 netlink: do not memcpy 0 bytes from a NULL pointer Although it works in practice it is UB, and might break after a future compiler update. This was rewritten in main and the memcpy call no longer exists, so this is a direct commit to stable/13 before 055776c84a41 is MFC'd. Discussed with: melifaro Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38927 --- sys/netlink/route/iface.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index 96f21a79a369..3ddef06bed7e 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -458,8 +458,11 @@ rtnl_handle_getlink(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate *n error = ENOMEM; break; } - memcpy(new_array, match_array, offset * sizeof(void *)); - free(match_array, M_TEMP); + if (match_array != NULL) { + memcpy(new_array, match_array, + offset * sizeof(void *)); + free(match_array, M_TEMP); + } match_array = new_array; } From nobody Mon Mar 6 18:27:57 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVnBQ030Xz3wCtd; Mon, 6 Mar 2023 18:27:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVnBP6dcPz4F28; Mon, 6 Mar 2023 18:27:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678127277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zMXvvukbm4ap0AA2NwScCDesSmgpyg+XRozviEs2qQQ=; b=Xr1I71jXGFUlm3bNDYF+NIjPpwhetsAqcbRxb0aF7Adlzn8EMCHiIavPOlc0vDiwLPgJu8 mJXRfhL8NpXjpvrGOA7vz0AqJ53+6eP45/13nNJf3Snbdjd4So4eq1y5ab5YQIMI0uXBCs MWBhsZhBbEa8rJsDa0F06XFelH73RZlxDukdQAdnpokSrzhwdjI3JJJbwWrZuMK/6HjH3x JpANp6T2kL6WAZv155v2pAQyrpZmFvxEEM2PvnqdCqa0W5dNDB03OFCK43G0N0EPaVtORb r8EBae6uv8Kw5Rk2JrSmUxxwj+f83Jiv9USE7KkcnukaL+ks4dldp2zvcIJdRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678127277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zMXvvukbm4ap0AA2NwScCDesSmgpyg+XRozviEs2qQQ=; b=voj+8sdQc02kbV19pJKGsOimsEnjvbLcIb0bvvvCrdcJMMG5jndFPp5XqP2G+UuHN2uV+c onaSCjDmtvhljAuyvIUEalbayi+eFxsqvQgsTG4W/0QyxHk6KigOGsUEnjjZgTcXzj5YcQ SzYZyt+w6RnuLO4aT+Cj80aFQnwR3m9szduYWrK7yN8LlqsEHHyNByCHqIpw/N/p4YejDZ w38lP19TZYqjkZ/G9WWqReTWFBM5sfEz9krg7MBVC7Tx51Quu8DPbvZKfJNZif/NCIwqzR Uw5TSiPX9ejrQTPIdUE14tMwDXqLTT2PtKmorK3itLU194sPz9M8vmAnlVWwhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678127277; a=rsa-sha256; cv=none; b=ukcE/gzrR2RDgIloeiiHp4/helKgnUqMUXaRk2W7BYYlp8d2L3ty+VO6nYtAqaeGT58+6r 9Nnm4WwzebIapyxeadBSCkw1W6bd5AklHl2+4HbHWuDWoyLu6BdY7x9r18MuKOxoiKDxtf rJmZMhmmC0efDOMnr1CKrjGStFFMmF5Zujbn2sBLpfeaXRYyDe2T/NSMKGacd4OPp2T89s dURJ8cl5+e91N2UqmccY2qDFPOP56ckcUEmv8JvDL+ijYCdEpKuEYKcWz5lnnhbtiRkYYt BKouAXZ0IhIRXvUshOxruWVDMFRABVaP5WK31yl++D5QgTGAIw8Y8pLsKwJZyA== 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 4PVnBP5gZyz1CBR; Mon, 6 Mar 2023 18:27:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326IRvsG004648; Mon, 6 Mar 2023 18:27:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326IRvS4004647; Mon, 6 Mar 2023 18:27:57 GMT (envelope-from git) Date: Mon, 6 Mar 2023 18:27:57 GMT Message-Id: <202303061827.326IRvS4004647@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: f260cddb30d9 - stable/13 - netgraph.4: remove obsolete ng_atm.4 reference List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f260cddb30d9da5f27a7fb3b7479f0db03dd2c3d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=f260cddb30d9da5f27a7fb3b7479f0db03dd2c3d commit f260cddb30d9da5f27a7fb3b7479f0db03dd2c3d Author: Brooks Davis AuthorDate: 2023-03-02 23:37:18 +0000 Commit: Brooks Davis CommitDate: 2023-03-06 18:20:45 +0000 netgraph.4: remove obsolete ng_atm.4 reference Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38876 (cherry picked from commit 3518a5bbd9bb0c03b38dea62e577042b779c3aed) --- share/man/man4/netgraph.4 | 1 - 1 file changed, 1 deletion(-) diff --git a/share/man/man4/netgraph.4 b/share/man/man4/netgraph.4 index 6b850e27762a..9352893fba5d 100644 --- a/share/man/man4/netgraph.4 +++ b/share/man/man4/netgraph.4 @@ -1417,7 +1417,6 @@ common networking problems, solved using .Xr socket 2 , .Xr netgraph 3 , .Xr ng_async 4 , -.Xr ng_atm 4 , .Xr ng_atmllc 4 , .Xr ng_bluetooth 4 , .Xr ng_bpf 4 , From nobody Mon Mar 6 18:27:58 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVnBR0zG0z3wCxT; Mon, 6 Mar 2023 18:27:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVnBR0L41z4F98; Mon, 6 Mar 2023 18:27:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678127279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EQQMZDrYA3Bu8olXnizqMdjub4p4opiRWCLRpvT0sPw=; b=jbfsOWJbWJORW+HxmtK1a0YQ0MLAPl5CxPiW6i6hoYH8I2Z4RnDuJ5yh9L/humlIYuOnFP OgJWUZLa27+pJhQcQPORVX9dqUVRSTAZ+VgJL1DCCsjZXSHFLq6tpCoxqdpTio4jjJQefD M1SLsfR0apLeAorKLyf7t6BI2uGjESe26Y3IG2JMURG+wstE13zKnTOsTkD3RSFnx1f4D8 pcEqsSZTn/FZ29jgRJicRhVEdZQGEsldFVTJV8UNN8fZjcIqBoJz5AFeQL4zCkw+qjvtno dc1YLxxyT9IR9AD6z/FU+6bjL0x9BqrP0uRm3TCIoYdZe9dyJadXXIRw2fjyEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678127279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EQQMZDrYA3Bu8olXnizqMdjub4p4opiRWCLRpvT0sPw=; b=ReH2y3N/bq5bEldMbOoL511L3kRL/uqueQb3N8bwTs1nB4XLtGh+HTTTnLiYE2qxyE4Suj ulyTJsLx0D38S2/BM0KOqoAahVLwFF311DLN7E/Y5XlaziX92majoaVhhTn1KrHEUFwIKf sx5ldrWXeqkkuc+LbVuPMszMsxLUWpst6y5qr9GoOrM+hsjIleFvzWycOSNyKfcdPoMUJU raJqH+DPyXvC7ycg1uNF870jZSECiUfX9LMZfN4XOOuW6/AoKJ7O0pcB3dk1//ON5Gpqpb 2jSOelooq6vJnbCMJFGMF/RDBLdU9M8wqjOvLx6+EMbaccrvlDbYZtJo3qP7HQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678127279; a=rsa-sha256; cv=none; b=aD2dfPisNxzPePb6Alp3VIT8nHe4A/ePQG/08pBRhOv1zXFWdocbUpc7tMNFyQ5CK7GSi+ /OS8nZttzfiov1PNgx8jVG77bkTzBVw1LEFBEW0x9AdqPcmQ7sNG8zW+InnkAfFj/yW1iV j/j7ICa9ZJBsJgx0GOYnX5dTZ7lzmoYD7E9k+l6h7SYCaPz34StP4wxQlF2x5c355miWV0 t2lNSZtbisERCrOaT/KB7hGISAaDAQq26ZL3XhTvuEO9ejUfdZxLPu9EOio1z5adx2ji5A 5loP+px2jircNdRlsCnCgKk7xYz8olzapY3Ha93BYpQnqIXNfAaj8VNmSfC9jw== 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 4PVnBQ6XyRz1C7c; Mon, 6 Mar 2023 18:27:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326IRw7w004667; Mon, 6 Mar 2023 18:27:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326IRw1X004666; Mon, 6 Mar 2023 18:27:58 GMT (envelope-from git) Date: Mon, 6 Mar 2023 18:27:58 GMT Message-Id: <202303061827.326IRw1X004666@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: d2c764f98150 - stable/13 - NATM: Remove useless NETGRAPH_ATM_ATMPIF option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d2c764f9815006b435bf651a916cc5d51cf7e307 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=d2c764f9815006b435bf651a916cc5d51cf7e307 commit d2c764f9815006b435bf651a916cc5d51cf7e307 Author: Brooks Davis AuthorDate: 2023-03-02 23:36:55 +0000 Commit: Brooks Davis CommitDate: 2023-03-06 18:20:45 +0000 NATM: Remove useless NETGRAPH_ATM_ATMPIF option This code was removed as part of the NATM removal in 2017 and somehow this option was missed. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38874 (cherry picked from commit 3746e90118c941eb5c9123e22fe05026b78382ab) --- sys/conf/NOTES | 1 - sys/conf/options | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index a036d4fc6dd9..482565c0b1e1 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -771,7 +771,6 @@ options NETGRAPH_DEBUG # enable extra debugging, this # Node types options NETGRAPH_ASYNC options NETGRAPH_ATMLLC -options NETGRAPH_ATM_ATMPIF options NETGRAPH_BLUETOOTH # ng_bluetooth(4) options NETGRAPH_BLUETOOTH_HCI # ng_hci(4) options NETGRAPH_BLUETOOTH_L2CAP # ng_l2cap(4) diff --git a/sys/conf/options b/sys/conf/options index 4ed0707e5c58..886772866c31 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -503,7 +503,6 @@ NETGRAPH NETGRAPH_DEBUG opt_netgraph.h NETGRAPH_ASYNC opt_netgraph.h NETGRAPH_ATMLLC opt_netgraph.h -NETGRAPH_ATM_ATMPIF opt_netgraph.h NETGRAPH_BLUETOOTH opt_netgraph.h NETGRAPH_BLUETOOTH_BT3C opt_netgraph.h NETGRAPH_BLUETOOTH_H4 opt_netgraph.h From nobody Mon Mar 6 18:27:59 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVnBS1mybz3wCtm; Mon, 6 Mar 2023 18:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVnBS1FGXz4DvB; Mon, 6 Mar 2023 18:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678127280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C+hEtFjxqGpeMIO7+FIN9LFiLM8DovSEUxD+5SqDin8=; b=jW8KUBgmPvOPM5A9deuMxV0L6+K6VYbQtguUlG0pSrsiZPe9ZmIux1jw+bfCTHqaXMH3P+ 0c8brhn9KIAdZUNtpPXNZIorD/MZlnVL6/KyQ8NzzNzGxIJk3qxulpfm3NoiFE4YNxLW40 TYUhn+7PhdxCx9PYT9WoNtcMYhDT7moceNNlcVq7zVwEZIQuUQwQcN7sD/pXE/K3akYYoJ oZhCuB6BvefSfP1aivkhb+J9MfbO/Q6A0PTf8EUmJ1DLy91PHJ4qfkT0m39PyepWLY8uG1 HO3LPOVkViJ2xsCxJsX616q5vyziSzQamWbkyLys5OrBHxm4gJ0xi/4cYYYDRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678127280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C+hEtFjxqGpeMIO7+FIN9LFiLM8DovSEUxD+5SqDin8=; b=YxE783ikXXWeN8Y+gTStPIV7TAB96Wx+GxOrys0SgE17tMl17TeY128zjc6ogsB07qjYEo UiUNDHeRxgTFX23fEFvEky5FTsv0/rhTBKLN30P8Uz7VQkI+qg8HEPVZS5btaVcySZEHK+ Jn1+usXR7S0z4uXbhNz3cIG2hOilw7UaQaPG/9gX0TaGwIsvIhGkcH/K5ENgZrc9erAlR4 z+NuZjdoTiSWFLfa8A4ayygh/KUM1RoSXWNMAGj/q9+P4/X0RWRjTuFsrz7bGbVPuVmCtE nmqAe9fobC9ape72IPsk2NX7Yc+jU8LG0U1pUSwjzU+/8qSdIFUbl6BhGOuQRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678127280; a=rsa-sha256; cv=none; b=nVq+tFPjhQcyiQX4A8+IVUnrJnT3Ac3gcAhrFxBKCRpmO1z/Pxb1A9j3RVGayjifUqiNIN Kwpbbl8DiW4ugbxKWaSiOeO6ROnJsdtjkN7p3Ku3wwNPHf2Z19tbs9GbVaELV/PDh4xHt6 xE4asbIMo8umyFrWouPnJ27mAtYWQErI7+U14rf4toWbkEQyoqwo/WO2MEyTn0SE+wCreb qxbSdXq4seWJ4Z+wbtixvsnh2ca25QKvGtOWtrT8Jzj+66minvWlTg897Hz2JfGFo4MpUQ EOBVwq4Q9c0TLKHs3DtxecXzWLcTEUV7OmXjvGiK9jGbHQFnf4oYbw5PrIufsw== 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 4PVnBS0Lltz1C0t; Mon, 6 Mar 2023 18:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326IRxff004686; Mon, 6 Mar 2023 18:27:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326IRxFX004685; Mon, 6 Mar 2023 18:27:59 GMT (envelope-from git) Date: Mon, 6 Mar 2023 18:27:59 GMT Message-Id: <202303061827.326IRxFX004685@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 744fb5a23261 - stable/13 - NgATM: Remove useless NGATM_ATM option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 744fb5a2326156c60d727eca1779d2a746d3e3c7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=744fb5a2326156c60d727eca1779d2a746d3e3c7 commit 744fb5a2326156c60d727eca1779d2a746d3e3c7 Author: Brooks Davis AuthorDate: 2023-03-02 23:37:10 +0000 Commit: Brooks Davis CommitDate: 2023-03-06 18:20:45 +0000 NgATM: Remove useless NGATM_ATM option Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38875 (cherry picked from commit bd32aedeee1a2af8293bfb1a2c85432b7ed8f207) --- sys/conf/NOTES | 1 - sys/conf/options | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 482565c0b1e1..300e85c8cacd 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -820,7 +820,6 @@ options NETGRAPH_VJC options NETGRAPH_VLAN # NgATM - Netgraph ATM -options NGATM_ATM options NGATM_ATMBASE options NGATM_SSCOP options NGATM_SSCFU diff --git a/sys/conf/options b/sys/conf/options index 886772866c31..05ca15e5c651 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -557,7 +557,6 @@ NETGRAPH_VJC opt_netgraph.h NETGRAPH_VLAN opt_netgraph.h # NgATM options -NGATM_ATM opt_netgraph.h NGATM_ATMBASE opt_netgraph.h NGATM_SSCOP opt_netgraph.h NGATM_SSCFU opt_netgraph.h From nobody Mon Mar 6 18:28:01 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVnBT2fWMz3wDBL; Mon, 6 Mar 2023 18:28:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVnBT2FNWz4FBC; Mon, 6 Mar 2023 18:28:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678127281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZA4k/kFxVdb+6N5UQFFlHMpTQC3f4aHF5kjNQJfZZe4=; b=OBesaM6g/MVP+yCEtii+T45XdGJ4LFJnFktE/aDgf7DBLp1LobBQcyHmDZPaU4LBN4YcFc GnrrAtvr97UgVPDQoROvSu4gMOsqwBkol9Rdoo5Ss/u7n1vi8wZ9aPN095wZZRr60XkSpt 8h6vumAczUOAFMUzTwF8OAxK9uGTc3osomQM6YVsyekQUeDyfXS8W+L7Z+/mLvwRzGy7Kc PeShQeDvCXtHa/3V78YFAORcMmmoTgFLhXXViNQyp1dP2Tp1o0KSIZ3Q5PD4sIBPD9swem LA0o7BSc8w4Y0Fp41kOWmF4TtCMzjv2sh09PcFI/tZQ0kzaao3L8S1wgwVF9Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678127281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZA4k/kFxVdb+6N5UQFFlHMpTQC3f4aHF5kjNQJfZZe4=; b=Pt7YCnWxkssjFfcrJuQnUuMb4dRxJF5IJ6HuYFNPi2usyQGJ9qGrNRptqbLcH39QsvCmDT 44QDLPtzX91c0ccXiI1ynqpnAydWpyUkyjj/MMr1zvsTUXBLurq6JmtR2SzLpgBkvvUAFB rdAYFP2clgVMbdpBx2w2F8FQH5xi+H32Q5kXHC659vCJApusU/qfpEzTvvFohY2QI0NSze krGuHbRGKIxho0IgS/IzYoMJpM7R7u0hBa9bvI2xNO+icroDxS9AMLmJVNKzqLQ2uncFuZ F6mGHkTkKf6xy1iHzMIeTWcH9oV1FvW8b1JbNIhNnxVFNAiXYyk5ZzyO7gugWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678127281; a=rsa-sha256; cv=none; b=oIO2YI3ZxsT9i+MXXL4bH1TQHaZYjWujBKgMPrbN1bITaBQ8xGqSCUu01Kh0rHHdaLfv3U fKt1g+Td8EvwbdC/Lx0YscGEPU9wFK+IKLJbWY0Uox/X5TuASGoOyj0rbED2JXWD3fUHxD Tu4bSPLgax04UBkAbf9OWzqK+NEcLaQIgfefsEjYwF5BEphiUqv3lwp1WnFexDWsLaaGVH KIKrE1CbsGHPPaxHVZnozH3efzbjzBx+9KPuar+jCaFXeJ6CljD2bhy9SfKoR//GDo12HI WDiag/F0BVA3cn38k+DHBYBY4qxPxxKSBJ8/e06JvovmZXpK1kKKhxP7oQankA== 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 4PVnBT1J6Jz1Bg4; Mon, 6 Mar 2023 18:28:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326IS1vm004706; Mon, 6 Mar 2023 18:28:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326IS1Dw004705; Mon, 6 Mar 2023 18:28:01 GMT (envelope-from git) Date: Mon, 6 Mar 2023 18:28:01 GMT Message-Id: <202303061828.326IS1Dw004705@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 08a5f8c5cbc7 - stable/13 - NgATM: deprecate List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 08a5f8c5cbc7143601a34ac7e52831e996a9347e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=08a5f8c5cbc7143601a34ac7e52831e996a9347e commit 08a5f8c5cbc7143601a34ac7e52831e996a9347e Author: Brooks Davis AuthorDate: 2023-03-03 16:20:18 +0000 Commit: Brooks Davis CommitDate: 2023-03-06 18:20:46 +0000 NgATM: deprecate Support for ATM NICs was removed prior to FreeBSD 12. At the time it was unclear if this code was still useful without it. Now the time has come to finish removing support. Add DREPRECATION NOTICEs to the manpages and gone_in(14, ...) warnings in the constructors (or module init for ngatmbase). Reviewed by: manu, emaste Relnotes: yes Differential Revision: https://reviews.freebsd.org/D38877 (cherry picked from commit 211c302f10d76fc12e50c87039cfc06aa9e659c1) --- share/man/man4/ng_ccatm.4 | 7 ++++++- share/man/man4/ng_sscfu.4 | 7 ++++++- share/man/man4/ng_sscop.4 | 7 ++++++- share/man/man4/ng_uni.4 | 7 ++++++- share/man/man4/ngatmbase.4 | 7 ++++++- sys/netgraph/atm/ccatm/ng_ccatm.c | 2 ++ sys/netgraph/atm/ngatmbase.c | 2 ++ sys/netgraph/atm/sscfu/ng_sscfu.c | 2 ++ sys/netgraph/atm/sscop/ng_sscop.c | 2 ++ sys/netgraph/atm/uni/ng_uni.c | 2 ++ 10 files changed, 40 insertions(+), 5 deletions(-) diff --git a/share/man/man4/ng_ccatm.4 b/share/man/man4/ng_ccatm.4 index 3d6778fa25d5..02a5a5f011b5 100644 --- a/share/man/man4/ng_ccatm.4 +++ b/share/man/man4/ng_ccatm.4 @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 10, 2005 +.Dd March 3, 2023 .Dt NG_CCATM 4 .Os .Sh NAME @@ -47,6 +47,11 @@ .In netgraph.h .In netgraph/ng_uni.h .In netgraph/ng_ccatm.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm diff --git a/share/man/man4/ng_sscfu.4 b/share/man/man4/ng_sscfu.4 index 2c444dacd589..6011deaeb2b3 100644 --- a/share/man/man4/ng_sscfu.4 +++ b/share/man/man4/ng_sscfu.4 @@ -30,7 +30,7 @@ .\" .\" ng_sscfu(4) man page .\" -.Dd October 24, 2003 +.Dd March 3, 2023 .Dt NG_SSCFU 4 .Os .Sh NAME @@ -40,6 +40,11 @@ .In netnatm/saal/sscopdef.h .In netnatm/saal/sscfudef.h .In netgraph/atm/ng_sscfu.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm sscfu diff --git a/share/man/man4/ng_sscop.4 b/share/man/man4/ng_sscop.4 index c98a43462581..451edcc4aebf 100644 --- a/share/man/man4/ng_sscop.4 +++ b/share/man/man4/ng_sscop.4 @@ -30,7 +30,7 @@ .\" .\" ng_sscop(4) man page .\" -.Dd October 24, 2003 +.Dd March 3, 2023 .Dt NG_SSCOP 4 .Os .Sh NAME @@ -39,6 +39,11 @@ .Sh SYNOPSIS .In netnatm/saal/sscopdef.h .In netgraph/atm/ng_sscop.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm sscop diff --git a/share/man/man4/ng_uni.4 b/share/man/man4/ng_uni.4 index da7028b0e015..993119d23c70 100644 --- a/share/man/man4/ng_uni.4 +++ b/share/man/man4/ng_uni.4 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 6, 2003 +.Dd March 3, 2023 .Dt NG_UNI 4 .Os .Sh NAME @@ -38,6 +38,11 @@ .In netnatm/msg/unistruct.h .In netnatm/sig/unidef.h .In netgraph/atm/ng_uni.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm uni diff --git a/share/man/man4/ngatmbase.4 b/share/man/man4/ngatmbase.4 index 0227b44347bd..6cdc3eb532fc 100644 --- a/share/man/man4/ngatmbase.4 +++ b/share/man/man4/ngatmbase.4 @@ -30,9 +30,14 @@ .\" .\" ngatmbase(4) man page .\" -.Dd August 24, 2004 +.Dd March 3, 2023 .Dt NGATMBASE 4 .Os +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh NAME .Nm ngatmbase .Nd netgraph ATM utility module diff --git a/sys/netgraph/atm/ccatm/ng_ccatm.c b/sys/netgraph/atm/ccatm/ng_ccatm.c index 6c27b6aacc0f..4a7af2c4579b 100644 --- a/sys/netgraph/atm/ccatm/ng_ccatm.c +++ b/sys/netgraph/atm/ccatm/ng_ccatm.c @@ -348,6 +348,8 @@ ng_ccatm_constructor(node_p node) { struct ccnode *priv; + gone_in(14, "ng_ccatm: netgraph ATM modules"); + priv = malloc(sizeof(*priv), M_NG_CCATM, M_WAITOK | M_ZERO); priv->node = node; diff --git a/sys/netgraph/atm/ngatmbase.c b/sys/netgraph/atm/ngatmbase.c index 785bbef26580..0e2d1597d696 100644 --- a/sys/netgraph/atm/ngatmbase.c +++ b/sys/netgraph/atm/ngatmbase.c @@ -77,6 +77,8 @@ static struct mtx ngatm_unilist_mtx; static void uni_msg_init(void) { + gone_in(14, "ngatmbase: netgraph ATM modules"); + mtx_init(&ngatm_unilist_mtx, "netgraph UNI msg header lists", NULL, MTX_DEF); } diff --git a/sys/netgraph/atm/sscfu/ng_sscfu.c b/sys/netgraph/atm/sscfu/ng_sscfu.c index 7fe3728b7eae..4811f576df0b 100644 --- a/sys/netgraph/atm/sscfu/ng_sscfu.c +++ b/sys/netgraph/atm/sscfu/ng_sscfu.c @@ -536,6 +536,8 @@ ng_sscfu_constructor(node_p node) { struct priv *priv; + gone_in(14, "ng_sscfu: netgraph ATM modules"); + priv = malloc(sizeof(*priv), M_NG_SSCFU, M_WAITOK | M_ZERO); if ((priv->sscf = sscfu_create(node, &sscfu_funcs)) == NULL) { diff --git a/sys/netgraph/atm/sscop/ng_sscop.c b/sys/netgraph/atm/sscop/ng_sscop.c index b15ef5e258a1..ae60e7557978 100644 --- a/sys/netgraph/atm/sscop/ng_sscop.c +++ b/sys/netgraph/atm/sscop/ng_sscop.c @@ -246,6 +246,8 @@ ng_sscop_constructor(node_p node) { struct priv *p; + gone_in(14, "ng_sscop: netgraph ATM modules"); + p = malloc(sizeof(*p), M_NG_SSCOP, M_WAITOK | M_ZERO); if ((p->sscop = sscop_create(node, &sscop_funcs)) == NULL) { diff --git a/sys/netgraph/atm/uni/ng_uni.c b/sys/netgraph/atm/uni/ng_uni.c index c4e1c2c523b5..1313bd062188 100644 --- a/sys/netgraph/atm/uni/ng_uni.c +++ b/sys/netgraph/atm/uni/ng_uni.c @@ -225,6 +225,8 @@ ng_uni_constructor(node_p node) { struct priv *priv; + gone_in(14, "ng_uni: netgraph ATM modules"); + priv = malloc(sizeof(*priv), M_NG_UNI, M_WAITOK | M_ZERO); if ((priv->uni = uni_create(node, &uni_funcs)) == NULL) { From nobody Mon Mar 6 18:28:02 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVnBV3fX8z3wCr5; Mon, 6 Mar 2023 18:28:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVnBV36Dfz4FVd; Mon, 6 Mar 2023 18:28:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678127282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5t2B1XkaCqEEmDNXiswCBEuCKXXC3GNicFZbIeVnrUA=; b=bXdEuUOl4G8pYYXtYCJ19ExZetPVVZwjMw5jQ2VWa3Aln9iHBe3ZRRyN3c7uv7uv1CnnCn edONS9AKxFxKdvtGSADNzQUQCAY6rPBr2jnL7f2WICWHUtym5v7cVQvKIGuoKf3RVaP+Sf mrMr4hpfzG9YJD2pgyMHvoMtN+nCj96kaTGFZAUfWidRAaVWTWiY75kEax159P7JvQ/Ypf NFbJmZMTO9SGD6BOlr5zsBpozFjAPyOIm9AFigfUv3h5Lz8I6bogRZ6e7U/AITEpTGMBln F+qZhFfCilJnZE08hPJnzSDFfgJHb24aF+yzBTtiKkd9QTA4vKkogEVhiJ3RGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678127282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5t2B1XkaCqEEmDNXiswCBEuCKXXC3GNicFZbIeVnrUA=; b=UJYxK30wbjN5WR/GbMJ4OMWaBt4aMubSl/zK1MTWTbL+cBPJzPVEex05t8lHOBur3kFrUY E30DRlsYR+Jb1tBMpZjS9Y9q/3lpy3n1cLTZRQavhbH0JBZgoKEUKbr3+QXDJE8MXIhvEZ 25x3SLzszIQCFjk/AAIci5rwdWU2DAchaIWXrql6UhhAywKlkv8h2twH1O4JVh+LKpKhxo YZVvnsp32ovQS3HI2RiAv3qQNtrlDm1NzeZpq3Go6IcGlNn+jtFP/NizBALrT9CSQpRNzo iRgxPLR0lFA5TWQfRVrl589E3re3LR3TcYydDC6P1+anH4niGUeO9nsbDTTcFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678127282; a=rsa-sha256; cv=none; b=d7HPqxvzm92Mj4gM2Znw/L0oiS3Y4qeX19OYTAOpKfzo9TKTwQgaxbEspQIMDxzcHPO27B 4hm+Jv7aYYneOuHyxTPyOlX/fZS392zY5QvDsLbu4ve8SVPuoQTijOT9FR8aHLtMesCDJz O6ZK9WDbVi3I0iK2qRouxUM35OGQ7ZSEvwq434DNt1E7M/C3OjuujIZ8e95EyMWRm0GBvh 5M9rCH5hCPmGWSmT5AJBiIIn/oMP5fE099lVn/ZJMJwi/YLySuMotkMeh+6d67qvBg2/iP +TK/QtsiPiEHNQzcec6OtYnh2JkLx/2lImCaPb8n7cEvLX9P4ylDGez157LZfg== 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 4PVnBV2D2Kz1C0v; Mon, 6 Mar 2023 18:28:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326IS2lM004735; Mon, 6 Mar 2023 18:28:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326IS2eO004734; Mon, 6 Mar 2023 18:28:02 GMT (envelope-from git) Date: Mon, 6 Mar 2023 18:28:02 GMT Message-Id: <202303061828.326IS2eO004734@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 85aac7cc92f5 - stable/13 - ng_atmllc: deprecate List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 85aac7cc92f59ad023d40c81826b5c4f829dba15 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=85aac7cc92f59ad023d40c81826b5c4f829dba15 commit 85aac7cc92f59ad023d40c81826b5c4f829dba15 Author: Brooks Davis AuthorDate: 2023-03-03 16:20:29 +0000 Commit: Brooks Davis CommitDate: 2023-03-06 18:20:46 +0000 ng_atmllc: deprecate With the deprecation of NgATM, ng_atmllc is the last vestage of ATM support so deprecate it too. Reviewed by: manu, emaste Relnotes: yes Differential Revision: https://reviews.freebsd.org/D38878 (cherry picked from commit c2285a7b092f524b5694e42bfb5fd24f71815771) --- share/man/man4/ng_atmllc.4 | 7 ++++++- sys/netgraph/ng_atmllc.c | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/share/man/man4/ng_atmllc.4 b/share/man/man4/ng_atmllc.4 index 3c7cfa947fc7..50987b5a5f6c 100644 --- a/share/man/man4/ng_atmllc.4 +++ b/share/man/man4/ng_atmllc.4 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 8, 2004 +.Dd March 3, 2023 .Dt NG_ATMLLC 4 .Os .Sh NAME @@ -32,6 +32,11 @@ .Nd ATM LLC netgraph node type .Sh SYNOPSIS .In netgraph/ng_atmllc.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm atmllc diff --git a/sys/netgraph/ng_atmllc.c b/sys/netgraph/ng_atmllc.c index 1e4475ae68e0..d4a13fb83128 100644 --- a/sys/netgraph/ng_atmllc.c +++ b/sys/netgraph/ng_atmllc.c @@ -93,6 +93,8 @@ ng_atmllc_constructor(node_p node) { struct ng_atmllc_priv *priv; + gone_in(14, "ng_atmllc"); + priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); NG_NODE_SET_PRIVATE(node, priv); From nobody Mon Mar 6 18:56:24 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVnqD6JLrz3wFwf; Mon, 6 Mar 2023 18:56:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVnqD5pcmz4Hss; Mon, 6 Mar 2023 18:56:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678128984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FXTcyUcdRHAfcq2Hj07ZJKOIePg9cfo1GAVadcJ/P2U=; b=lP0t88dfdJRZPrQO/iJuVqBoGFvU2ESKxZnmGsucp6gH4xsPBjzXa3OpUE5kwrDosYVp8/ HSPL47Gs8kaeSU4e0IsJNGn6SbfTlXALTnKyfGCk8Vusj1qZ7pe27EM8hP2a1+pB4a+g2D WfETMzxHRnnfk4CKxrPAKbNumUvEWtduGlgVMxu1oSXEJvXcy5LWliZ/BqiCrMr8DSV5EM pL3XDU89uhnrikkcNbR6Kp45lySRI1OGWNYcSDtUXiDhZWb4XGWWBMgzn/FZsJER2rBoJE 6vdSLZZpupLGySgk2iqFtLM2bQlIyRs+obftW0WqOIDrwrKUDxai2aQ9EHaVNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678128984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FXTcyUcdRHAfcq2Hj07ZJKOIePg9cfo1GAVadcJ/P2U=; b=o+9m7C0ps/a3SWpEdbKAQYqqtTgDFFAluMF7Tdb3UT7Am+Qfc4KjDBhywlSOEIRFRT4Cuu yPPjLZHDjF2OYawA69YloS+jHwsuHopdXrSauzd5G3Ua8b2p/rpjf5dcCi6bNq6gZcUN9A XMt3uDHyB9cnMw+DkWNuPJbAb3gMm60qyk8bTLIlFGXl5posqkoH6lWI5SMve1f8HZcdWd KZvqwWF7hYhdKZ0BZ3QQbJ/xQgu6GxG4/nlDfEXBXeCutYs73Uiapghi2amUzZ70R7rKQY ZOsGOY95g2YQkIxopoybdEg+1ix+JpaUPAsNCeaY0zzQwJTuQi1wB1/jxtnENQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678128984; a=rsa-sha256; cv=none; b=DEqYq4i7cc0TAjOwSI3y6Zmve+lDvEUQ2kXikj51a9cRdxnpFqQxruvysfrkk9e3u0J8Me jqFUhNpPbSyiJ1Ql/ce8moH16NCT4fSANptoL7O9FDASI2dNQ47Pjrb3b848z5B+7H3W+0 atPxDOToscYM+QR2hvh8VvlLMapFbI8MNJr4WDntTnP4+RfIFd53kV3fpVEtU2w+Ytnttw KLICGVVCOvX6JnF33XY3soRoZHpLRnzSBe/qtRw2nIr83RnmXBdXkBDHLULQN1RUwbvSbf sBk/mXsflB9UlNvGE1XSDJUljwevmiy+hcn4mD9gXge+Pt/mue2wycAcVmu1hw== 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 4PVnqD4t5tz1Csh; Mon, 6 Mar 2023 18:56:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326IuOk1053513; Mon, 6 Mar 2023 18:56:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326IuO5o053512; Mon, 6 Mar 2023 18:56:24 GMT (envelope-from git) Date: Mon, 6 Mar 2023 18:56:24 GMT Message-Id: <202303061856.326IuO5o053512@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 0ad9e0e8241f - releng/13.2 - NgATM: deprecate List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 0ad9e0e8241f3fa15ca0d16ee15f46243f7309ef Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=0ad9e0e8241f3fa15ca0d16ee15f46243f7309ef commit 0ad9e0e8241f3fa15ca0d16ee15f46243f7309ef Author: Brooks Davis AuthorDate: 2023-03-03 16:20:18 +0000 Commit: Brooks Davis CommitDate: 2023-03-06 18:55:22 +0000 NgATM: deprecate Support for ATM NICs was removed prior to FreeBSD 12. At the time it was unclear if this code was still useful without it. Now the time has come to finish removing support. Add DREPRECATION NOTICEs to the manpages and gone_in(14, ...) warnings in the constructors (or module init for ngatmbase). Reviewed by: manu, emaste Approved by: re (cperciva) Relnotes: yes Differential Revision: https://reviews.freebsd.org/D38877 (cherry picked from commit 211c302f10d76fc12e50c87039cfc06aa9e659c1) (cherry picked from commit 08a5f8c5cbc7143601a34ac7e52831e996a9347e) --- share/man/man4/ng_ccatm.4 | 7 ++++++- share/man/man4/ng_sscfu.4 | 7 ++++++- share/man/man4/ng_sscop.4 | 7 ++++++- share/man/man4/ng_uni.4 | 7 ++++++- share/man/man4/ngatmbase.4 | 7 ++++++- sys/netgraph/atm/ccatm/ng_ccatm.c | 2 ++ sys/netgraph/atm/ngatmbase.c | 2 ++ sys/netgraph/atm/sscfu/ng_sscfu.c | 2 ++ sys/netgraph/atm/sscop/ng_sscop.c | 2 ++ sys/netgraph/atm/uni/ng_uni.c | 2 ++ 10 files changed, 40 insertions(+), 5 deletions(-) diff --git a/share/man/man4/ng_ccatm.4 b/share/man/man4/ng_ccatm.4 index 3d6778fa25d5..02a5a5f011b5 100644 --- a/share/man/man4/ng_ccatm.4 +++ b/share/man/man4/ng_ccatm.4 @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 10, 2005 +.Dd March 3, 2023 .Dt NG_CCATM 4 .Os .Sh NAME @@ -47,6 +47,11 @@ .In netgraph.h .In netgraph/ng_uni.h .In netgraph/ng_ccatm.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm diff --git a/share/man/man4/ng_sscfu.4 b/share/man/man4/ng_sscfu.4 index 2c444dacd589..6011deaeb2b3 100644 --- a/share/man/man4/ng_sscfu.4 +++ b/share/man/man4/ng_sscfu.4 @@ -30,7 +30,7 @@ .\" .\" ng_sscfu(4) man page .\" -.Dd October 24, 2003 +.Dd March 3, 2023 .Dt NG_SSCFU 4 .Os .Sh NAME @@ -40,6 +40,11 @@ .In netnatm/saal/sscopdef.h .In netnatm/saal/sscfudef.h .In netgraph/atm/ng_sscfu.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm sscfu diff --git a/share/man/man4/ng_sscop.4 b/share/man/man4/ng_sscop.4 index c98a43462581..451edcc4aebf 100644 --- a/share/man/man4/ng_sscop.4 +++ b/share/man/man4/ng_sscop.4 @@ -30,7 +30,7 @@ .\" .\" ng_sscop(4) man page .\" -.Dd October 24, 2003 +.Dd March 3, 2023 .Dt NG_SSCOP 4 .Os .Sh NAME @@ -39,6 +39,11 @@ .Sh SYNOPSIS .In netnatm/saal/sscopdef.h .In netgraph/atm/ng_sscop.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm sscop diff --git a/share/man/man4/ng_uni.4 b/share/man/man4/ng_uni.4 index da7028b0e015..993119d23c70 100644 --- a/share/man/man4/ng_uni.4 +++ b/share/man/man4/ng_uni.4 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 6, 2003 +.Dd March 3, 2023 .Dt NG_UNI 4 .Os .Sh NAME @@ -38,6 +38,11 @@ .In netnatm/msg/unistruct.h .In netnatm/sig/unidef.h .In netgraph/atm/ng_uni.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm uni diff --git a/share/man/man4/ngatmbase.4 b/share/man/man4/ngatmbase.4 index 0227b44347bd..6cdc3eb532fc 100644 --- a/share/man/man4/ngatmbase.4 +++ b/share/man/man4/ngatmbase.4 @@ -30,9 +30,14 @@ .\" .\" ngatmbase(4) man page .\" -.Dd August 24, 2004 +.Dd March 3, 2023 .Dt NGATMBASE 4 .Os +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh NAME .Nm ngatmbase .Nd netgraph ATM utility module diff --git a/sys/netgraph/atm/ccatm/ng_ccatm.c b/sys/netgraph/atm/ccatm/ng_ccatm.c index 6c27b6aacc0f..4a7af2c4579b 100644 --- a/sys/netgraph/atm/ccatm/ng_ccatm.c +++ b/sys/netgraph/atm/ccatm/ng_ccatm.c @@ -348,6 +348,8 @@ ng_ccatm_constructor(node_p node) { struct ccnode *priv; + gone_in(14, "ng_ccatm: netgraph ATM modules"); + priv = malloc(sizeof(*priv), M_NG_CCATM, M_WAITOK | M_ZERO); priv->node = node; diff --git a/sys/netgraph/atm/ngatmbase.c b/sys/netgraph/atm/ngatmbase.c index 785bbef26580..0e2d1597d696 100644 --- a/sys/netgraph/atm/ngatmbase.c +++ b/sys/netgraph/atm/ngatmbase.c @@ -77,6 +77,8 @@ static struct mtx ngatm_unilist_mtx; static void uni_msg_init(void) { + gone_in(14, "ngatmbase: netgraph ATM modules"); + mtx_init(&ngatm_unilist_mtx, "netgraph UNI msg header lists", NULL, MTX_DEF); } diff --git a/sys/netgraph/atm/sscfu/ng_sscfu.c b/sys/netgraph/atm/sscfu/ng_sscfu.c index 7fe3728b7eae..4811f576df0b 100644 --- a/sys/netgraph/atm/sscfu/ng_sscfu.c +++ b/sys/netgraph/atm/sscfu/ng_sscfu.c @@ -536,6 +536,8 @@ ng_sscfu_constructor(node_p node) { struct priv *priv; + gone_in(14, "ng_sscfu: netgraph ATM modules"); + priv = malloc(sizeof(*priv), M_NG_SSCFU, M_WAITOK | M_ZERO); if ((priv->sscf = sscfu_create(node, &sscfu_funcs)) == NULL) { diff --git a/sys/netgraph/atm/sscop/ng_sscop.c b/sys/netgraph/atm/sscop/ng_sscop.c index b15ef5e258a1..ae60e7557978 100644 --- a/sys/netgraph/atm/sscop/ng_sscop.c +++ b/sys/netgraph/atm/sscop/ng_sscop.c @@ -246,6 +246,8 @@ ng_sscop_constructor(node_p node) { struct priv *p; + gone_in(14, "ng_sscop: netgraph ATM modules"); + p = malloc(sizeof(*p), M_NG_SSCOP, M_WAITOK | M_ZERO); if ((p->sscop = sscop_create(node, &sscop_funcs)) == NULL) { diff --git a/sys/netgraph/atm/uni/ng_uni.c b/sys/netgraph/atm/uni/ng_uni.c index c4e1c2c523b5..1313bd062188 100644 --- a/sys/netgraph/atm/uni/ng_uni.c +++ b/sys/netgraph/atm/uni/ng_uni.c @@ -225,6 +225,8 @@ ng_uni_constructor(node_p node) { struct priv *priv; + gone_in(14, "ng_uni: netgraph ATM modules"); + priv = malloc(sizeof(*priv), M_NG_UNI, M_WAITOK | M_ZERO); if ((priv->uni = uni_create(node, &uni_funcs)) == NULL) { From nobody Mon Mar 6 18:56:25 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVnqG0s7fz3wFcG; Mon, 6 Mar 2023 18:56:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVnqG07B7z4JGH; Mon, 6 Mar 2023 18:56:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678128986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n9XvwTB1yo8yAxAP2hd6HAb8dZ3mQG7f5nofwn2TpkM=; b=o1CKQQcu9JcAHIxFle1OCP/YUNx1UHyh3hlxJSJ5gpYcurN6Ov/5kgy3SubxC2qNCi2XPp 9c0lj4lz+080CX5Nzy7oYBBg5OhSoVDw1t7iUXoDb1S2IWt4v0+A3aTn9L87EF/7jLbfhS WuV5Kgc4Tho2D/TVk5be+bqfRnhMb3D+Os7RUJFsVVOD3rt6Oj5cF+7GQjG7oP2dboy3Qi G1jNX7WU5cYXhjr0hK1AltUCFqxZTTrGqDNbihrisxSMCjzDa9tMkIqmSdFFPQ28zNrMlv 4VwdIr/4yvr77dsjhL5cxgj/DGE4ADTpirPBUGaaoltmlWEWcpqVEBKf3ENDjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678128986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n9XvwTB1yo8yAxAP2hd6HAb8dZ3mQG7f5nofwn2TpkM=; b=F1GL+GaylKLzQA5og0frKzgc7pi1mjLqO8YSBWNQ1PKF1dWronEtXxTfRv+4pHnBvsaeju FWdW1pGz5bNPP/717/Q5qfgV4GX5gLMH1jkeVY0Em/Zp8uFXFidE0m2N6LsMUfU8NCS+Ig k+t5WqYCO0hPSb6WmFJ4PZyjgmGNXzADDAPGFJkVQiD3bQO3AEG4OX0HxBKhN+9C4tb6TG jbxGm+hywLAhtPW2+qQSjP1KkJSgn1OxM6swkFZWY7MuXYbPyJGjpxM7hFAlcGE1dJVNW4 YfTS72HpSjDTJ60/+rVN8boFUBweWkhL+0iNsVR1n4UJbzH/cwaiTD57uj0GFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678128986; a=rsa-sha256; cv=none; b=enpr4524yTXjcnAMkzfAAVD6HyNjDPBf88iN4A8xgPTmz6LPE1sn+24bscRzuuHsDQVbOj bffyUBGprHO78YrsQz2vYk4jVBL+CVWT2Ql+g6Hr6jmutfUsOn83d8GSwgz4et6blNiQr2 zX3id/7jFtpwRlTnkGbEVrqPLbP+em89Ab9JP8UWsCd7ivUW83WBCR0fy0ktTOC917c8a2 aALZMMQXXTYy+Dk9+qRHVf1k3YaVewLDWrZr2iy2TLkFQHdOIpOsNxMLhPsSDqndVP2Dz4 zkL0dBf9OAUi+zMh8HRtHHZpWoKqoAhj0aaIsHLehQZYkkPwxJkNFnXLR+F5sA== 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 4PVnqF5pcXz1CqF; Mon, 6 Mar 2023 18:56:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326IuP17053532; Mon, 6 Mar 2023 18:56:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326IuPVx053531; Mon, 6 Mar 2023 18:56:25 GMT (envelope-from git) Date: Mon, 6 Mar 2023 18:56:25 GMT Message-Id: <202303061856.326IuPVx053531@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: b2ca665cb4ba - releng/13.2 - ng_atmllc: deprecate List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: b2ca665cb4ba13062602580341cd9ecdee561951 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=b2ca665cb4ba13062602580341cd9ecdee561951 commit b2ca665cb4ba13062602580341cd9ecdee561951 Author: Brooks Davis AuthorDate: 2023-03-03 16:20:29 +0000 Commit: Brooks Davis CommitDate: 2023-03-06 18:55:45 +0000 ng_atmllc: deprecate With the deprecation of NgATM, ng_atmllc is the last vestage of ATM support so deprecate it too. Reviewed by: manu, emaste Approved by: re (cperciva) Relnotes: yes Differential Revision: https://reviews.freebsd.org/D38878 (cherry picked from commit c2285a7b092f524b5694e42bfb5fd24f71815771) (cherry picked from commit 85aac7cc92f59ad023d40c81826b5c4f829dba15) --- share/man/man4/ng_atmllc.4 | 7 ++++++- sys/netgraph/ng_atmllc.c | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/share/man/man4/ng_atmllc.4 b/share/man/man4/ng_atmllc.4 index 3c7cfa947fc7..50987b5a5f6c 100644 --- a/share/man/man4/ng_atmllc.4 +++ b/share/man/man4/ng_atmllc.4 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 8, 2004 +.Dd March 3, 2023 .Dt NG_ATMLLC 4 .Os .Sh NAME @@ -32,6 +32,11 @@ .Nd ATM LLC netgraph node type .Sh SYNOPSIS .In netgraph/ng_atmllc.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm atmllc diff --git a/sys/netgraph/ng_atmllc.c b/sys/netgraph/ng_atmllc.c index 1e4475ae68e0..d4a13fb83128 100644 --- a/sys/netgraph/ng_atmllc.c +++ b/sys/netgraph/ng_atmllc.c @@ -93,6 +93,8 @@ ng_atmllc_constructor(node_p node) { struct ng_atmllc_priv *priv; + gone_in(14, "ng_atmllc"); + priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); NG_NODE_SET_PRIVATE(node, priv); From nobody Mon Mar 6 19:38:19 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVplc2nFJz3wHm8; Mon, 6 Mar 2023 19:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVplc29DXz4MLr; Mon, 6 Mar 2023 19:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678131500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RHfpvpqL/rlWpw3dS5TC3ZRPew5ovjgyRB6AYbSzy/8=; b=lG/lhNp2qPuHe5Q1GsSIJ3tJJ3sLkrTTebvxdY8an3g4Gt4T6aXOQtbnx8QGYDdSjRTjtL I3jbwf49oFrbtB7IEVFJHDzmUh/aufm+nu6mAUenE6Kk37vTNXPqOkEFbeFboPpyc5zYy3 L0sLz1YgVPrz9o9jkrTx6B2PYdl1RWTw84W06O/Ozq5Q6Bm+eZdL+WuozEHpiD6EQs0C/d 9jlMI6AW2a9Q63oDE+EhIVNnI2ekrHCmtbYZMKdg1fhHYgRsT0ozbx2Bkpcyu83kRUkwlu dCqhR+nS+9GrULj8tkpyYzXAhvgMNcMSB0Cqs4wKyyRovGduEuVTLq7LWWuZ6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678131500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RHfpvpqL/rlWpw3dS5TC3ZRPew5ovjgyRB6AYbSzy/8=; b=cF/EcUYBfH5XnhjzOqr38ojsrnwip6YNloQGdiniv/BWCS2VF5bjblgTqda9W3t4T9hxfj apNU286FNQeT1ROmgzZsVp/jQISYZJuKjXG5UMwUIrtLM0A63DCY1chRhr5xr7vpOyFVOI g3eXhMiGGzByLVEq3Fgfeoxvp275VHzzgvDKkcbmd4+m686ytd278lLHByZA+G6zViI6h0 eoEpglldq4OkraETbnwiaAWU5vP8+EP1jhjOPVa5VdqyBJvpnKjo0h6Ca+LV8aafJhCDML Nv9sukjOsqtIEM4K5E4W5sAQ0OJP/FpI8CgMbJK6oED3rDsArzKZfUjaEuTc6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678131500; a=rsa-sha256; cv=none; b=XqTb7feuREKNVBvUdXFAZ4TIYtqMr1arrnvXw/gmlAO5tGqr6MHI8DQ8gjemCHIxkHCnv1 vjzxwRHgh3NgK6gGTzhv/GxLR9YUJAXZv3Box8+4bSTwZQWbnAlNKR7IAhLE+szSmZ1HlA IzOf67GbowBeVW54R/U+QAj0roWn6Or3jjxo45ADNNsSCQ4iKgMDEXt+C9jAT0Kad76XBs grNv+SfhPNAW4T/aNEyFzUvDrW9ewygGG5YmhVynSEl338jtSYZeWxeyKHtr9KyUmYAAz4 WFq4VP2dK56tVLYmEqW9Nh7mGOLAFDYxB0nJAQNwITWaATp5lWLGMCjcfrQD8w== 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 4PVplc168nzFNB; Mon, 6 Mar 2023 19:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326JcJ3I020304; Mon, 6 Mar 2023 19:38:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326JcJ8r020303; Mon, 6 Mar 2023 19:38:19 GMT (envelope-from git) Date: Mon, 6 Mar 2023 19:38:19 GMT Message-Id: <202303061938.326JcJ8r020303@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 4639f11c9fb7 - releng/13.2 - netlink: fix interface dump. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 4639f11c9fb74258d811b0c9aea4053ffc74f4c0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4639f11c9fb74258d811b0c9aea4053ffc74f4c0 commit 4639f11c9fb74258d811b0c9aea4053ffc74f4c0 Author: Alexander V. Chernikov AuthorDate: 2023-02-16 13:17:58 +0000 Commit: Ed Maste CommitDate: 2023-03-06 19:37:56 +0000 netlink: fix interface dump. The current code missed interface addition when reallocating temporary buffer. Tweak the code to perform the reallocation first and add interface afterwards unconditionally. Reported by: Marek Zarychta Approved by: re (cperciva) (cherry picked from commit 86fd0bdba540132ae298457e160b651f61d1db6b) (cherry picked from commit a800622765b1e7cab79fa857e9a671e6c0c1ccec) --- sys/netlink/route/iface.c | 33 ++++++++++--------- tests/sys/netlink/test_rtnl_iface.py | 61 ++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 17 deletions(-) diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index 9cd7e6e80f3c..0eafacff4775 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -449,24 +449,23 @@ rtnl_handle_getlink(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate *n CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) { wa.count++; if (match_iface(&attrs, ifp)) { - if (offset < base_count) { - if (!if_try_ref(ifp)) - continue; - match_array[offset++] = ifp; - continue; - } - /* Too many matches, need to reallocate */ - struct ifnet **new_array; - int sz = base_count * sizeof(void *); - base_count *= 2; - new_array = malloc(sz * 2, M_TEMP, M_NOWAIT); - if (new_array == NULL) { - error = ENOMEM; - break; + if (offset >= base_count) { + /* Too many matches, need to reallocate */ + struct ifnet **new_array; + int sz = base_count * sizeof(void *); + base_count *= 2; + new_array = malloc(sz * 2, M_TEMP, M_NOWAIT); + if (new_array == NULL) { + error = ENOMEM; + break; + } + memcpy(new_array, match_array, sz); + free(match_array, M_TEMP); + match_array = new_array; } - memcpy(new_array, match_array, sz); - free(match_array, M_TEMP); - match_array = new_array; + + if (if_try_ref(ifp)) + match_array[offset++] = ifp; } } NET_EPOCH_EXIT(et); diff --git a/tests/sys/netlink/test_rtnl_iface.py b/tests/sys/netlink/test_rtnl_iface.py index 7cff592b1676..33b22b5fe6c4 100644 --- a/tests/sys/netlink/test_rtnl_iface.py +++ b/tests/sys/netlink/test_rtnl_iface.py @@ -207,6 +207,67 @@ class TestRtNlIface(NetlinkTestTemplate, SingleVnetTestTemplate): assert rx_msg.is_type(NlMsgType.NLMSG_ERROR) assert rx_msg.error_code == errno.ENODEV + @pytest.mark.require_user("root") + def test_dump_ifaces_many(self): + """Tests if interface dummp is not missing interfaces""" + + ifmap = {} + for ifname in (self.vnet.iface_alias_map["if1"].name, "lo0"): + ifindex = socket.if_nametoindex(ifname) + ifmap[ifindex] = ifname + + for i in range(40): + ifname = "lo{}".format(i + 1) + flags = NlmNewFlags.NLM_F_EXCL.value | NlmNewFlags.NLM_F_CREATE.value + msg = NetlinkIflaMessage(self.helper, NlRtMsgType.RTM_NEWLINK.value) + msg.nl_hdr.nlmsg_flags = ( + flags | NlmBaseFlags.NLM_F_ACK.value | NlmBaseFlags.NLM_F_REQUEST.value + ) + msg.add_nla(NlAttrStr(IflattrType.IFLA_IFNAME, ifname)) + msg.add_nla( + NlAttrNested( + IflattrType.IFLA_LINKINFO, + [ + NlAttrStrn(IflinkInfo.IFLA_INFO_KIND, "lo"), + ], + ) + ) + + rx_msg = self.get_reply(msg) + assert rx_msg.is_type(NlMsgType.NLMSG_ERROR) + nla_list, _ = rx_msg.parse_attrs(bytes(rx_msg.cookie)[4:], rtnl_ifla_attrs) + nla_map = {n.nla_type: n for n in nla_list} + assert nla_map[IflattrType.IFLA_IFNAME.value].text == ifname + ifindex = nla_map[IflattrType.IFLA_NEW_IFINDEX.value].u32 + assert ifindex > 0 + assert ifindex not in ifmap + ifmap[ifindex] = ifname + + # Dump all interfaces and check if the output matches ifmap + kernel_ifmap = {} + msg = NetlinkIflaMessage(self.helper, NlRtMsgType.RTM_GETLINK.value) + msg.nl_hdr.nlmsg_flags = ( + NlmBaseFlags.NLM_F_ACK.value | NlmBaseFlags.NLM_F_REQUEST.value + ) + self.write_message(msg) + while True: + rx_msg = self.read_message() + if msg.nl_hdr.nlmsg_seq != rx_msg.nl_hdr.nlmsg_seq: + raise ValueError( + "unexpected seq {}".format(rx_msg.nl_hdr.nlmsg_seq) + ) + if rx_msg.is_type(NlMsgType.NLMSG_ERROR): + raise ValueError("unexpected message {}".format(rx_msg)) + if rx_msg.is_type(NlMsgType.NLMSG_DONE): + break + if not rx_msg.is_type(NlRtMsgType.RTM_NEWLINK): + raise ValueError("unexpected message {}".format(rx_msg)) + + ifindex = rx_msg.base_hdr.ifi_index + assert ifindex == rx_msg.base_hdr.ifi_index + kernel_ifmap[ifindex] = rx_msg.get_nla(IflattrType.IFLA_IFNAME).text + assert kernel_ifmap == ifmap + # # * # * {len=76, type=RTM_NEWLINK, flags=NLM_F_REQUEST|NLM_F_ACK|NLM_F_EXCL|NLM_F_CREATE, seq=1662892737, pid=0}, From nobody Mon Mar 6 19:38:21 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVpld3RsGz3wHmB; Mon, 6 Mar 2023 19:38:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVpld2fYbz4Mtv; Mon, 6 Mar 2023 19:38:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678131501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6F8dzPYmamA5oNOLyokaCYRntLF9Jh00aJNJnlyl6LA=; b=nAwkZlN/JS3b2lHO2dny4vs3mYpVzPKTiN/jwNtjf14vtocGTmrWe4kZPY5LSTthvNa96L ksLsexXKEteVsoShtWfLZ59ettDv3JrBgYJ7z3mzhfJ9Nuqn0imvKmtfvsyLF6i/uR76VB OFNITbDCwCv+p1gyciYkoQROjmWU4C88aiF4o8mAw+mSZov1mkfqKkx2+34zpvaIVgUk0h 24XEGTFCel5dSNlKNMGiSC8w9s7Sujy1NpYa9luJ7MiQfUiDsrBV0y9KhTkbUiBXGCi9Gc KC3FEuhh/vJ7lEY9VCKZta6yuwRSgZtijHDjuUiezcFuDCNrkppLkwpVZ6wmyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678131501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6F8dzPYmamA5oNOLyokaCYRntLF9Jh00aJNJnlyl6LA=; b=cEKeX1vLtgYE1RlcPg3yUkNOpWddZ9BYWGQLV7JcrHT3g/Q6NUrhOHCRxpFKTIx3TRJ00y E72WZLMJSzpsp5yENZvHUgTek5aPNiS8AXWzg1ymdgAYw7VhP1jC7w0JDQp0oJv9XWq3/I gSv1fcarsEp1vssCLyQb2fJ9TJ3d5uw3UDRKa5Q2ZAfuqyKDOztZzB41bjqsNHBC/dwFAc KtDRiZ45jMO/tAWRqExyGhytkZxihvBPffHIKHjvzFWVJOMG2rXOydXGMKMz2cp702dMYJ Onm4DKNxjck6RA6pxPfXvYxxYxagEoI+hVewqBM1T6O9beLsteEj8FKSUMm2Ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678131501; a=rsa-sha256; cv=none; b=KyrrYQeqbjwAU/K6gm7hnaJhlEDVFoTKkhbldfLn1Nhzs/HmsdBjEkhT1bi/dQZlaDMFMh AZ1zJAV2ks0y5vGi4Fw7SqUonhFKQQqdw8NuNPI4GvX70qhuutbmbUQzEYQ3JeAERAG7Y2 iWI1bGzs9c1FBbJFW0Train8eBVkx+SolU4PVckofu+yDQ3iUHLrD/+Pb4IJkKQvTUlf1Q lffSmWc5HeMSdatDHvnL751lcEhQGuv0/nQNH6CqRnWp/ziGlW6Cz+b9TtzIUggz8qO8qp FhZOpPo0R78og437Nedof5IcLtEIA4i/HtDBrAVfqRkMRAigGYwLTX+D86oYBg== 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 4PVpld1VL8zF19; Mon, 6 Mar 2023 19:38:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326JcLAM020323; Mon, 6 Mar 2023 19:38:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326JcLwV020322; Mon, 6 Mar 2023 19:38:21 GMT (envelope-from git) Date: Mon, 6 Mar 2023 19:38:21 GMT Message-Id: <202303061938.326JcLwV020322@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 6f68483d3f72 - releng/13.2 - netlink: simplify temporary address allocation in rtnl_handle_getlink(). List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 6f68483d3f725052dba22b7c6bdebb71b482760d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6f68483d3f725052dba22b7c6bdebb71b482760d commit 6f68483d3f725052dba22b7c6bdebb71b482760d Author: Alexander V. Chernikov AuthorDate: 2023-02-17 17:57:44 +0000 Commit: Ed Maste CommitDate: 2023-03-06 19:37:56 +0000 netlink: simplify temporary address allocation in rtnl_handle_getlink(). Approved by: re (cperciva) (cherry picked from commit 45356a1864c79680c6911b48a18b14a88a7d07fa) (cherry picked from commit 4c1ef49999c6687905664eecd73ea9473ffe5fda) --- sys/netlink/route/iface.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index 0eafacff4775..96f21a79a369 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -439,9 +439,8 @@ rtnl_handle_getlink(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate *n NL_LOG(LOG_DEBUG2, "Start dump"); - struct ifnet **match_array; - int offset = 0, base_count = 16; /* start with 128 bytes */ - match_array = malloc(base_count * sizeof(void *), M_TEMP, M_NOWAIT); + struct ifnet **match_array = NULL; + int offset = 0, base_count = 0; NLP_LOG(LOG_DEBUG3, nlp, "MATCHING: index=%u type=%d name=%s", attrs.ifi_index, attrs.ifi_type, attrs.ifla_ifname); @@ -452,14 +451,14 @@ rtnl_handle_getlink(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate *n if (offset >= base_count) { /* Too many matches, need to reallocate */ struct ifnet **new_array; - int sz = base_count * sizeof(void *); - base_count *= 2; - new_array = malloc(sz * 2, M_TEMP, M_NOWAIT); + /* Start with 128 bytes, do 2x increase on each realloc */ + base_count = (base_count != 0) ? base_count * 2 : 16; + new_array = malloc(base_count * sizeof(void *), M_TEMP, M_NOWAIT); if (new_array == NULL) { error = ENOMEM; break; } - memcpy(new_array, match_array, sz); + memcpy(new_array, match_array, offset * sizeof(void *)); free(match_array, M_TEMP); match_array = new_array; } From nobody Mon Mar 6 19:38:22 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVplf440Nz3wGxw; Mon, 6 Mar 2023 19:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVplf37Z0z4Mb9; Mon, 6 Mar 2023 19:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678131502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pDQIMIEqmOrm7Pfib5UgVfvjR7jBj3YBZmRuBlHpzVQ=; b=BFEebBzueouc1ANnAgtE4m+7MzhKWtDMZm/TUW9CF2tsH1U6V4p1qfl/1wPBYAHvcWecjn Kvwjjng6ZnlEUWsA9+6aiFKj1c7TD8k5G/I50NqRa4tpFFc9U0m/wbzE+vnZx4yF86H9Or 5PIHljvYl6FuWXKyhdSvQwfN5Oj48dTfWMdSJvHieTaxoPW2RPWMR1SLaLLsnc0fpgm6yu E/oCCd6koD9kECCsSzma4rOCE0Ya5IRS0M1A9sNETnJT1pGRf1qF5koEAWOwExmLsmzgBY V9L8G17E7LAJjjxLbNcBbHYznMCHI+OCY8IcwNi+pDsyp6VqgdQYlVbkDsdDqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678131502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pDQIMIEqmOrm7Pfib5UgVfvjR7jBj3YBZmRuBlHpzVQ=; b=Fn87ngAqsWS6zYnwsq0HrFK87O2p6MQNZrnoxB/HS6dsUdII0bEz5gbJHamzxtF54bZytL DjeyN8XWPTpfIfwGfJdbTgAN6+QVeeGtmV1g2s90ahWTGw5RKvNpL0HV93ICwM1PRhlHVr i5LSnZjl1M6m1pblf/M8i6F7D2wVLgwoCgEzRilmCz6iocEiG2EGtCL2CJUSJgr46zqN7/ 88xkxtrdtrUG6oJgi+XXP2O2IPy2YwxkeVScQsccumso6/2Uv0iJ+T5Eie2qLPGj9ciXQ/ zVQ62YE0ClU8CS2FYYXl5Us4z67gFIGpTKPZ95+svAvzEWBUwyiUKfjzIl/aqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678131502; a=rsa-sha256; cv=none; b=PxiU3s+dGtnpSSFx4G08MvJmD/6u9b0FgKEvG0snN9bfEBHzv8C6sn66ZISWnKZ2/RYWe4 xdd677xKH0lP7geWFI1i3RJC2xnR/vHEZH6jRRB/zEuMUHR9wZae32frv6bry5vof5ENU8 GXbUXDeDIfzYbvZUy49H37GP4qOrNEoviyxBDWns0qd0/UhrQII2vWV/gxMYUQJCl0pYcQ lJWv1CEZr5YfZzuldvFPMUmasySLoVdaKkrCefbx/Gn+w9UTL3FQ+/2jRwv/XVll7iB60c in3Moaa2kwu1PfbyDj4QY3rJ/ECq5eAAr+Fp5U/sk3m2YP0jki6tqHdAAQ6RSA== 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 4PVplf230Bz1CyT; Mon, 6 Mar 2023 19:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326JcMuL020348; Mon, 6 Mar 2023 19:38:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326JcMjG020347; Mon, 6 Mar 2023 19:38:22 GMT (envelope-from git) Date: Mon, 6 Mar 2023 19:38:22 GMT Message-Id: <202303061938.326JcMjG020347@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d9f07162932b - releng/13.2 - netlink: do not memcpy 0 bytes from a NULL pointer List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: d9f07162932b3f34c9b1b2883773f580c0b04768 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d9f07162932b3f34c9b1b2883773f580c0b04768 commit d9f07162932b3f34c9b1b2883773f580c0b04768 Author: Ed Maste AuthorDate: 2023-03-06 16:30:26 +0000 Commit: Ed Maste CommitDate: 2023-03-06 19:37:56 +0000 netlink: do not memcpy 0 bytes from a NULL pointer Although it works in practice it is UB, and might break after a future compiler update. This was rewritten in main and the memcpy call no longer exists, so this is a direct commit to stable/13 before 055776c84a41 is MFC'd. Discussed with: melifaro Approved by: re (cperciva) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38927 (cherry picked from commit 305aaa93e0c805294c8bcbb5fe8b9f7caa28b349) --- sys/netlink/route/iface.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index 96f21a79a369..3ddef06bed7e 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -458,8 +458,11 @@ rtnl_handle_getlink(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate *n error = ENOMEM; break; } - memcpy(new_array, match_array, offset * sizeof(void *)); - free(match_array, M_TEMP); + if (match_array != NULL) { + memcpy(new_array, match_array, + offset * sizeof(void *)); + free(match_array, M_TEMP); + } match_array = new_array; } From nobody Mon Mar 6 21:18:36 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVrzJ5WWrz3wPHY; Mon, 6 Mar 2023 21:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVrzJ3p80z3BmM; Mon, 6 Mar 2023 21:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678137516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lGCVX0xQ+H4OQ54osRYPfStuXwm+00nRrC5TidCyXFs=; b=Az5AbDcgXyzp/kUz+SQJYj7SmpdcwxyPkOuMoMSXjdKehL0EEW7ioHM8rdnao1JBMAuDfo eXEt135RjjrxqjUy5Q2k0tAPcRbemMQd+6/cqXU8pMhxY6px/E3bqdkMJpbHf+NnWmE6fc Sm9MiQmu7iryM6NUosBNQILTASWG6+mHuzJOv4sfTvidIMP76uowiB6l/UlXhUHS5900x1 bz3Ab5o40qhPv0qaf8b0z49Wgn+ee+RY45ztjH3d1zZF6tC5uPu9g56vlsvvU98XLnij0Q EScBLH3D5FIltyD8+xHEs2JBnKEzRFA55aloqhBVPoBweP9bf2igbP6QKiEzoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678137516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lGCVX0xQ+H4OQ54osRYPfStuXwm+00nRrC5TidCyXFs=; b=VDO+SLVJNc7F6RFrc7VAvdFWZ72yEmTT8xIg5iwrQPHCGGWx8QhVPJrF5QdWvMlmCZsLdW dKrXo9uOtlUAL/7DICRI47Igzz+aKzDRaNSOAbJpnsG2gZbNhyvSDiA+giRMs959nytbXZ wv5whoac6Nb46uhh3l6me+498k0zOtcaAUDrbTw+P4+1sG0HMwVpmyoLJGt72Ez7YNef2n jPxUBJwLwOs8k2XI/qJyF52bXAVQ3CdGxG47lcj6M18asIDIVZm5h5paasLJOXE4AwsNei A6CAQAyfxJw5tQ0OPXS3Lc5jrWJ2C+UR1h9NrSIPIwyL+w1a8iHPd4+XowbruA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678137516; a=rsa-sha256; cv=none; b=Ijik1NDxYmJhPQv13jrJgEeovyKj4Q5B0SGi7KAdYYddE0aOW/VqQ/Xn/J/xWGF3dHYVhS DucCs9JqZPTVyR6ZDb5xiHx7f6SUKDwwCsaEuyJFpbE7cjiO4Y5cwGWHX9VC5aYkydllXf YskGN6l6rggY/ljS63TArh9Zf9/55fHogZ9dGuPCl+LHM44DS2HtjXa0DaQ5ULM8zxh7IB nNV09rjQsqvzt5+u14/wIo5ZOrFNrJj7WDi9SfjPyAJfsSQ+jG7dvo5eysAkBy5ywvooHS 2o8RVQUDQ0+LplMwdi8Eby+OItP/uP/Pn4+a+goDsF1g2f6RxAcM5dTcmKhVSg== 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 4PVrzJ2mRZzHlM; Mon, 6 Mar 2023 21:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326LIaJA084967; Mon, 6 Mar 2023 21:18:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326LIaD4084966; Mon, 6 Mar 2023 21:18:36 GMT (envelope-from git) Date: Mon, 6 Mar 2023 21:18:36 GMT Message-Id: <202303062118.326LIaD4084966@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: c4f59f056c1e - releng/13.2 - uuidgen: add -c for compact uuid List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: c4f59f056c1e9adc64bcea3f5db56a2c33f39dcf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=c4f59f056c1e9adc64bcea3f5db56a2c33f39dcf commit c4f59f056c1e9adc64bcea3f5db56a2c33f39dcf Author: Baptiste Daroussin AuthorDate: 2023-02-28 10:29:51 +0000 Commit: Baptiste Daroussin CommitDate: 2023-03-06 21:18:00 +0000 uuidgen: add -c for compact uuid It generates the uuid string but without the hyphen Approved by: re (cperciva) MFC After: 3 days Reviews by: tcberner Differential Revision: https://reviews.freebsd.org/D38820 (cherry picked from commit b2b294f27cf4618d6f7510007b41882860a080b9) (cherry picked from commit 0ba66872bea87abdf13660d5a7946769fd7b118f) (cherry picked from commit 4cd30c640db978355cf2da666e2749189babda5e) --- bin/uuidgen/uuidgen.1 | 5 ++++- bin/uuidgen/uuidgen.c | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/bin/uuidgen/uuidgen.1 b/bin/uuidgen/uuidgen.1 index 83326e3a189a..6d373cf3de41 100644 --- a/bin/uuidgen/uuidgen.1 +++ b/bin/uuidgen/uuidgen.1 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 23, 2012 +.Dd March 1, 2023 .Dt UUIDGEN 1 .Os .Sh NAME @@ -34,6 +34,7 @@ .Nm .Op Fl 1 .Op Fl r +.Op Fl c .Op Fl n Ar count .Op Fl o Ar filename .Sh DESCRIPTION @@ -53,6 +54,8 @@ instructs to not generate them in batch, but one at a time. .It Fl r This option controls creation of random UUID (version 4). +.It Fl c +This option controls creation of compact UUID (without hyphen). .It Fl n This option controls the number of identifiers generated. By default, multiple identifiers are generated in batch. diff --git a/bin/uuidgen/uuidgen.c b/bin/uuidgen/uuidgen.c index 061907f57109..6dcfdde92a5f 100644 --- a/bin/uuidgen/uuidgen.c +++ b/bin/uuidgen/uuidgen.c @@ -46,6 +46,31 @@ usage(void) exit(1); } +static void +uuid_to_compact_string(const uuid_t *u, char **s, uint32_t *status) +{ + uuid_t nil; + + if (status != NULL) + *status = uuid_s_ok; + + if (s == NULL) + return; + + if (u == NULL) { + u = &nil; + uuid_create_nil(&nil, NULL); + } + + asprintf(s, "%08x%04x%04x%02x%02x%02x%02x%02x%02x%02x%02x", + u->time_low, u->time_mid, u->time_hi_and_version, + u->clock_seq_hi_and_reserved, u->clock_seq_low, u->node[0], + u->node[1], u->node[2], u->node[3], u->node[4], u->node[5]); + + if (*s == NULL && status != NULL) + *status = uuid_s_no_memory; +} + static int uuidgen_v4(struct uuid *store, int count) { @@ -85,16 +110,20 @@ main(int argc, char *argv[]) uuid_t *store, *uuid; char *p; int ch, count, i, iterate, status, version; + void (*tostring)(const uuid_t *, char **, uint32_t *) = uuid_to_string; count = -1; /* no count yet */ fp = stdout; /* default output file */ iterate = 0; /* not one at a time */ version = 1; /* create uuid v1 by default */ - while ((ch = getopt(argc, argv, "1rn:o:")) != -1) + while ((ch = getopt(argc, argv, "1crn:o:")) != -1) switch (ch) { case '1': iterate = 1; break; + case 'c': + tostring = uuid_to_compact_string; + break; case 'r': version = 4; break; @@ -162,7 +191,7 @@ main(int argc, char *argv[]) uuid = store; while (count--) { - uuid_to_string(uuid++, &p, &status); + tostring(uuid++, &p, &status); if (status != uuid_s_ok) err(1, "cannot stringify a UUID"); fprintf(fp, "%s\n", p); From nobody Mon Mar 6 21:18:37 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVrzK5mZbz3wPLs; Mon, 6 Mar 2023 21:18:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVrzK4K4qz3Byg; Mon, 6 Mar 2023 21:18:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678137517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FKm8YqFil1ISVa1FHt8rKaB56KH0JUJEV2QUsnLXoOs=; b=c69CUe4WajeqGsqmxOzuY4ZDKLKB2ADH4RzhpUJw/O1iFN6wOSJHVatXMcCl8mjkgxi289 kZHZpTc4hDMMHvH+t52SSTC9Phy1gbJ+no41HMiKYMOhaeclrmsA2gCvlqaAyukweofsBi VXF2TYhjSrDM3mLJ3rnUXjR+9wQYfD27QcrxjB6ihV0K+F/aF4eANzfXwXy0ushWhn9Wyj yKAvSKgR+5FMxJEYg2VQjnt23Dnsb7/VChaBJ/XOdguyIywXeUXCZxAYXW7pPaVbwIHwO9 DDVO6cYm68TpqLvTdjNTt4/RtoxtU2pI1vTevYKdIw5cHo1Ev9nPoYtlVJOpNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678137517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FKm8YqFil1ISVa1FHt8rKaB56KH0JUJEV2QUsnLXoOs=; b=Xa2SYCsCSxxF7/CTXFa2lPz8q0Er0YpziWvchc6OVPVisI9TJHCaI7ehsiyfec+erP+y0v 4DW6cXr/ssuDg/IkzirbfgzQGTTH5313+OEFPAm/ph3Q1JUnEPO2R74myWeon756KQRWmS Un7vGvxrku5Lmgm8T3fVUqVKgUxG4eSBULukOcEltetF+cdUhCOuaCR72l5EM0uym8jIzL KasHaAIoZXa/WDWyVEYwX6BUUITEYkfVQgVcOdgK3I3IXk6pTXW64XJExoL7UbCi4lfm4k G3DevzpX9/nliEC+wKet1ztbjz0wVEo3zJyWD/PTLRoGsJxK427+bg8iSJt7IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678137517; a=rsa-sha256; cv=none; b=nnv4YqYyUY2k1oZuZE6/vI8IYDuJSR1Fo6U18NZ2PeURdw0ZU5hlMEu9ZtmqIo1xZwYPeD 9raQsEGhq8nNbf/tpGkhWARHS6L7QKsYQG8cVRvvQQMj3xaMCKFp54fPDPZs9kpyK8QuAu AfI2F9XbwzXlxP8s8rcnVslJrMRLEdfunJD4YkGmI2bWqrhUCxFR+hV3z3/Pr9CK3ufPEX STQYyUb++z40Clei5vcN/dOcT4nSFYEsNSLI9wwXozUJKIDvP/k/KJ2kQMYPpnzFUDXdJz zgNxSxFCeXOcPvVk7BNvnvHb6HNV112zIlxd/dpDGw9fbmM/jac23rUuCY8wJw== 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 4PVrzK3MMNzHQ8; Mon, 6 Mar 2023 21:18:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326LIbPv084986; Mon, 6 Mar 2023 21:18:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326LIbtp084985; Mon, 6 Mar 2023 21:18:37 GMT (envelope-from git) Date: Mon, 6 Mar 2023 21:18:37 GMT Message-Id: <202303062118.326LIbtp084985@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 63270222c1ee - releng/13.2 - machine-id: generate a compact version of the uuid List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 63270222c1eefa15efa5366c4f221529e938eef8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=63270222c1eefa15efa5366c4f221529e938eef8 commit 63270222c1eefa15efa5366c4f221529e938eef8 Author: Baptiste Daroussin AuthorDate: 2023-02-28 10:31:06 +0000 Commit: Baptiste Daroussin CommitDate: 2023-03-06 21:18:00 +0000 machine-id: generate a compact version of the uuid dbus and other actually expect an uuid without hyphens Approved by: re (cperciva) Reported by: tijl MFC After: 3 days (cherry picked from commit a28ccb32bf5678fc401f1602865ee9b37ca4c990) --- libexec/rc/rc.d/machine_id | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/machine_id b/libexec/rc/rc.d/machine_id index 7cfd7b2d92f8..8bf3e41d0603 100644 --- a/libexec/rc/rc.d/machine_id +++ b/libexec/rc/rc.d/machine_id @@ -23,7 +23,7 @@ machine_id_start() if [ ! -f ${machine_id_file} ] ; then startmsg -n "Creating ${machine_id_file} " t=$(mktemp -t machine-id) - /bin/uuidgen -r -o $t + /bin/uuidgen -r -c -o $t install -C -o root -g wheel -m ${machine_id_perms} "$t" "${machine_id_file}" rm -f "$t" startmsg 'done.' From nobody Mon Mar 6 21:22:38 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVs3z1000z3wPp6; Mon, 6 Mar 2023 21:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVs3z0G6kz3CmL; Mon, 6 Mar 2023 21:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678137759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4SmYxUQI+gv8LHFVkfJ529dDVUocjDXaohWm2sSdo5M=; b=VgATqM8SXY+w83q3QpkFkRoQBJw8bQFQxAsGozEY9IKxiEPjekdlGxwLSgM5TpaR91Iu+B roqiOjDmM2+xEll13B7eiNpUzmbBi4GJnbw6g1hV9B0YXaNY9lDTNnVoPOyYpfTeA0We2+ u1g1Saypcm/qtuSp98NlDCZokbnaGj+qTkiCzbF1HUrnI4Xzvvk6qpRVo+cZvXqsTSz0uB 4UEgh0BHuH0WOXBZrbwT5jlKx8CVYmTscPgCdNe5WaZAk6Sxwd/J8sJGkCfRaSBR8PV7tH 27Npdc4BBsPV5SxtEXL/5RYLmxJjMRu2NfuOVaMjitfSIJiQG4uKXauclu784Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678137759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4SmYxUQI+gv8LHFVkfJ529dDVUocjDXaohWm2sSdo5M=; b=Q6P04pU2eH/hZqhaN/zKNPJo98QUgwL0KDY67uiFtaGaqPzHnm3TmkeJ5TJcD3kKGEtIK3 kefK8B6mH/VmryP75+YFkfVsRSO68qmcwvPnzLn+9fwsvDdCcWQg8/gaukoMhP34qqfSWW 1lpc745j48fxJtIxgVj8xG45gYIKTyKgu8HOaHE0BIWtccjYXlNL/daDhledAzALR5C1j4 a7MBDvPvxxFYUyuKKI4+Abj6PLRVTtTmpH7MaxYbEZyRCjn07AlDTX4QVquDCTCABFAN9u b4qbhGdX1VM4lV18eUwiLSBCXk/ocZoYJxzzhtU5989tlD1PgJL73ZZUz9a7vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678137759; a=rsa-sha256; cv=none; b=q2KWExl4j+sNujgRg9x9ptFBJISg1gCnu4XCGQnYjRDZ9llFyQ9hrYBQ7pY1Vd+BzVjqub A7yJUEk4vRrPJUzJ11mbwnGYPsc4ig7zaioKun+pu9Ox3tKMkgZF2mjrT98SwOcMAF5Ao+ gm5NH3OdOBVYPuGTgpe48Gg+D776zvGzTxlJIexagti1I2b83exv3Wj79rEmkTFyYKtrcA k+zG78bbezdmvfpxPYVVXTPJV7FXbhltm/MbKAD8WdMFRqIvTori++uxt1Bmqa5NZgKtTz LycMENUDLJ2hcC8adxC92k5QW5S+ImbzEzhU18YOzun1svGU7teEQC43QJ/vMQ== 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 4PVs3y6QrfzHQs; Mon, 6 Mar 2023 21:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326LMcOg000274; Mon, 6 Mar 2023 21:22:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326LMcic000273; Mon, 6 Mar 2023 21:22:38 GMT (envelope-from git) Date: Mon, 6 Mar 2023 21:22:38 GMT Message-Id: <202303062122.326LMcic000273@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 8b1294488603 - stable/12 - netgraph.4: remove obsolete ng_atm.4 reference List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 8b129448860365047ee957c49f3ce5065e88be78 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=8b129448860365047ee957c49f3ce5065e88be78 commit 8b129448860365047ee957c49f3ce5065e88be78 Author: Brooks Davis AuthorDate: 2023-03-02 23:37:18 +0000 Commit: Brooks Davis CommitDate: 2023-03-06 18:57:29 +0000 netgraph.4: remove obsolete ng_atm.4 reference MFC After: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38876 (cherry picked from commit 3518a5bbd9bb0c03b38dea62e577042b779c3aed) --- share/man/man4/netgraph.4 | 1 - 1 file changed, 1 deletion(-) diff --git a/share/man/man4/netgraph.4 b/share/man/man4/netgraph.4 index b1a55ad8c3d6..1b006b46f054 100644 --- a/share/man/man4/netgraph.4 +++ b/share/man/man4/netgraph.4 @@ -1417,7 +1417,6 @@ common networking problems, solved using .Xr socket 2 , .Xr netgraph 3 , .Xr ng_async 4 , -.Xr ng_atm 4 , .Xr ng_atmllc 4 , .Xr ng_bluetooth 4 , .Xr ng_bpf 4 , From nobody Mon Mar 6 21:22:39 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVs4026cyz3wPJs; Mon, 6 Mar 2023 21:22:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVs401cHQz3Cq0; Mon, 6 Mar 2023 21:22:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678137760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N/KA75ZRTODp5YaI1zJUOdwCdu2I1fW+JOdIS/EqgGo=; b=d9KvNwybLP8a8uC8DfeySC3qdixU/w18+yGeETP+MewOrKgdtvGg7kFq/NVW2/oIxJbn8J TG3Oi+g6XBVVy7zeeqa/wF2rvQsdxNUBK0QqymeS/a42p/1VSutuCqmwB1jXKcK6Jlj9bG +jnxQE8uhekI2sHdJUe6d8ZsfG78mFfIh64LsqoddvHCfa54TD5VRj6NyKEdbdxB1EL54l jHCwi+QJ9umFvQzEgH9sDpp8AoK9q0xLlYaRPar6WGLnW5qOrcRihL9qk/RYpf5H8nkuMF 9K56V8eIEvzc1nkrqgyBK6dToDonPk+bDqhelBCufL9ACiiKYNPqY4kbCWiyDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678137760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N/KA75ZRTODp5YaI1zJUOdwCdu2I1fW+JOdIS/EqgGo=; b=i1INC3wD4go0Sc0237wGJ92eIpoJKJX6A/WFXX30QsefuMeOXxocooKZ580KV/WdO5vt1Y SBmaZRQXmTW6NqR3q6+sI2KzNpdDFRO44aXZpKXM/viAW8RVgL9KHvc37dJAkKwcNpwTeV MlJZyVv2GDUiTJU4BJuYidIT+bbkWLr2RTIUYeeO2grMqHv5hgygXqYjebwvV8hg0ECiHy B/Mnx/U+MZkQonqdZvuPjEvglR1MUFwF7zk2nymlb13swIlPTX5ok46OXEZ/iZVBNSBM9i UjZdhHwu/eoX42215fNLciV7nv7satvVTxFlLvUWFOVPXPa8D8sFzcjw9YVXQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678137760; a=rsa-sha256; cv=none; b=J6SSZpNi2pGKYIajnnQNE9VkskBqES+HfFcC5988nr2/713lu87yC3OeWHIIKlpP0qqiKc k6JkZM6QEZUdfrhUKqaLWuTgdeciSTiBGqxIiiLXYuuvzM8Z/Z8v3GlWIrdj2iLDU6HXjn Q9V1jU9oQrPkiwjdB45ADNGzihbbHz1RuJik3cVb/VJNr4M/E6eCRdRDIplIEY4zkRIGeW 1syykZjJ7xRTOQxV+DoIfe5xIYZg58UIjNO6JDGQYOK0vwIaDKtFM1qeMhe6S2khH2zMVg isd8meQWT5S5yMV8BhlPlkYB9azJrepeyxHBSTeVc3btaiwY0vTzLImDEzNARQ== 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 4PVs400VNhzHwc; Mon, 6 Mar 2023 21:22:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326LMdPh000295; Mon, 6 Mar 2023 21:22:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326LMdGl000294; Mon, 6 Mar 2023 21:22:39 GMT (envelope-from git) Date: Mon, 6 Mar 2023 21:22:39 GMT Message-Id: <202303062122.326LMdGl000294@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 45fca9a779f8 - stable/12 - NATM: Remove useless NETGRAPH_ATM_ATMPIF option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 45fca9a779f8ba0b11c9e999490b6d525e945ef0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=45fca9a779f8ba0b11c9e999490b6d525e945ef0 commit 45fca9a779f8ba0b11c9e999490b6d525e945ef0 Author: Brooks Davis AuthorDate: 2023-03-02 23:36:55 +0000 Commit: Brooks Davis CommitDate: 2023-03-06 18:57:30 +0000 NATM: Remove useless NETGRAPH_ATM_ATMPIF option This code was removed as part of the NATM removal in 2017 and somehow this option was missed. MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38874 (cherry picked from commit 3746e90118c941eb5c9123e22fe05026b78382ab) --- sys/conf/NOTES | 1 - sys/conf/options | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 611a8827e47e..56d7da23d685 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -763,7 +763,6 @@ options NETGRAPH_DEBUG # enable extra debugging, this # Node types options NETGRAPH_ASYNC options NETGRAPH_ATMLLC -options NETGRAPH_ATM_ATMPIF options NETGRAPH_BLUETOOTH # ng_bluetooth(4) options NETGRAPH_BLUETOOTH_BT3C # ng_bt3c(4) options NETGRAPH_BLUETOOTH_HCI # ng_hci(4) diff --git a/sys/conf/options b/sys/conf/options index b2c3eebacf70..3baf360381d7 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -503,7 +503,6 @@ NETGRAPH NETGRAPH_DEBUG opt_netgraph.h NETGRAPH_ASYNC opt_netgraph.h NETGRAPH_ATMLLC opt_netgraph.h -NETGRAPH_ATM_ATMPIF opt_netgraph.h NETGRAPH_BLUETOOTH opt_netgraph.h NETGRAPH_BLUETOOTH_BT3C opt_netgraph.h NETGRAPH_BLUETOOTH_H4 opt_netgraph.h From nobody Mon Mar 6 21:22:41 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVs4132Lpz3wPh3; Mon, 6 Mar 2023 21:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVs412HXHz3Cs8; Mon, 6 Mar 2023 21:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678137761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LkSfr1FyYYigA9hXVMqU5J3Hy2bkAaLNMz+YMEITMkE=; b=nHWQV1Ur9SU2h0wliKfkKu/9MiRQyz1hnldU9ZhYJmQuXvlpcqe0F1SXKXD2d6vCcmW5oO Xpx4MFyzs7fqMtR8gRk01zy9PH6i+OZJ3hMphe1zKxNymp+rQfK1PK6HWsSUTaoEVdjaPY 5Fq+VWgZHygvpNrdRezOrzhr/7hSRAuxhNLIElwNyvBnkoboIUfx1nV+9ZDkZSYL4j7TiR IkqXJJsDXaww+e9r4XMOZbvtnjS5nROX2ep4ynVNQcjueFXrwmIxqVTGaOdT7zaKU9dICE mKzfWQWTQ2l/5gs+eu5RuI2ECJWd5bR1Dtdy0UXAAKt98sCDRN10jOZQoDq72A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678137761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LkSfr1FyYYigA9hXVMqU5J3Hy2bkAaLNMz+YMEITMkE=; b=bbjDjmMVb3/vnzj1luphexI6FMpDtIGhRJMZFys+ybADjo02sfSNRjmwwwP1opxn0+8LuC qJYRN6w078vpMmw9NCTvMchBY76CdOFx6Ot/JHigwsB0qsjj9eEgqj8lYgDKXVH0Fiw4qA ALf7Db0DOdM6AEriVzENmMfyELSk0dtkXMlcvO2YvKHMSxPKS0SyrKyvPlEpqhyaj3nvMl fFIa7hTp/Aw7SKT4d0yKONx08dzq4YpwBZpm6X3zGIyz1CckAELGP9JbocZNl2xEkZ8tvx sNAALvb55XVvk7KQLpRfJ9zZPx0tvUFJsMwQdJCwv/YeRLwFPsTHAU4izeCzLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678137761; a=rsa-sha256; cv=none; b=yWnYHAM8HmU+CHaPCcg6mj9FGLxeGrbcaecbsu1VmW+tfN56Bw6YxikABkd/ZtihEzfy4h nezIRcx/b1p44KJVPGScFN0/lMdtLTFgrTR/oahspINgTH2XghOUGr9IAhUaJHQr56XnIO tY6/ZssgFwoqKwu5G+5jwFczYmbS913530o/K9MUEQsXG3ECFB0FCOeE6jWHf12RGRxFvw m4jroIzI9ZnyKWXKDyKxq4yM0oJic1egZQQ0VTeQ9gxOEaQdr8gEUQg5+OXIBhSZsQmwSF WrnAKFKqvIBSEo1RgASHWhQYGncYTKgwbCWRp8ewpOFfMJxQvO0b5cfk84BnPA== 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 4PVs411PJtzJ7M; Mon, 6 Mar 2023 21:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326LMff7000314; Mon, 6 Mar 2023 21:22:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326LMfNG000313; Mon, 6 Mar 2023 21:22:41 GMT (envelope-from git) Date: Mon, 6 Mar 2023 21:22:41 GMT Message-Id: <202303062122.326LMfNG000313@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 7adbe9f763b6 - stable/12 - NgATM: Remove useless NGATM_ATM option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 7adbe9f763b6c2dac8f9dd058c45abc007d0ebc4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=7adbe9f763b6c2dac8f9dd058c45abc007d0ebc4 commit 7adbe9f763b6c2dac8f9dd058c45abc007d0ebc4 Author: Brooks Davis AuthorDate: 2023-03-02 23:37:10 +0000 Commit: Brooks Davis CommitDate: 2023-03-06 18:57:30 +0000 NgATM: Remove useless NGATM_ATM option MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38875 (cherry picked from commit bd32aedeee1a2af8293bfb1a2c85432b7ed8f207) --- sys/conf/NOTES | 1 - sys/conf/options | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 56d7da23d685..94ebac12fa2f 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -812,7 +812,6 @@ options NETGRAPH_VJC options NETGRAPH_VLAN # NgATM - Netgraph ATM -options NGATM_ATM options NGATM_ATMBASE options NGATM_SSCOP options NGATM_SSCFU diff --git a/sys/conf/options b/sys/conf/options index 3baf360381d7..5feb0ef8add2 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -556,7 +556,6 @@ NETGRAPH_VJC opt_netgraph.h NETGRAPH_VLAN opt_netgraph.h # NgATM options -NGATM_ATM opt_netgraph.h NGATM_ATMBASE opt_netgraph.h NGATM_SSCOP opt_netgraph.h NGATM_SSCFU opt_netgraph.h From nobody Mon Mar 6 21:22:42 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVs4244rGz3wPrk; Mon, 6 Mar 2023 21:22:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVs423P4fz3DBv; Mon, 6 Mar 2023 21:22:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678137762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OFPP/g1Z9BnnltOtBxS3A1QaYI+rz9s2Vl3IyXTZuEA=; b=hPpxJO4sIVbGJcsIwE1ZiS2ZRFFUBrrqoJ7Sx793pjpYt6bc1Nd0mdNvcvjvVd5mSaS5w6 F2rvgjap9Ai8PFuwintG0RzzQo5gF9GdvVbCQGIP3oAV5Dea4Ha0RzqoETeekDY4Lk38hH MvK6lX0dVBW87p+1OWC0/QTxZG8JKZ5+SHhbfm4HaCpjAWiFW9YqxoFMlo9bQ5JoeSWYgY C0Z+l+lKhR6hkoGKE0Rok6TdoqQvrwWzWnRZylmTmAdyXTIOs8tJNLmFDrunQB1+adQ9yG OSRpddy1I9F3oZI7cjp6GhV4iaG2ZN/bD8+5DXfyyC2Ad8v+lnKp5+I1U1GYLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678137762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OFPP/g1Z9BnnltOtBxS3A1QaYI+rz9s2Vl3IyXTZuEA=; b=vPuM4yvRYDUkh0nGTAgVkGCudj7UNwlnDrzV5p8P7dXjE9I0d73ijMbjLtzSB/Us7hS/Z7 4LeIZChFag9VYq5JzU+Ijfy3LPSzoRP4VgpYHlRsEMmF0VMlhvDMepT5f+on79UWBbv8Wm kxyG3H4QTpBV9UHO5XdIYcB4OGafkC3OozQcVDC+nWYyXm/EJz9ubBkL+SHNMWZtWKDSV1 zOGJohj/vQzp9qUmkhPDt4ER/XOagoRJtJBtrm674UxJIh2CibInCnGJMbIqJdO1nk7TUI LwuEkdjRqMyHmnfAAExa5NFXruk4kuTHlQiF76x/mCPRCPLMvhJFOQfFIMKKMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678137762; a=rsa-sha256; cv=none; b=r1/pifJL+mx02dZ0WDXkLfBtoa4KPlTuKaNIvMbR/nLfpJ5Hjjn0vweN+nKzrhg7qB/1ku P+1kJJhw4O0fOf6O8ogTiUpvAAd0xOlnu/xDEBw9Q8LDjhwOD0LY3t7ixdTlR529OTc+W1 FPfpNdVHeemn5SHaR+u83/nMHG/MaJ7tHkAtdvEswvwxNkKuDjS8rEtjjkbpSnj/XDjzTB 4Lbyq3dDlN5SjkNVhLJ+x2F6S3IH2WtbdP7ArrKrxgGqOCCGhMZYVv89SOjFg3m6YovIja EvRYoQemOjrtkXF2GnCGFVQkMnXzY3Hq4OLRF8AsxUnnEtZQSbfzoLmY4oRjhw== 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 4PVs422MytzHnt; Mon, 6 Mar 2023 21:22:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326LMgsk000336; Mon, 6 Mar 2023 21:22:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326LMgOO000335; Mon, 6 Mar 2023 21:22:42 GMT (envelope-from git) Date: Mon, 6 Mar 2023 21:22:42 GMT Message-Id: <202303062122.326LMgOO000335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: a338a96efa45 - stable/12 - NgATM: deprecate List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: a338a96efa459df9ed5afe78947425003b8ef2e6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=a338a96efa459df9ed5afe78947425003b8ef2e6 commit a338a96efa459df9ed5afe78947425003b8ef2e6 Author: Brooks Davis AuthorDate: 2023-03-03 16:20:18 +0000 Commit: Brooks Davis CommitDate: 2023-03-06 18:57:30 +0000 NgATM: deprecate Support for ATM NICs was removed prior to FreeBSD 12. At the time it was unclear if this code was still useful without it. Now the time has come to finish removing support. Add DREPRECATION NOTICEs to the manpages and gone_in(14, ...) warnings in the constructors (or module init for ngatmbase). MFC after: 3 days Relnotes: yes Reviewed by: manu, emaste Differential Revision: https://reviews.freebsd.org/D38877 (cherry picked from commit 211c302f10d76fc12e50c87039cfc06aa9e659c1) --- share/man/man4/ng_ccatm.4 | 7 ++++++- share/man/man4/ng_sscfu.4 | 7 ++++++- share/man/man4/ng_sscop.4 | 7 ++++++- share/man/man4/ng_uni.4 | 7 ++++++- share/man/man4/ngatmbase.4 | 7 ++++++- sys/netgraph/atm/ccatm/ng_ccatm.c | 2 ++ sys/netgraph/atm/ngatmbase.c | 2 ++ sys/netgraph/atm/sscfu/ng_sscfu.c | 2 ++ sys/netgraph/atm/sscop/ng_sscop.c | 2 ++ sys/netgraph/atm/uni/ng_uni.c | 2 ++ 10 files changed, 40 insertions(+), 5 deletions(-) diff --git a/share/man/man4/ng_ccatm.4 b/share/man/man4/ng_ccatm.4 index 3d6778fa25d5..02a5a5f011b5 100644 --- a/share/man/man4/ng_ccatm.4 +++ b/share/man/man4/ng_ccatm.4 @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 10, 2005 +.Dd March 3, 2023 .Dt NG_CCATM 4 .Os .Sh NAME @@ -47,6 +47,11 @@ .In netgraph.h .In netgraph/ng_uni.h .In netgraph/ng_ccatm.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm diff --git a/share/man/man4/ng_sscfu.4 b/share/man/man4/ng_sscfu.4 index 2c444dacd589..6011deaeb2b3 100644 --- a/share/man/man4/ng_sscfu.4 +++ b/share/man/man4/ng_sscfu.4 @@ -30,7 +30,7 @@ .\" .\" ng_sscfu(4) man page .\" -.Dd October 24, 2003 +.Dd March 3, 2023 .Dt NG_SSCFU 4 .Os .Sh NAME @@ -40,6 +40,11 @@ .In netnatm/saal/sscopdef.h .In netnatm/saal/sscfudef.h .In netgraph/atm/ng_sscfu.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm sscfu diff --git a/share/man/man4/ng_sscop.4 b/share/man/man4/ng_sscop.4 index c98a43462581..451edcc4aebf 100644 --- a/share/man/man4/ng_sscop.4 +++ b/share/man/man4/ng_sscop.4 @@ -30,7 +30,7 @@ .\" .\" ng_sscop(4) man page .\" -.Dd October 24, 2003 +.Dd March 3, 2023 .Dt NG_SSCOP 4 .Os .Sh NAME @@ -39,6 +39,11 @@ .Sh SYNOPSIS .In netnatm/saal/sscopdef.h .In netgraph/atm/ng_sscop.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm sscop diff --git a/share/man/man4/ng_uni.4 b/share/man/man4/ng_uni.4 index da7028b0e015..993119d23c70 100644 --- a/share/man/man4/ng_uni.4 +++ b/share/man/man4/ng_uni.4 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 6, 2003 +.Dd March 3, 2023 .Dt NG_UNI 4 .Os .Sh NAME @@ -38,6 +38,11 @@ .In netnatm/msg/unistruct.h .In netnatm/sig/unidef.h .In netgraph/atm/ng_uni.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm uni diff --git a/share/man/man4/ngatmbase.4 b/share/man/man4/ngatmbase.4 index 0227b44347bd..6cdc3eb532fc 100644 --- a/share/man/man4/ngatmbase.4 +++ b/share/man/man4/ngatmbase.4 @@ -30,9 +30,14 @@ .\" .\" ngatmbase(4) man page .\" -.Dd August 24, 2004 +.Dd March 3, 2023 .Dt NGATMBASE 4 .Os +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh NAME .Nm ngatmbase .Nd netgraph ATM utility module diff --git a/sys/netgraph/atm/ccatm/ng_ccatm.c b/sys/netgraph/atm/ccatm/ng_ccatm.c index cc3f7519289f..c52d392034c5 100644 --- a/sys/netgraph/atm/ccatm/ng_ccatm.c +++ b/sys/netgraph/atm/ccatm/ng_ccatm.c @@ -348,6 +348,8 @@ ng_ccatm_constructor(node_p node) { struct ccnode *priv; + gone_in(14, "ng_ccatm: netgraph ATM modules"); + priv = malloc(sizeof(*priv), M_NG_CCATM, M_WAITOK | M_ZERO); priv->node = node; diff --git a/sys/netgraph/atm/ngatmbase.c b/sys/netgraph/atm/ngatmbase.c index 058fbfa677e4..de46aaedd1a5 100644 --- a/sys/netgraph/atm/ngatmbase.c +++ b/sys/netgraph/atm/ngatmbase.c @@ -77,6 +77,8 @@ static struct mtx ngatm_unilist_mtx; static void uni_msg_init(void) { + gone_in(14, "ngatmbase: netgraph ATM modules"); + mtx_init(&ngatm_unilist_mtx, "netgraph UNI msg header lists", NULL, MTX_DEF); } diff --git a/sys/netgraph/atm/sscfu/ng_sscfu.c b/sys/netgraph/atm/sscfu/ng_sscfu.c index 9036e7740ab6..20e473801142 100644 --- a/sys/netgraph/atm/sscfu/ng_sscfu.c +++ b/sys/netgraph/atm/sscfu/ng_sscfu.c @@ -540,6 +540,8 @@ ng_sscfu_constructor(node_p node) { struct priv *priv; + gone_in(14, "ng_sscfu: netgraph ATM modules"); + priv = malloc(sizeof(*priv), M_NG_SSCFU, M_WAITOK | M_ZERO); if ((priv->sscf = sscfu_create(node, &sscfu_funcs)) == NULL) { diff --git a/sys/netgraph/atm/sscop/ng_sscop.c b/sys/netgraph/atm/sscop/ng_sscop.c index 67a3f07efd83..820e63113e02 100644 --- a/sys/netgraph/atm/sscop/ng_sscop.c +++ b/sys/netgraph/atm/sscop/ng_sscop.c @@ -246,6 +246,8 @@ ng_sscop_constructor(node_p node) { struct priv *p; + gone_in(14, "ng_sscop: netgraph ATM modules"); + p = malloc(sizeof(*p), M_NG_SSCOP, M_WAITOK | M_ZERO); if ((p->sscop = sscop_create(node, &sscop_funcs)) == NULL) { diff --git a/sys/netgraph/atm/uni/ng_uni.c b/sys/netgraph/atm/uni/ng_uni.c index d3adad5ac9e4..67d19d238859 100644 --- a/sys/netgraph/atm/uni/ng_uni.c +++ b/sys/netgraph/atm/uni/ng_uni.c @@ -225,6 +225,8 @@ ng_uni_constructor(node_p node) { struct priv *priv; + gone_in(14, "ng_uni: netgraph ATM modules"); + priv = malloc(sizeof(*priv), M_NG_UNI, M_WAITOK | M_ZERO); if ((priv->uni = uni_create(node, &uni_funcs)) == NULL) { From nobody Mon Mar 6 21:22:43 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVs435Sxpz3wPh6; Mon, 6 Mar 2023 21:22:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVs43461Dz3DHc; Mon, 6 Mar 2023 21:22:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678137763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qfOYULeC1yDOG6+1bzj3UcAQoS7WCGrIvujMTnGZQsg=; b=bGVesQdo9nGe2lmp0GbCgucymX62GJVd9L3vyEe4dhYiSf5RnQIFZacbutAsQdE2k8cLO/ tBapiR/NQUVJatLQ5U4yj4oMDJq2JhIGzso83OQMSZpgHwpyw5B4Oz1+wrtK4UELWSBI7r xKneYXvIy2Nd96A/27FVz0MbXGaEpznOd/UuQ+342Y3zleEEbfVrlaUsU5N6RJmoByTgni EuaP6j7nidWPEy99d9/gFbtJV5cmi/1QU9unn3i8T6cXLOrIBEQ2pdaLLMDAFGlhhSz74W mn4gfnwsrhA6MOc/Fw3NWGCQVexonR/wouATh21lwbKGm6wSjLXmoxKIfR2M2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678137763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qfOYULeC1yDOG6+1bzj3UcAQoS7WCGrIvujMTnGZQsg=; b=MxYxCV026cJnwMPZuBAEoSbJNtYeT7WmFkQj6Xel1ARGq90keZL0iYEOHSW6pbP4QvBzzS PU47hrKy+GHdUvQTnEv265UVzCTBZlCdZm8SckrbjanR1RmkJdKd+S6lbH6SFLJ+Q2Sma9 CN4CR9EyNae8uGLKKccvNXJ9Z696e8LmDAwvrt/kTi9WBAmJ2Cl4+/O70q5xgY/Od09MxL VcJ8uE1qrepo8cPhkeOxcIXu8uBJ57WLHRp2TrQ/Gifupl3u19pb6DkSHgl85YTM77edyQ ST+lIvvFC2zz2d4dcepVzdbmSZ/EHSx26JreyUN5PG6J8D3zH6LynVJKgBDV0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678137763; a=rsa-sha256; cv=none; b=YmGskkXMfLVDV3qnGi1vWGSng7KE1qcajnIWKq1aTz8ezefvhEqAD/4IS0JAAfpMwKtyQQ rVqPUIz1Z7ajLIyMdSV1oFQlzaJ8bkE7NW7B+EEhGMDVvMkp2+umzdmGq35w9HKY9XyH50 JeegEPxqukUkpLCfiA0LO0a8dTYa5YMf1ntCfvyp64coE5/yauRsqz9ME9poK+Ru++DkKF WcD3qGiZu/PlmjjW5LiBV8CHF4GRAORMe70yhz0VhcYecUPENoC8xWibS7gNjzbRWdmD5n f1ENKIS/YPOq6WyV8Lm6w8UmSyJ2v3xliCfs/6QxzZQRGjPwpzT/WN6MFtDHEA== 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 4PVs433CZ4zHnv; Mon, 6 Mar 2023 21:22:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326LMhSi000362; Mon, 6 Mar 2023 21:22:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326LMh1m000361; Mon, 6 Mar 2023 21:22:43 GMT (envelope-from git) Date: Mon, 6 Mar 2023 21:22:43 GMT Message-Id: <202303062122.326LMh1m000361@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 08325b2df477 - stable/12 - ng_atmllc: deprecate List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 08325b2df4772fb4143ff4b44f7650c5e6f3cb1c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=08325b2df4772fb4143ff4b44f7650c5e6f3cb1c commit 08325b2df4772fb4143ff4b44f7650c5e6f3cb1c Author: Brooks Davis AuthorDate: 2023-03-03 16:20:29 +0000 Commit: Brooks Davis CommitDate: 2023-03-06 18:57:31 +0000 ng_atmllc: deprecate With the deprecation of NgATM, ng_atmllc is the last vestage of ATM support so deprecate it too. MFC after: 3 days Relnotes: yes Reviewed by: manu, emaste Differential Revision: https://reviews.freebsd.org/D38878 (cherry picked from commit c2285a7b092f524b5694e42bfb5fd24f71815771) --- share/man/man4/ng_atmllc.4 | 7 ++++++- sys/netgraph/ng_atmllc.c | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/share/man/man4/ng_atmllc.4 b/share/man/man4/ng_atmllc.4 index 3c7cfa947fc7..50987b5a5f6c 100644 --- a/share/man/man4/ng_atmllc.4 +++ b/share/man/man4/ng_atmllc.4 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 8, 2004 +.Dd March 3, 2023 .Dt NG_ATMLLC 4 .Os .Sh NAME @@ -32,6 +32,11 @@ .Nd ATM LLC netgraph node type .Sh SYNOPSIS .In netgraph/ng_atmllc.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm atmllc diff --git a/sys/netgraph/ng_atmllc.c b/sys/netgraph/ng_atmllc.c index 1e4475ae68e0..d4a13fb83128 100644 --- a/sys/netgraph/ng_atmllc.c +++ b/sys/netgraph/ng_atmllc.c @@ -93,6 +93,8 @@ ng_atmllc_constructor(node_p node) { struct ng_atmllc_priv *priv; + gone_in(14, "ng_atmllc"); + priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); NG_NODE_SET_PRIVATE(node, priv); From nobody Tue Mar 7 01:34:33 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVyff0VdPz3wgQR; Tue, 7 Mar 2023 01:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVyff01wyz3s1T; Tue, 7 Mar 2023 01:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678152874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fiBTv5W1JHvcuQr9mASZhxoiAV/qjnWm+uelFPq33S8=; b=C9j4ohSMGs/HPsC+QCwrx3kswnEeHckpnkt1gZFGgkFP1MJ1S8M5Fin5vluXGRs3fSfB04 oRM2DRWOKAU6DuABIcxD6+kPfiv4BrP/tUEqiQmYEmhjemoVx3SlG8oHM8slziKQsTDOXV 1yJAtDukOgTehqu2tjGGpz1RchJFdayqBZV8gJ5aGdC7lwFb66EswfcI4TQGQ1nagXBZYK D4RnPs3g4Z4q/7AUrvMlqmZxwPgpwceMRYBkpN1W278w3LAd2TQS3whuYy2bQdjcbNux4g njq9wSIkt7yihEgkLwdJXVPhuDT2udevNESmXh5rNSGHYr4147su/V4yOptdww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678152874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fiBTv5W1JHvcuQr9mASZhxoiAV/qjnWm+uelFPq33S8=; b=ffBQKyqhRuZ55ZZ2QUJsME7oUIK4xN0kjKPapfjaFIS6QcOS1pVY7X+IXNQrhC7ZUChJL8 C4m7BBqWsFfSlTzE/jNuFxgKCgNAz0/1zLmwSgI4Kb6ffXn8Hrproo9scEANWPX7/V8Y43 CyDoBIf9YT73Nc91J6ajDa/JipghYOptUYS1mLmVM71WXoe9PwE4GTsc7QGMYrXoQ3VjZi 84MBRz4XcoUKuL59+rfNhOJp5Oi3klWMEHtBcUTHkTEMqI/a6xiThVxO3SL847to57AtvI Df3WDIcBqjGCRF69uz5T3S4xPKwy+8SFJBxvCJak4XIq49qeYbXEmB461ZjgXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678152874; a=rsa-sha256; cv=none; b=hxmk6VpwI09cUqzWtUSX3+XBAdJQMNWZ0m1y4tcF/BOG2gXUK7HqEK9DmCGEglAvAA1LGu KJ92lMpUXgXUjSI3SgIZq0gMhzOtsxHBUYV0KiTX9uNz4ehpm4vkoH0BDgjSUJtGkjFqII SIkavCOchf5yviyPhVH4KWv31xPBZw5Sx7qQu801wYKQPhNkrwBgJM1xtRJy1u31T+IQe6 OMSBXvk8uTazOJzfaJ8NhmzW04CB2Vueh7uy6fIrjJguLRfAawVcvsSXOvyU/ugm8Zbf1j g+UbCJWznQw3VoSR53hQZXyyYtm5rSIGOknlrIVz+Y901SjlDGY+TEmL1Wse4Q== 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 4PVyfd6D7zzQ5f; Tue, 7 Mar 2023 01:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3271YXmw011783; Tue, 7 Mar 2023 01:34:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3271YX88011782; Tue, 7 Mar 2023 01:34:33 GMT (envelope-from git) Date: Tue, 7 Mar 2023 01:34:33 GMT Message-Id: <202303070134.3271YX88011782@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 4a141adf16e2 - stable/13 - vfs_mount.c: Free exports structures in vfs_destroy_mount() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4a141adf16e28a787f14ac14115fbecbf3a9ed1b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=4a141adf16e28a787f14ac14115fbecbf3a9ed1b commit 4a141adf16e28a787f14ac14115fbecbf3a9ed1b Author: Rick Macklem AuthorDate: 2023-02-04 22:45:23 +0000 Commit: Rick Macklem CommitDate: 2023-03-07 01:33:07 +0000 vfs_mount.c: Free exports structures in vfs_destroy_mount() During testing of exporting file systems in jails, I noticed that the export structures on a mount were not being free'd when the mount is dismounted. This bug appears to have been in the system for a very long time. It would have resulted in a slow memory leak when exported file systems were dismounted. Prior to r362158, freeing the structures during dismount would not have been safe, since VFS_CHECKEXP() returned a pointer into an export structure, which might still have been used by the NFS server for an in-progress RPC when the file system is dismounted. r362158 fixed this, so it should now be safe to free the structures in vfs_mount_destroy(), which is what this patch does. (cherry picked from commit db5655124ca4047ac397b9421ca4a08868a49ae9) --- sys/kern/vfs_export.c | 7 ++++--- sys/kern/vfs_mount.c | 4 ++++ sys/sys/mount.h | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index 024011de4c89..cab37ce205ad 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -70,7 +70,6 @@ static MALLOC_DEFINE(M_NETADDR, "export_host", "Export host address structure"); static struct radix_node_head *vfs_create_addrlist_af( struct radix_node_head **prnh, int off); #endif -static void vfs_free_addrlist(struct netexport *nep); static int vfs_free_netcred(struct radix_node *rn, void *w); static void vfs_free_addrlist_af(struct radix_node_head **prnh); static int vfs_hang_addrlist(struct mount *mp, struct netexport *nep, @@ -274,7 +273,7 @@ vfs_free_addrlist_af(struct radix_node_head **prnh) /* * Free the net address hash lists that are hanging off the mount points. */ -static void +void vfs_free_addrlist(struct netexport *nep) { struct ucred *cred; @@ -285,8 +284,10 @@ vfs_free_addrlist(struct netexport *nep) vfs_free_addrlist_af(&nep->ne6); cred = nep->ne_defexported.netc_anon; - if (cred != NULL) + if (cred != NULL) { crfree(cred); + nep->ne_defexported.netc_anon = NULL; + } } diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 21e60c9e74d1..32d24fb16526 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -618,6 +618,10 @@ vfs_mount_destroy(struct mount *mp) #endif if (mp->mnt_opt != NULL) vfs_freeopts(mp->mnt_opt); + if (mp->mnt_export != NULL) { + vfs_free_addrlist(mp->mnt_export); + free(mp->mnt_export, M_MOUNT); + } crfree(mp->mnt_cred); uma_zfree(mount_zone, mp); } diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 6e988a48922e..9a69240ddba5 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -987,6 +987,7 @@ void vfs_periodic(struct mount *, int); int vfs_busy(struct mount *, int); int vfs_export /* process mount export info */ (struct mount *, struct export_args *); +void vfs_free_addrlist(struct netexport *); void vfs_allocate_syncvnode(struct mount *); void vfs_deallocate_syncvnode(struct mount *); int vfs_donmount(struct thread *td, uint64_t fsflags, From nobody Tue Mar 7 06:55:56 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PW5nS6nkgz3x101; Tue, 7 Mar 2023 06:55:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PW5nS536tz4K5t; Tue, 7 Mar 2023 06:55:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678172156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dVFIaT5GKg96nnWgScMSu5ce45Mk/FkU320qnsV2KlM=; b=MVhN3RLrOXmfJg7KhGMKgTnpMETcLNZCc4X6HSlay739omtlMgIatLYiCb5QwxEvTT3bp0 PYNBbZUrq9I19YPwLllT00dXcHFlwRtwuCd0mwef2bXwvs2i2EfeEvKShCVvEbMEPsg1DI HGaVzjhvmei/uAhDFvVra/flho5EDJa9ONq3MNU1QrvX3z/Gj1gxB/RY8P7+xsshctJyJW bca3av1M8S8OtKK2ou0PaGJJxK653/SQhYdmrsTIXKiDXhFaUwQ5G10P2I0S7Q2AjtqmVV DMPmBeCBMN7i/kR5fKo/jjUlxji4V4lM1clX+0U2UokHTq0hfRNG7Vs3lZq2AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678172156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dVFIaT5GKg96nnWgScMSu5ce45Mk/FkU320qnsV2KlM=; b=aw3vEi2vEBek07svyC1YhBA1qcGOE0f2o9enlqJNCEhMLOWB61TnPqwdXHvY9Oy30LlUWo 2UddrTpuUZFu7o1395sWwYNZDAD4YYM73QByWav/FKiYhr2Xv9t4ENZ2cYYk9zOuH9JmAc 1dWSmWElqYZhJoTerieHfNyPq4f7QQKhJTo+uRvynA6kJs1pZBzivPbfmx+X/C+/0QK8ku PHlCNIRC3lUusQPdIzFARYiGs99bScXbyLdAPJWq9Y3id55ILf1s/92RaRy5WBLmTHG/oG MItRAehjMB7LZjHnS2MEkf/TSj6VuS6OWg1S8xrv21xAjiL+sL8fq5WVZDf7hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678172156; a=rsa-sha256; cv=none; b=uoiqGMpqXmHXaXEMKuuWZE5Ia3391ZFhOUdZLqxzMJTSipd+L8Cy3Fy0KXgIe5uPBsUZHH eUvhpSMLlPCb11q51izWmLSX0DfL2AnPo5G2dml5nK7aYlCCXWInwfTkGcL8OZNHvnuq+l twisvniDjXN+HwDG+OTZAp6Rm/4tqa30MU2UKFlUnl6jkY4PTKp2pAurF8TJXeW/QOmqcL IcE2pIKes7EjEiAHKwg9UdjWnVg7iPMwKVkBw1sskAwNKzZNM2m40NFod2Bimk+uaXGX2m ujJGktwsKA5sDl9l0xzTge4lmDbndzDsEjuCWVLkzBxrmO/GrmiBgdAJKOxOvw== 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 4PW5nS4770zZLn; Tue, 7 Mar 2023 06:55:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3276tuCJ037442; Tue, 7 Mar 2023 06:55:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3276tuVh037441; Tue, 7 Mar 2023 06:55:56 GMT (envelope-from git) Date: Tue, 7 Mar 2023 06:55:56 GMT Message-Id: <202303070655.3276tuVh037441@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 0cc2deb476be - stable/13 - xz: Improve compatibility with systems without capability mode support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0cc2deb476bec103ad7c8dbeb650aa2937d6a0da Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=0cc2deb476bec103ad7c8dbeb650aa2937d6a0da commit 0cc2deb476bec103ad7c8dbeb650aa2937d6a0da Author: Xin LI AuthorDate: 2023-03-05 09:40:13 +0000 Commit: Xin LI CommitDate: 2023-03-07 06:55:41 +0000 xz: Improve compatibility with systems without capability mode support When the kernel is built without capability mode support, or when using an emulator like qemu-user-static that does not translate system calls, these calls will return a negative number and set the errno to ENOSYS. However, this error does not indicate a real programming or runtime error and is generally ignored by base system applications built with capability mode sandboxing. Match this behavior by making xz(1) to ignore ENOSYS errors when calling capability mode system calls too. PR: 269185 Reported by: Dan Kotowski (cherry picked from commit c237c10a2346dec422233db05b2012afd45363fa) --- contrib/xz/src/xz/file_io.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/contrib/xz/src/xz/file_io.c b/contrib/xz/src/xz/file_io.c index a5841b370302..3625393a5dc7 100644 --- a/contrib/xz/src/xz/file_io.c +++ b/contrib/xz/src/xz/file_io.c @@ -193,23 +193,24 @@ io_sandbox_enter(int src_fd) cap_rights_t rights; if (cap_rights_limit(src_fd, cap_rights_init(&rights, - CAP_EVENT, CAP_FCNTL, CAP_LOOKUP, CAP_READ, CAP_SEEK))) + CAP_EVENT, CAP_FCNTL, CAP_LOOKUP, CAP_READ, CAP_SEEK)) < 0 && + errno != ENOSYS) goto error; if (cap_rights_limit(STDOUT_FILENO, cap_rights_init(&rights, CAP_EVENT, CAP_FCNTL, CAP_FSTAT, CAP_LOOKUP, - CAP_WRITE, CAP_SEEK))) + CAP_WRITE, CAP_SEEK)) < 0 && errno != ENOSYS) goto error; if (cap_rights_limit(user_abort_pipe[0], cap_rights_init(&rights, - CAP_EVENT))) + CAP_EVENT)) < 0 && errno != ENOSYS) goto error; if (cap_rights_limit(user_abort_pipe[1], cap_rights_init(&rights, - CAP_WRITE))) + CAP_WRITE)) < 0 && errno != ENOSYS) goto error; - if (cap_enter()) + if (cap_enter() < 0 && errno != ENOSYS) goto error; #elif defined(HAVE_PLEDGE) From nobody Tue Mar 7 06:56:32 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PW5p86M37z3x0xZ; Tue, 7 Mar 2023 06:56:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PW5p85kp8z4KMV; Tue, 7 Mar 2023 06:56:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678172192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xuZ2FrKrCBkZovG2NkjbpaPsBwkNEAllnEB9lM9iHG8=; b=l7DhhuYtbn74qZ2lJzq15pJkfRrI+/rfZQ38HuvXWSWG3uqTK4W7mHtIpO6GRFm/pAAj0L QZH5Kl6nTyDRG8CiPu8dIZ7vVkmjeO/sqQUTEuc6eBZI2+FKWxY/V8roK7ersGmFSALnLg coBIAtkORGczXT8k7zqLzujLHvpHb6j4x94KgS3T5eYoJgTHgwrkXpnNviO5HLgc1V1oWP 1F5TkHrrhDYGOxDoS9j95g05+3jLUfNAPBTtAAo2p7Wr5zBPsLdgqMt6QGMm3zLHO13ss9 5qcE99h+3UeoCupzbc+5sxKOHo6+6D9KCAl3J5S2zwnnhqBxxPatI+vy69GwxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678172192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xuZ2FrKrCBkZovG2NkjbpaPsBwkNEAllnEB9lM9iHG8=; b=wLeBjzCk4fJasz0kAWhSC2n43U46xLlF3K2vuCr1kzCWHDSXEmTUrvMhXoF6TfxsD9xC8a Jw4FS6431s/wVzm39fue12FRfX3tDiZ97BZ8TqAFRNmlgeno4ZOX55cUmv5OASLokUDMPF WdQeY9oNewQuPpkTDLdegVpx+EOY1StN7bRl9xEk4ipE+JYUnM+tMrpm7mDXd2zRdBojx2 Ewt2Fp6orfA1G4n/e4shH7CaELi/1IPNBqPKqRxWlc9q9IwkN5MusROqVYVoj61YWqySyM XzEdJ87NuLnqWWn5SfR65+aGTOhWtX1WXF538g5jJIjpuIx4pa7cqmiUPawpHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678172192; a=rsa-sha256; cv=none; b=CRYQ/vBg8lNBeMAYszspuH85AH8T32q1kYHk9qqTPQbIWV9dfpxCTJsDs5rhCfgY9HYjw2 q/wNFzbEWy/YSo8YF1oWMp/oyy7JWINlEuW0eyjoKoz+m9bpk2hRzHRlrpbSvqNTCrT4Cq 4m5Xm7grEyI60M0oYNXWxa6iHv736Ud95nnSdN+3GDUFVoUSmW2nrbxRhmBFseuIFh4x0V mTcaJQgkqA22Mchjc6e0ErZ57OI4Z/iWY87Q8aDrikKxzyyBAJlb6CnvkeOkm3WoHDBMtJ 7a1fTUqSxP6LnqJcCme0TNnFqkBhMwaIhXNqfwvxfSW5W0ecDj0oqPLkV4mYCQ== 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 4PW5p84TDszYl1; Tue, 7 Mar 2023 06:56:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3276uWSf037614; Tue, 7 Mar 2023 06:56:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3276uW89037613; Tue, 7 Mar 2023 06:56:32 GMT (envelope-from git) Date: Tue, 7 Mar 2023 06:56:32 GMT Message-Id: <202303070656.3276uW89037613@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 2e12642a6595 - stable/12 - xz: Improve compatibility with systems without capability mode support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2e12642a65957e7ab518699e1f8a9a5aa95ea45f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=2e12642a65957e7ab518699e1f8a9a5aa95ea45f commit 2e12642a65957e7ab518699e1f8a9a5aa95ea45f Author: Xin LI AuthorDate: 2023-03-05 09:40:13 +0000 Commit: Xin LI CommitDate: 2023-03-07 06:56:18 +0000 xz: Improve compatibility with systems without capability mode support When the kernel is built without capability mode support, or when using an emulator like qemu-user-static that does not translate system calls, these calls will return a negative number and set the errno to ENOSYS. However, this error does not indicate a real programming or runtime error and is generally ignored by base system applications built with capability mode sandboxing. Match this behavior by making xz(1) to ignore ENOSYS errors when calling capability mode system calls too. PR: 269185 Reported by: Dan Kotowski (cherry picked from commit c237c10a2346dec422233db05b2012afd45363fa) --- contrib/xz/src/xz/file_io.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/contrib/xz/src/xz/file_io.c b/contrib/xz/src/xz/file_io.c index 41e4c2d893f8..6adbb7a6497b 100644 --- a/contrib/xz/src/xz/file_io.c +++ b/contrib/xz/src/xz/file_io.c @@ -193,23 +193,24 @@ io_sandbox_enter(int src_fd) cap_rights_t rights; if (cap_rights_limit(src_fd, cap_rights_init(&rights, - CAP_EVENT, CAP_FCNTL, CAP_LOOKUP, CAP_READ, CAP_SEEK))) + CAP_EVENT, CAP_FCNTL, CAP_LOOKUP, CAP_READ, CAP_SEEK)) < 0 && + errno != ENOSYS) goto error; if (cap_rights_limit(STDOUT_FILENO, cap_rights_init(&rights, CAP_EVENT, CAP_FCNTL, CAP_FSTAT, CAP_LOOKUP, - CAP_WRITE, CAP_SEEK))) + CAP_WRITE, CAP_SEEK)) < 0 && errno != ENOSYS) goto error; if (cap_rights_limit(user_abort_pipe[0], cap_rights_init(&rights, - CAP_EVENT))) + CAP_EVENT)) < 0 && errno != ENOSYS) goto error; if (cap_rights_limit(user_abort_pipe[1], cap_rights_init(&rights, - CAP_WRITE))) + CAP_WRITE)) < 0 && errno != ENOSYS) goto error; - if (cap_enter()) + if (cap_enter() < 0 && errno != ENOSYS) goto error; #else From nobody Tue Mar 7 13:28:23 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PWGVH5bTpz3w9Jd; Tue, 7 Mar 2023 13:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PWGVH3zxQz3vZJ; Tue, 7 Mar 2023 13:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678195703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0oAgKjNgTLai524rMo3o8doFdoF+kbqXRDTGw2MTly8=; b=i8qaCSVl4lKprOJMdb2oRSVK5YrtRQ/Ui9CREX8GcwrnuBZksmg2S93wNOdr0UL1EpmrM8 bW3a3MjKBZWlanxdC4H6F8g0+LZgBZHYv5d/5oouQk5oa7Q9aZJUcFoxntyhTQ/NvkOn4q /XJsh59AWN4uTWY6p5zuCQKLd+GjN7ONI/MMVcEPqJIVnelkI0YazfMAP2aonuBdW752kG s38Wn7wTUMVehbpSNFX8r31xifV7W+z1XxCD6Dw/HEvTbCkbCsgccSpa9ziYyBlqnLVc4l n4GkOMgsHcS6kGn79/CIxcR/yR+03NdYigFz/uT6dgCrNdlb86392jE0YXG26A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678195703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0oAgKjNgTLai524rMo3o8doFdoF+kbqXRDTGw2MTly8=; b=nIeoBLXT1EwXIrre2WJdMxcZ6RQUwGASoQYRfDKQe5oiKWssrJivmNmsaS51Z6vPu0GSTY MhvbH18vsEbCVxKb+Z0myW+8W+yZ6VjMcSPmc/t7kRxj0FEPXWQPEY0FKH+3EU9avbr8g9 80dlilIrGLU2PRRSEjaWGlJclULcGvrZUq0+aCBpCJfJpINlyVpFY3Ao+mTw1wmvI4/Ec0 LUcUrZdlgo/GAmFzMvx6MvuSQk+EbQKnv5bcBHOM/zeJ8RsNunR/T4ZLdaUk+WxAve+2Yf 8RKp8XbDV7hRSZgrTeqTy46+XWXCrVPGpnDSX9tE+oGSQanvWR4u5utr9BgiKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678195703; a=rsa-sha256; cv=none; b=uE7QlCiN9Z89dURNnWdWituCjMHJ07xB+wmN9cTIEelTlTImDVqChujF9LQ73zGUWwSkhA UX7Ecr3zMng7a/I9PnU2eA11mk3QkUw+tlxXMWincZ0PG9xoNjO+tc99O8qWZmmoHEPmgB hWbajHO4Ix/JQhomi4aTQyODokf30Yt2KBHeti2Ql5CIYlTPVm2x2SN5yyOIGfYsLD7bGJ 6bzRS+AGRH8JIEK+03mLc/HRBHRy1ckqa6ft1PrQNLTOIfGILtJ2VV0xba0/ibCMQ9cwD2 hNQC+VFTP8bzW9vncl6PApZJFBzs0D/EKe+SKr/2vOTfiN/BEsrkkpROFo8KGw== 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 4PWGVH35nszlWY; Tue, 7 Mar 2023 13:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 327DSNqX077967; Tue, 7 Mar 2023 13:28:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 327DSN4Q077966; Tue, 7 Mar 2023 13:28:23 GMT (envelope-from git) Date: Tue, 7 Mar 2023 13:28:23 GMT Message-Id: <202303071328.327DSN4Q077966@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 1af993335913 - releng/13.2 - netlink: call genetlink notification handler upon successful family search. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 1af993335913b4c786da719015b5ba17cc8d5b2b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1af993335913b4c786da719015b5ba17cc8d5b2b commit 1af993335913b4c786da719015b5ba17cc8d5b2b Author: Alexander V. Chernikov AuthorDate: 2023-02-17 17:58:53 +0000 Commit: Ed Maste CommitDate: 2023-03-07 13:27:57 +0000 netlink: call genetlink notification handler upon successful family search. Approved by: re (cperciva) (cherry picked from commit 7cbe771f013f6cf3316910648f6d46641cad7f44) (cherry picked from commit ac40ea6fbb4e6af98a4540fc8fd5a3e824cb181d) --- sys/netlink/netlink_generic.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c index 028ea24fc5e9..066379e2afae 100644 --- a/sys/netlink/netlink_generic.c +++ b/sys/netlink/netlink_generic.c @@ -160,9 +160,8 @@ genl_unregister_family(const char *family_name) GENL_LOCK(); struct genl_family *gf = find_family(family_name); - nlctrl_notify(gf, CTRL_CMD_DELFAMILY); - if (gf != NULL) { + nlctrl_notify(gf, CTRL_CMD_DELFAMILY); found = true; unregister_groups(gf); /* TODO: zero pointer first */ From nobody Tue Mar 7 13:28:24 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PWGVK18HYz3w960; Tue, 7 Mar 2023 13:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PWGVJ4v9hz3vSC; Tue, 7 Mar 2023 13:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678195704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1/w7h2S3SYoAAL8g2wydtEvHx8EU9/HvJYtEcVOLS5k=; b=WBXgRl0ExQQVh7cN8KQ+ZXA9NJfUfFVL/rESSEb7Ud8cDzNScQcPk+6J8/swFomx+RN/av FNbTgkJHRDtCXwvH0gxnxMZX20Z/O83FjR1KHijY0Kb8xfDSLbLLotSiugGwgLblJDZ8P5 ZVF96pK2Xd7eFrfrYJT7IvVHRbTdTDfvpxTv+f3wznRJGtrzDIKaxObmOCk6xwSjCKbTxh BZbIzBcA5lQoW3O4C1G64ImSdLwDPEE4idlF9B/NC+oPSm6HSyc+0oYQSXBWfJIXgfhKnY rGgRZ3J5MY1eyIoPlnM6pJkzYZHKZ/5zWbBcSkmMkdClJdNNbpUw7Bu6LdA6Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678195704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1/w7h2S3SYoAAL8g2wydtEvHx8EU9/HvJYtEcVOLS5k=; b=Dy/6wWr+K7inM3iyHyu1EUzxqJjTyDPRH12a4zjLMmokIvYq0z0qSYBkU5kILwXyzaGVG8 x6rCnUu9v65QT3O1OA3NbTLCCT4T3odlhOmn0VJFmXuhrHijGHiUAapKpMgqZcrR7TKvo1 3rbjWkcc+oF6Xms3mHTf21B3UTj4i837/NH/84oP/myW/AKLntJORI6evqOKqGeR4z/5SV peCGQ+KsI0g4hE8Cqgu1LXtsuD4k5MRPeK7ckctoHgV+YaEjCOSjwHsLp6biFmCsyYeJn6 5emQRr6ikoeCiPTib74fa2YmYXRK9c5JGqh10uw5kIsndZRiYWxKIuYS1sG7NQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678195704; a=rsa-sha256; cv=none; b=fm2SpQRpBg3IXqbBBrjIkQtbBlrijbFjC1tGHlZot+efQu3diTcFyiIJXlqcIDrkMDfAHU GbExguvkF3cLp3sISx2Z7nKGdWP3471G/ngszJlO/A2Wa3clPSReNCfs5gK7fE8dRz5e1P zC1UYhD026l+5IVdyKMBsVOe5D7ymUmZdrruq1duKkX/ma8gHv8vJ1dxhV3/YtvSAW55Ub IR9lPdDMC1+ObkrL38gCN31SHpnN6fEZPC9v6FrAneI2o/GamEX8ysE1o/95sD8StFZ4Px /sBxSSk3SXeE1fh7Wh+UbTPhX8oCGDiHxAa1a7dUEGQNeJ4xqFgsm2ucV2JQAw== 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 4PWGVJ4005zlg8; Tue, 7 Mar 2023 13:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 327DSOxW077991; Tue, 7 Mar 2023 13:28:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 327DSOhg077990; Tue, 7 Mar 2023 13:28:24 GMT (envelope-from git) Date: Tue, 7 Mar 2023 13:28:24 GMT Message-Id: <202303071328.327DSOhg077990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 4182ec520407 - releng/13.2 - netlink: fix OOB read in genetlink List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 4182ec520407a702ec2b670d597ca4f7d80ef58b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4182ec520407a702ec2b670d597ca4f7d80ef58b commit 4182ec520407a702ec2b670d597ca4f7d80ef58b Author: Alexander V. Chernikov AuthorDate: 2023-02-18 17:24:59 +0000 Commit: Ed Maste CommitDate: 2023-03-07 13:28:06 +0000 netlink: fix OOB read in genetlink Reported by: Coverity Scan Approved by: re (cperciva) CID: 1498863 (cherry picked from commit 8f7455a9265f4952f885b06c08c57fcce6f16e5c) (cherry picked from commit d9d596bb2ce04bbec5ea811342efd4216c1fc2a3) --- sys/netlink/netlink_generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c index 066379e2afae..a16fdc312daa 100644 --- a/sys/netlink/netlink_generic.c +++ b/sys/netlink/netlink_generic.c @@ -267,7 +267,7 @@ genl_handle_message(struct nlmsghdr *hdr, struct nl_pstate *npt) int family_id = (int)hdr->nlmsg_type - GENL_MIN_ID; - if (__predict_false(family_id < 0 || family_id > MAX_FAMILIES)) { + if (__predict_false(family_id < 0 || family_id >= MAX_FAMILIES)) { NLP_LOG(LOG_DEBUG, nlp, "invalid message type: %d", hdr->nlmsg_type); return (ENOTSUP); } From nobody Tue Mar 7 16:37:45 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PWLhn69mWz3wLwf; Tue, 7 Mar 2023 16:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PWLhn5bfKz4Gyy; Tue, 7 Mar 2023 16:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678207065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9mDKwpbkvlNMRqH+/Qy0qRQ4VoyRp90BEHEJ8aIH8UE=; b=V9LGGdI/6plgSw3UKexraQsJEQZckdOHSghHIsinWEeFqnv1EuHFA9e/I3C4fbxrHucz4e p9zH53Lo7whOIIPTmHiWeh84wN8c4mQ4r/BI7br7SOfkHTAhJ3v2kt9GYqKODTKRDUOK4S Q6CqzSMbK5d07MTjN0Op3LHtAV9lTU2IiQxvM8WiUsKwxG+sU+rvXKAbH2kYboICmEjtBS q1mAhrbeudyxAHPVg5CFTTlwLI2QA2ULS/5Nc59UjJm5v/+QE3Ana8XGKtUAJLLYxiFlAq RpaffkjCb7N0CBvbR1X/n+KRpIwYeHwbX1lnXxeRy4Mob5qyYUMh1tOmeS9ZTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678207065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9mDKwpbkvlNMRqH+/Qy0qRQ4VoyRp90BEHEJ8aIH8UE=; b=cuUT98SUM7VUDxnuGe/D18vcMcsoPtGeigsioFiy8tNAlor05QG2AUCxR38GTHXv/qD03C m+yiKgJlw5aWNGAfIipa9zTkmCs1yO60YtbYEnif2Sce3rh+69jRh9rGs39rB/LKYQaeNz +rjEzxROjo1TDjUvB9K0qJ69aIM6i9u6DhKVrmyoE3z2z3OezKypNhePhAnZTYI+ornJ9e kWm/b7h6XeZatgRasLXUux6zlzjUaZX23PuvTpUf/HN3UiBzTE7G1Xef7giFMa/CiXS4RI OdT1dK3jZRBX4HcivBTBtrBjnwiF6ht5ctVWe/RS4syLnkKmLP0sZ16/qIDF2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678207065; a=rsa-sha256; cv=none; b=Qe2spW5JFjRAhUEBGFmaO3gacWJuejsXphcCFF3W8maIdlRzUO0ok57NGS2Ev0xZvC59xL Wj6snQxDtPh6EoUXm7Y06FEscNp7RTDa2G1DQ8nStj0l5T6/Y2NL5s9BKGBv98SlSEqdZl Hw8lg6ZQm/Lr9gfIn6Un6uYbaugMDqIV/kzHgOszu0q2w1XRywyOZWthrUlrFRjkyume6R G4uAg7BN6x9yD4Qjvfdy37QQQTuuEi+CpGVteQvl8RzCREVlrnBmXg6MtOPtSZ3EPFBPa0 9ujlnaiCZsFAtjp0de2jp/4IOwlAYNpxOmQPsg511zc+y3oh+yG4arHLvsxnFQ== 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 4PWLhn4d6GzrHH; Tue, 7 Mar 2023 16:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 327GbjEx090540; Tue, 7 Mar 2023 16:37:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 327Gbj8i090539; Tue, 7 Mar 2023 16:37:45 GMT (envelope-from git) Date: Tue, 7 Mar 2023 16:37:45 GMT Message-Id: <202303071637.327Gbj8i090539@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 96064e0924d8 - releng/13.2 - amd64: Avoid copying td_frame from kernel procs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 96064e0924d8e456f50252205bf3b221cb2e835c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=96064e0924d8e456f50252205bf3b221cb2e835c commit 96064e0924d8e456f50252205bf3b221cb2e835c Author: Mark Johnston AuthorDate: 2021-09-25 14:15:31 +0000 Commit: Ed Maste CommitDate: 2023-03-07 16:36:02 +0000 amd64: Avoid copying td_frame from kernel procs When creating a new thread, we unconditionally copy td_frame from the creating thread. For threads which never return to user mode, this is unnecessary since td_frame just points to the base of the stack or a random interrupt frame. If KASAN is configured this copying may also trigger false positives since the td_frame region may contain poisoned stack regions. It was not noticed before since thread0 used a dummy proc0_tf trapframe, and kernel procs are generally created by thread0. Since commit df8dd6025af88a99d34f549fa9591a9b8f9b75b1, though, we call cpu_thread_alloc(&thread0) when initializing FPU state, which reinitializes thread0.td_frame. Work around the problem by not copying the frame unless the copying thread came from user mode. While here, de-duplicate the copying and remove redundant re(initialization) of td_frame. Reported by: syzbot+2ec89312bffbf38d9aec@syzkaller.appspotmail.com Reviewed by: kib Approved by: re (delphij) Fixes: df8dd6025af8 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D32057 (cherry picked from commit ca1e447b1048b26b855d7f7fbcdad78309e4d741) (cherry picked from commit cf25fa7f31e7bda9b8aa20757659524db9c4ef97) --- sys/amd64/amd64/vm_machdep.c | 48 +++++++++++++++++--------------------------- 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index e308f4a44b3e..c9c498180c7e 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -193,6 +193,24 @@ copy_thread(struct thread *td1, struct thread *td2) td2->td_md.md_spinlock_count = 1; td2->td_md.md_saved_flags = PSL_KERNEL | PSL_I; pmap_thread_init_invl_gen(td2); + + /* + * Copy the trap frame for the return to user mode as if from a syscall. + * This copies most of the user mode register values. Some of these + * registers are rewritten by cpu_set_upcall() and linux_set_upcall(). + */ + if ((td1->td_proc->p_flag & P_KPROC) == 0) { + bcopy(td1->td_frame, td2->td_frame, sizeof(struct trapframe)); + + /* + * If the current thread has the trap bit set (i.e. a debugger + * had single stepped the process to the system call), we need + * to clear the trap flag from the new frame. Otherwise, the new + * thread will receive a (likely unexpected) SIGTRAP when it + * executes the first instruction after returning to userland. + */ + td2->td_frame->tf_rflags &= ~PSL_T; + } } /* @@ -236,23 +254,9 @@ cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags) mdp2 = &p2->p_md; bcopy(&p1->p_md, mdp2, sizeof(*mdp2)); - /* - * Copy the trap frame for the return to user mode as if from a - * syscall. This copies most of the user mode register values. - */ - td2->td_frame = (struct trapframe *)td2->td_md.md_stack_base - 1; - bcopy(td1->td_frame, td2->td_frame, sizeof(struct trapframe)); - /* Set child return values. */ p2->p_sysent->sv_set_fork_retval(td2); - /* - * If the parent process has the trap bit set (i.e. a debugger - * had single stepped the process to the system call), we need - * to clear the trap flag from the new frame. - */ - td2->td_frame->tf_rflags &= ~PSL_T; - /* As on i386, do not copy io permission bitmap. */ pcb2->pcb_tssp = NULL; @@ -602,22 +606,6 @@ cpu_copy_thread(struct thread *td, struct thread *td0) { copy_thread(td0, td); - /* - * Copy user general-purpose registers. - * - * Some of these registers are rewritten by cpu_set_upcall() - * and linux_set_upcall(). - */ - bcopy(td0->td_frame, td->td_frame, sizeof(struct trapframe)); - - /* If the current thread has the trap bit set (i.e. a debugger had - * single stepped the process to the system call), we need to clear - * the trap flag from the new frame. Otherwise, the new thread will - * receive a (likely unexpected) SIGTRAP when it executes the first - * instruction after returning to userland. - */ - td->td_frame->tf_rflags &= ~PSL_T; - set_pcb_flags_raw(td->td_pcb, PCB_FULL_IRET); } From nobody Tue Mar 7 16:55:38 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PWM5Q55Jlz3wMps; Tue, 7 Mar 2023 16:55:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PWM5Q3BbBz4JgH; Tue, 7 Mar 2023 16:55:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678208138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d441T08c+0uhK8RmB5p2L8ic1lPuDfRw7L77F5zNS9U=; b=NjQlz7wSAD/8eP/DZ7hvAt5SyCepHmuf2bg9YHZHE65EzzX8zbQTALq+Xzkq+YByIfVX0o 2lan+dsf8Egzsi0unwRa+GQc4Vo4RdoUyUjO0cn6ii6aEePurT1jbopat+hYOfZ0A3DCfp Xx7cXfcc4CRGLjWev5V6hJ776EeR2YQrMOHm13jECkW2XpgYKUmc3L9tBn1RKblz/Kx7q0 vZhWE5cR0sQKzmalOSCZ3vplswG+MMVNkN1pRm5b4e3B+ozUgr9uYODRSjcLgwsli9lLvx oMRO9kJfcLpGYYVvIpckS/nGPGGyxg1MnG3P107VlFl2/im17xKnxVmFalbe/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678208138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d441T08c+0uhK8RmB5p2L8ic1lPuDfRw7L77F5zNS9U=; b=uJugee9ezYPCszlo2qWul+HpKHiI7Lo7go/X/2zKRpiFYQAWLsfns7yx3Nc9WKvfF2Gu4p WtdsLwjq2716fQhaGxESBD4yTkBc26MnLNNm4lTIA0Dp3BqZ3E7JlpRx/p1U2IFPRQw8Cg OZz7KgCTpw5bl75T+6meOnb7fTATLKB8e1JxKbTwPizSw6XDlF3EiTnyrw6UzP4Lk6jp5D EaM5T2Ri/O0h2mK6B9eRLUyUfue25wvdsW//0izIP8oDbDJzlAfjNUcvYHD1X5jzmb81fp Uj3jN5AR5zO/lYA1+kDqwde1yM7HIs3Q9eeXQUzwcN73KboHxAW11SBPr6uqcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678208138; a=rsa-sha256; cv=none; b=LXAfO83rIXnUfxT7G6aRylJubwr82tJuCmP9IzDAFBy8C1j+1lCOm8ctyWI6NSGligrG+I 15I9hSZZ2kW1HG75YhFINks8cP20vBj125w+R2+3Z2vBtwzXZ6gXIt26Ce2ts2q5RLf76A Lf3HsfsnGO5r8GQ5jeP9cPdK7Q6465ePtCYmru72jzlFvnAoO9BtP9wLE07nAvMXd/8Kny 40R0f5QnW9y6TR65ohAVVcQoP1QoVebWlxzFCJx4OYOqJTRwu0vPg12F+gpN2zR6ozXWYp fkfBZPhoIjhuUGOfOquj7Soy0+pb4S7YnGJYRRfngjNa+q++XIo8XcPM0vPejA== 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 4PWM5Q2G7xzrb4; Tue, 7 Mar 2023 16:55:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 327GtcZg022827; Tue, 7 Mar 2023 16:55:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 327Gtc8I022826; Tue, 7 Mar 2023 16:55:38 GMT (envelope-from git) Date: Tue, 7 Mar 2023 16:55:38 GMT Message-Id: <202303071655.327Gtc8I022826@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 5d93b49489e8 - stable/13 - intr_event(9): fixup Nm field List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5d93b49489e8bf38c1444dbb76598cb3c590266f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=5d93b49489e8bf38c1444dbb76598cb3c590266f commit 5d93b49489e8bf38c1444dbb76598cb3c590266f Author: Mitchell Horne AuthorDate: 2023-02-12 18:58:25 +0000 Commit: Mitchell Horne CommitDate: 2023-03-07 15:58:28 +0000 intr_event(9): fixup Nm field (cherry picked from commit a4532c4c5a866c90de4967d516241149892cca2e) --- share/man/man9/intr_event.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/intr_event.9 b/share/man/man9/intr_event.9 index 70ea1e1bfc43..58322caee604 100644 --- a/share/man/man9/intr_event.9 +++ b/share/man/man9/intr_event.9 @@ -36,7 +36,7 @@ .Nm intr_event_add_handler , .Nm intr_event_create , .Nm intr_event_destroy , -.Nm intr_event handle , +.Nm intr_event_handle , .Nm intr_event_remove_handler , .Nm intr_priority .Nd "kernel interrupt handler and thread API" From nobody Tue Mar 7 16:55:39 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PWM5R51vmz3wMxB; Tue, 7 Mar 2023 16:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PWM5R47ZHz4K1N; Tue, 7 Mar 2023 16:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678208139; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z71O2m1rdn8p7zZppHQoin5Sqbi/lW7A6m6YB8pajQ4=; b=A4luE0RUMoIBDwZzknemS/XVG6b+mgJcggnfLdo+UGpZXjlkiycYfXvbr8vP1toNoBTq4n 4jEuKANBDJ8LAQnzUjzblMi8N83Pa/+b1BiLdY7hU5G6t8fP7+9dnKCvBSUhhj6PH7zlGx UkrHujayijU9Ga+vx3bXZDZU9UqTrYbg0gaopjaYXlVi3MdGV3qRvfeGPBX6kKxUAut+yJ d59vJrxIYdr+g9KRHHdUiuDjVaa+xkXZ5v8lv1bIBNLJ6QWL8OCz59GWwjsiPOilzlFD0I IHapQhvuFmhPSP3soCBSFCp2DWHc/xPhQJu8VtgLYEJ2hksNiwuMsDlehM5fNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678208139; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z71O2m1rdn8p7zZppHQoin5Sqbi/lW7A6m6YB8pajQ4=; b=DPkRADZOW5EFgWwY6VVrg/SpASoOfgry7kBix/gyMxzEcZM9Tp9YCeohoDiEgmcuO/uy93 gK3wffSkrEnxsZvKvsy89j0uTo5YVkltz8Pbiz2FDXlAB3lyDow/fHYR8nb2MGcV/ITWoK emAFio1BsrpunCrLvRXICYDY/hzPZdHUUHGMARhkT7jedwivpjYcyVQg65eLuUdzdAisaH jh2U98zrMS9b4ajooKB7mlwVnzaM+2S4f1cM+79yq2OjGYxCLNzgMhXBlgIdC65SqCSL14 uGFgpXkFqWr0qqxUrwZghiR7ZYYAHOAHZ9UwZgCV2mJ14kAzBqH97KUzn6Eiaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678208139; a=rsa-sha256; cv=none; b=BS8sc/1OGxSB/68qVfp4oArmpoXMZu9lkZ6vXFOXQrpH7G9O7NgwLFB1E+V6o2eTR7Qg0v i/s7dzFLlyqOknlZVQtUJNrTJcHQbwFhwMxaiZRTJX7IRvHoVf7XQqmaNVwUrS9eM13LMP yubEHwRU+kqgsPyR6rFJRjNk8X8pfT8TUM41FXqZkGsiOxIBR6uzNVbCt8bmcuKbCErV/F 2+v52jAdwD+RsGYi63vEbAlcLmhNn0F+PWNbDTzS23TMSMImZZTSsO20pZwcWkLUPpYBTF Hs5CJjyVlrwuRete9qHocehpM594OMS/Usit6qiWioK//AjBfjZrrCrqY1SjYA== 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 4PWM5R346JzrPZ; Tue, 7 Mar 2023 16:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 327Gtd8C022853; Tue, 7 Mar 2023 16:55:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 327Gtd5c022852; Tue, 7 Mar 2023 16:55:39 GMT (envelope-from git) Date: Tue, 7 Mar 2023 16:55:39 GMT Message-Id: <202303071655.327Gtd5c022852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 3ca605d19b2e - stable/13 - powerpc: remove nexus_get_cpus() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3ca605d19b2e8a305452d1450d031945881c4578 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3ca605d19b2e8a305452d1450d031945881c4578 commit 3ca605d19b2e8a305452d1450d031945881c4578 Author: Mitchell Horne AuthorDate: 2023-02-13 17:38:41 +0000 Commit: Mitchell Horne CommitDate: 2023-03-07 15:58:28 +0000 powerpc: remove nexus_get_cpus() It is identical in functionality to root_get_cpus(). Reviewed by: jhibbits MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D38494 (cherry picked from commit 6606096986222bac46e6f97d6ca47fc14978d172) --- sys/powerpc/powerpc/nexus.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/sys/powerpc/powerpc/nexus.c b/sys/powerpc/powerpc/nexus.c index b3fe5a3e1527..1c6bc275ebdd 100644 --- a/sys/powerpc/powerpc/nexus.c +++ b/sys/powerpc/powerpc/nexus.c @@ -77,8 +77,6 @@ static int nexus_unmap_resource(device_t bus, device_t child, int type, struct resource *r, struct resource_map *map); static bus_space_tag_t nexus_get_bus_tag(device_t, device_t); -static int nexus_get_cpus(device_t, device_t, enum cpu_sets, size_t, - cpuset_t *); #ifdef SMP static bus_bind_intr_t nexus_bind_intr; #endif @@ -103,7 +101,6 @@ static device_method_t nexus_methods[] = { #endif DEVMETHOD(bus_config_intr, nexus_config_intr), DEVMETHOD(bus_get_bus_tag, nexus_get_bus_tag), - DEVMETHOD(bus_get_cpus, nexus_get_cpus), /* ofw_bus interface */ DEVMETHOD(ofw_bus_map_intr, nexus_ofw_map_intr), @@ -190,24 +187,6 @@ nexus_get_bus_tag(device_t bus __unused, device_t child __unused) #endif } -static int -nexus_get_cpus(device_t dev, device_t child, enum cpu_sets op, size_t setsize, - cpuset_t *cpuset) -{ - - switch (op) { -#ifdef SMP - case INTR_CPUS: - if (setsize != sizeof(cpuset_t)) - return (EINVAL); - *cpuset = all_cpus; - return (0); -#endif - default: - return (bus_generic_get_cpus(dev, child, op, setsize, cpuset)); - } -} - #ifdef SMP static int nexus_bind_intr(device_t bus __unused, device_t child __unused, From nobody Tue Mar 7 16:55:40 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PWM5S5fgLz3wMrN; Tue, 7 Mar 2023 16:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PWM5S5B6Kz4JhR; Tue, 7 Mar 2023 16:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678208140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PjWOdRy4WypkAwp+5zjYO2Hz+z3CDxhkNaC85KiEaGE=; b=VVwezTtG5NMy4mdqHv7I/eWMW2dlE+NH+wTIer8c5KZ/ghJzOB9QHDskFf9/yxdMXqa0DM S1VoOwiJApNjrPySpE+RVAC9fjsV90qmN5EQVLvDmvf1QaQUeSzUAM96HwjGN+ogiBVszB FHX84dWeeVO9+qPZEwU+eLsn2tOE/ig7N0B+rglFDNLPWlQ30oj7lgsqsqtZjzVceTEKUT 8GixE7Nbubmauwkev8i5EzAbcL5QwJvtHpeBxmXhyHpmOtYPKTyl8d0w1OKq5JHX33e7ZD 5nxXjRFLSOxn4g/wRRwNAd5RwrqnXKTOUjgfbUTNal6lWExZQoDa0EhTWXzhFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678208140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PjWOdRy4WypkAwp+5zjYO2Hz+z3CDxhkNaC85KiEaGE=; b=O0CiqhyK6YoWYQVEZZpf2In6nDSm75AYbbBfjhDSlQy0tpX4zmbbwvlzQoCIgTDbHwCNB2 7cFnAeI4Ed4zAKEfezVdWVHXl5L9dMNOtHD+1cNw5iOmmLIIitJv/j6zJxM7yvP2+ZfriY sSdE7NosAWediq6aWKiAJORh6myA2ZTBlJKZd/+4vuwV9GDOeuQj0K7ExmFt+Rfp4JxA7U +6wVKJ33sa8BcgF1G6G3UHr9aL+S162fzXgIYCMbYLw7cbxF4/KEtFkSDJvXVVlx057AZE 5gjesVdkkuC48qzQQiRKg1+AnpkKYRsicH++qfZ1PU0dg2sk0xH8YPJf1WhqzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678208140; a=rsa-sha256; cv=none; b=VGrx0J/qcnEdnCQ9r7AEcPoperlFDa7o6xzonRDjcpRPB9bVn5c7o5jscufVzMcL7gJt48 O6B8wCm6yALbY0FMYRganwVrDo0htWihB0xb+9IB8HpJKCcBTcW5VqsEtaRSXkCLTNYq4y bFqxwAayn1kYp6XBt3WLkYwsvnuwuXSQLIumMjUR0MSG+kmedMKH2yhp9m9f8hUOI1yKob DX4jLkJFGrxKvwhnyZPE/6FfARkf11oJ3d1+zsQ4hePtkScduuT8gWqmC4zVyveU7WixEs udmFhuut0YTBWrlGcOJpxiEDy9lLlQwxs5G9aJFqJopwNVSbIzMMJ1FR3Mar6A== 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 4PWM5S40WczrPb; Tue, 7 Mar 2023 16:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 327GteR5022872; Tue, 7 Mar 2023 16:55:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 327Gte0u022871; Tue, 7 Mar 2023 16:55:40 GMT (envelope-from git) Date: Tue, 7 Mar 2023 16:55:40 GMT Message-Id: <202303071655.327Gte0u022871@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 7b37e83e4c8f - stable/13 - lockmgr: upgrade panic return checks List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7b37e83e4c8f4e76301834346b2870ef79880d5e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=7b37e83e4c8f4e76301834346b2870ef79880d5e commit 7b37e83e4c8f4e76301834346b2870ef79880d5e Author: Mitchell Horne AuthorDate: 2023-02-22 15:11:15 +0000 Commit: Mitchell Horne CommitDate: 2023-03-07 15:58:28 +0000 lockmgr: upgrade panic return checks We short-circuit lockmgr functions in the face of a kernel panic. Other lock implementations do this with a SCHEDULER_STOPPED() check, which covers the additional case where the debugger is active but the system has not panicked. Update this code to match that behaviour. Reviewed by: mjg, kib, markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D38655 (cherry picked from commit 9a7f7c26c5b280924072e2d9947ad39ef4cc022c) --- sys/kern/kern_lock.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c index e90c55947676..d9713ec06473 100644 --- a/sys/kern/kern_lock.c +++ b/sys/kern/kern_lock.c @@ -595,7 +595,7 @@ lockmgr_slock_hard(struct lock *lk, u_int flags, struct lock_object *ilk, #endif struct lock_delay_arg lda; - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) goto out; tid = (uintptr_t)curthread; @@ -781,7 +781,7 @@ lockmgr_xlock_hard(struct lock *lk, u_int flags, struct lock_object *ilk, #endif struct lock_delay_arg lda; - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) goto out; tid = (uintptr_t)curthread; @@ -977,7 +977,7 @@ lockmgr_upgrade(struct lock *lk, u_int flags, struct lock_object *ilk, int error = 0; int op; - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) goto out; tid = (uintptr_t)curthread; @@ -1038,7 +1038,7 @@ lockmgr_lock_flags(struct lock *lk, u_int flags, struct lock_object *ilk, u_int op; bool locked; - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) return (0); op = flags & LK_TYPE_MASK; @@ -1101,7 +1101,7 @@ lockmgr_sunlock_hard(struct lock *lk, uintptr_t x, u_int flags, struct lock_obje { int wakeup_swapper = 0; - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) goto out; wakeup_swapper = wakeupshlk(lk, file, line); @@ -1120,7 +1120,7 @@ lockmgr_xunlock_hard(struct lock *lk, uintptr_t x, u_int flags, struct lock_obje u_int realexslp; int queue; - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) goto out; tid = (uintptr_t)curthread; @@ -1312,7 +1312,7 @@ __lockmgr_args(struct lock *lk, u_int flags, struct lock_object *ilk, int contested = 0; #endif - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) return (0); error = 0; @@ -1721,7 +1721,7 @@ _lockmgr_assert(const struct lock *lk, int what, const char *file, int line) { int slocked = 0; - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) return; switch (what) { case KA_SLOCKED: From nobody Tue Mar 7 16:55:41 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PWM5T6Xs1z3wMmS; Tue, 7 Mar 2023 16:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PWM5T5qcwz4KCl; Tue, 7 Mar 2023 16:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678208141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ae10gqyj+iKkBZcf9npojksHN0d9f4ZVJXfeqUc4QzI=; b=hUdHBMWid3FdvHtAWXZWoFsxy+5nyqkaeeJDEDJO6JcuFHcdT43QghGsbFAY+Qw4Beih+T z2G6vhRuvloILxZYEWlcjKoiZMF6JS0qSl7iBezqEJjCIglq1EJzbTkXbk5ZeIVrd+VAGC o6Kl0rRmdzCgyqy14q6rbTOsD3tJIZ0ec3xRCP9RsINs002jo6M312YTk5Yb1Q4rDF12/l yfLN4pWb7ebw0YXl8aW9sLfzYVclpZit2oyVZNyGY3Q8Ef2sOCq7womo87iyLmkunCKLmb x9x5r+gjqdOl00O8dvKq5fTONndzOh3gMMPsr9KHapig/vcpxVBKjTScvnnG4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678208141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ae10gqyj+iKkBZcf9npojksHN0d9f4ZVJXfeqUc4QzI=; b=N6d/CYhW5fshiNsDMNtJD3obpOS1/tmRG5iV6XcNq3AWZHkbVqOAaNZSEgef9L97ch2LpP NQ/NLDHKEssKu865g74gSUtvcnHjdfEDywHwYQbT0bhsP6b7xurQAgG6aYsknmnnD45Lvj 8l/FpmEZ7OHfbsH6JStAag7MZ5Ce7992bwkyvp9XVrTAmaaZNoJgIZRpiZOA713UenPBcC O1GZQrtP3/eAfu9PcZiPIy/g6zsh86fyuZp7RFZJV8/fKIILEK0LDTmeFB315+6kFxp7CB 1/B2AnN06J8+AUTUYc+97qa4z/KpGueYoSc8DNsqD/E80+hHucZde+z82/bBaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678208141; a=rsa-sha256; cv=none; b=NRwduBgMXnO4GvF1rBX48B7nPW8qvR2mK7nJ4m7KhIERfCzGbMVsTtmlpfjIAmcFJyji4s 3ggFicGa8rRDCVudGmNcSTTYYzSZP6OTECm2GnUR+YTufo5K6SQELfig4S29cgbBuLyqOP awhk5hTGneV4fJSadmTkbKBFp+0vt4L0Al7HKa5z43Wsu72wg1/QNi4wjumhMfUTflE8gv JKJB5zyD/5jnI+vGWrSJdeK/0Swef+cJnpiXON1m2BWZPz9bosAKdtfLySmpVUA5yCKBIT sBQ7BB7zG9L53DAaVkOORuGQcFoztQ9fI7dROMgeETZ6A9QwAYc3tpLsPOoL5g== 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 4PWM5T4wB1zrMJ; Tue, 7 Mar 2023 16:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 327Gtftl022891; Tue, 7 Mar 2023 16:55:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 327GtfdI022890; Tue, 7 Mar 2023 16:55:41 GMT (envelope-from git) Date: Tue, 7 Mar 2023 16:55:41 GMT Message-Id: <202303071655.327GtfdI022890@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 5b6edfc577fb - stable/13 - bcm_dma: attach at an earlier bus pass List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5b6edfc577fbb4e9703c112713c7fb472e144346 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=5b6edfc577fbb4e9703c112713c7fb472e144346 commit 5b6edfc577fbb4e9703c112713c7fb472e144346 Author: Mark Millard AuthorDate: 2023-02-17 20:30:35 +0000 Commit: Mitchell Horne CommitDate: 2023-03-07 16:55:01 +0000 bcm_dma: attach at an earlier bus pass The sdhci_bcm driver attach routine relies on bcm_dma already being attached, in order to allocate a DMA channel. However, both drivers attached at the default pass so this is not guaranteed. Newer RPI firmware exposes this assumption, and the result is a NULL-dereference in bcm_dma_allocate(). To fix this, use BUS_PASS_SUPPORTDEV for bcm_dma. PR: 268835 Reviewed by: mhorne MFC after: 1 week (cherry picked from commit 9873b171697033f9f19608d98bcd1c16cacb92af) --- sys/arm/broadcom/bcm2835/bcm2835_dma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2835_dma.c b/sys/arm/broadcom/bcm2835/bcm2835_dma.c index cab8639bb607..af86647704f6 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_dma.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_dma.c @@ -766,5 +766,6 @@ static driver_t bcm_dma_driver = { static devclass_t bcm_dma_devclass; -DRIVER_MODULE(bcm_dma, simplebus, bcm_dma_driver, bcm_dma_devclass, 0, 0); +EARLY_DRIVER_MODULE(bcm_dma, simplebus, bcm_dma_driver, bcm_dma_devclass, 0, 0, + BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE); MODULE_VERSION(bcm_dma, 1); From nobody Tue Mar 7 16:55:42 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PWM5W0Q4Cz3wMk4; Tue, 7 Mar 2023 16:55:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PWM5V74fyz4KBX; Tue, 7 Mar 2023 16:55:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678208143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BN0OU25KqWaZpvshgZFKwOxFxZJdF4i4F65Jt/Tfsv4=; b=XGL3rmxzXea3kUXaPZRpUbWxMWLP1GLLfGCxqOHcOVGKamoPzkI0S4SyBDlP/NLNOnNn4V g5ws1aR2Uk0+dtTb7crZI3ptijx8KRCeYma8EcFZFLtznifICVSthtwQ4RDXuv1QutoPdB anyTe/RTFmox24DeaI8/d4A4f/vCOJY+jysKCoxd+S5ZfzEaNwiGMb/is+K4zNSbuNXQLp I0Pt+iEXqJc3pdXVp5MjaDsPVaHXLPYIGQzURKgGev00tc1wIEToGFlVBaxNf65Bt9APXj +ljGRSIizml95CeBLAFFN3rHGlVG0F2ZeJADKf4XjwPe3txrdQ4z2QNkwX+1ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678208143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BN0OU25KqWaZpvshgZFKwOxFxZJdF4i4F65Jt/Tfsv4=; b=JwVZueP4UAuSJJ8fjLMYU/9hCz1y8yBBqU/dzylf+YXKBx7DLc9N4N/rcKQayUfF+x+Rha V6AHYdeKdX0I6RcDVlTG/aK3VfJ2CC/CibJqEuPElSAgpUvSE4wPE1gk5JBcqv3ULdSBrs XkZmEH1RWFm/AzoNbKhxJNs1AoYFgv/Qy4+PYP/0NNgLeDvAWUxO1tm6fUpSVQYu8mdmIx xQI/411xyPocTqItUKP50kLV/m33VTUw4yXBHhEyQX57498i1/BnUPeJis9cLprU7HPTxY sqpZlD1cNUMkp8BveH+l+n+EXnKfa1tmjGNDNp6a+PYb4nKjUoX0c3CnKzV7ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678208143; a=rsa-sha256; cv=none; b=HI7I15KJL8/POm52vqpgktjfsruo9ijoUHWZKXI1GHhMePRujMGmS35akv/ywFMKYy3RqH 8UsOfiuf3/fDEGDWAGAAjwucQm8eknVI/Kd1F1hID8cc/gJVrJwDO3KQwyyT9CzHQppdop LRwKncx4br0FjXAgNrVvXxxWR3TMci8R3gEhGXXm+vT43XVPnuNt2I0PgUr56v6M8dOUzz Hbq+ioAwe2GAxWMRHv2cuS31tBdpYFg0S4AujorIyAAnO3XxkmCWvwjH2Exl4lf2Rtu09r Se2Oh8So4qGoEHv32my4nIx7YlFpEwZPPD0iN3k47hYvvgoGmusnCoDvIHd+pA== 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 4PWM5V5rBSzrMK; Tue, 7 Mar 2023 16:55:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 327GtguK022910; Tue, 7 Mar 2023 16:55:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 327GtgZ9022909; Tue, 7 Mar 2023 16:55:42 GMT (envelope-from git) Date: Tue, 7 Mar 2023 16:55:42 GMT Message-Id: <202303071655.327GtgZ9022909@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: aa399ad3e554 - stable/13 - bcm_dma: don't dereference NULL softc List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: aa399ad3e554223b8bf741c3933c38dec92eaf20 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=aa399ad3e554223b8bf741c3933c38dec92eaf20 commit aa399ad3e554223b8bf741c3933c38dec92eaf20 Author: Mitchell Horne AuthorDate: 2023-02-24 17:19:54 +0000 Commit: Mitchell Horne CommitDate: 2023-03-07 16:55:01 +0000 bcm_dma: don't dereference NULL softc This file defines a small API to be used by other drivers. If any of these functions are called before the bcm_dma device has attached we should handle the error gracefully. Fix a formatting quirk while here. Reviewed by: manu MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D38756 (cherry picked from commit 07ccf71451d7377b1a6f3367f738ce7ddb1f2a24) --- sys/arm/broadcom/bcm2835/bcm2835_dma.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2835_dma.c b/sys/arm/broadcom/bcm2835/bcm2835_dma.c index af86647704f6..f596303959da 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_dma.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_dma.c @@ -328,6 +328,9 @@ bcm_dma_allocate(int req_ch) int ch = BCM_DMA_CH_INVALID; int i; + if (sc == NULL) + return (BCM_DMA_CH_INVALID); + if (req_ch >= BCM_DMA_CH_MAX) return (BCM_DMA_CH_INVALID); @@ -343,13 +346,10 @@ bcm_dma_allocate(int req_ch) break; } } - } - else { - if (sc->sc_dma_ch[req_ch].flags & BCM_DMA_CH_FREE) { - ch = req_ch; - sc->sc_dma_ch[ch].flags &= ~BCM_DMA_CH_FREE; - sc->sc_dma_ch[ch].flags |= BCM_DMA_CH_USED; - } + } else if (sc->sc_dma_ch[req_ch].flags & BCM_DMA_CH_FREE) { + ch = req_ch; + sc->sc_dma_ch[ch].flags &= ~BCM_DMA_CH_FREE; + sc->sc_dma_ch[ch].flags |= BCM_DMA_CH_USED; } mtx_unlock(&sc->sc_mtx); @@ -364,6 +364,9 @@ bcm_dma_free(int ch) { struct bcm_dma_softc *sc = bcm_dma_sc; + if (sc == NULL) + return (-1); + if (ch < 0 || ch >= BCM_DMA_CH_MAX) return (-1); @@ -392,6 +395,9 @@ bcm_dma_setup_intr(int ch, void (*func)(int, void *), void *arg) struct bcm_dma_softc *sc = bcm_dma_sc; struct bcm_dma_cb *cb; + if (sc == NULL) + return (-1); + if (ch < 0 || ch >= BCM_DMA_CH_MAX) return (-1); @@ -531,6 +537,9 @@ bcm_dma_reg_dump(int ch) int i; uint32_t reg; + if (sc == NULL) + return; + if (ch < 0 || ch >= BCM_DMA_CH_MAX) return; @@ -558,6 +567,9 @@ bcm_dma_start(int ch, vm_paddr_t src, vm_paddr_t dst, int len) struct bcm_dma_softc *sc = bcm_dma_sc; struct bcm_dma_cb *cb; + if (sc == NULL) + return (-1); + if (ch < 0 || ch >= BCM_DMA_CH_MAX) return (-1); @@ -597,6 +609,9 @@ bcm_dma_length(int ch) struct bcm_dma_softc *sc = bcm_dma_sc; struct bcm_dma_cb *cb; + if (sc == NULL) + return (0); + if (ch < 0 || ch >= BCM_DMA_CH_MAX) return (0); From nobody Wed Mar 8 03:51:57 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PWdfk07wQz3x46c; Wed, 8 Mar 2023 03:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PWdfj6pNNz3ByP; Wed, 8 Mar 2023 03:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678247518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=skwolE4SPNUQzo3X1uGpZj1a29b16VMjgP5klG7WR6Q=; b=ZK2El1tqIpnEty5/kFvlJ1YsgkyCGvqM0o2mpnB/XqlKQUUNVbkPUVA9LeKGLSn8AOC9ZJ uDi9mQZ4qa0epiG2jE0Mw3ZoG9X5pS1mF0UzV3jcRG2UwVk+WH27L8ylPJQ2oKx5tqZ2+q QaaNuhE8LnMwgoHZlv7h49dTySpStBr0K+P8unQUa4fSLMSpSnjbnL4QW8BO4qmsjad6kh 4kpGU93/42htZNTr+D6RVOwj+ucYhZhjf7pal0hKZVKqqGMykYSi7K+Zl3G1z+Ixp8SUPY btYEK2vJOl1cEssI0JSaeBZoGDPggjlafCuZpFuCTdgeNUMyGpENiGcLA9eu+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678247518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=skwolE4SPNUQzo3X1uGpZj1a29b16VMjgP5klG7WR6Q=; b=mK5fGwvp0BQMOldicO8eOpOi6ZuXNIUlgPJiIq9V6wFQ16DllYLm/LOF4Rq2qBl43Q8hHD IS7hPS3edRIcOQrxz96A5c2oIOcKU0MWZCVsUNlyL0jlcqOOlgn1KcxmlR455GGQtDjbda /82eKSOpfrizrdFOnUtplxKLht5o9asATTOFhMLQBYtX27MQa+PjCNQ517rfIsnjnXl2mF RuyMWgNf+8sbB56r/2vFNY2R3TEneSJC6IaLmv9GzyW9xKsvgyd+ZVmwt0R6fLQGvOKMlA aImjcSmyqaIvTQtiWDgh6WJ7ZSEBiZ6AKS/+0KCLPEn4AFA5wDP7nb7GTPcrmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678247518; a=rsa-sha256; cv=none; b=pzJwzbzcCPT7p2oA1Ys8bZiaUH676ezFiSpWcaH2Nzh+nhmgVTkhvDvhLa1eg/nGudjgNx BU/dPB2niMSaid04Ku+oB6YbZKQOX3vdyr8De2xWDs3s4PLVC1gljiBWoxFE8vpuNX6V+O FAcBuLRNuDnfr0W/BcRevi9FThC920zq6a5JL9Kth49gRgxEvykBeINdLIlj1G9e1g6QxZ DdcOncxgZC7tCSQhEjjjSKzERvZF6fnuJisYv17cMf/445Bh06w+6BHL/3ES668+1d39Ci 8AfIq22sGZKs9BrCSjd0HFHQTICdU/XpttJMq0GuXHFKqPvADt2enjZRXro0cQ== 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 4PWdfj5Z4Cz19mB; Wed, 8 Mar 2023 03:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3283pv05007719; Wed, 8 Mar 2023 03:51:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3283pvLR007718; Wed, 8 Mar 2023 03:51:57 GMT (envelope-from git) Date: Wed, 8 Mar 2023 03:51:57 GMT Message-Id: <202303080351.3283pvLR007718@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 139825753995 - releng/13.2 - xz: Improve compatibility with systems without capability mode support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 139825753995ca25a1d40df9f067a1fa4e847d44 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=139825753995ca25a1d40df9f067a1fa4e847d44 commit 139825753995ca25a1d40df9f067a1fa4e847d44 Author: Xin LI AuthorDate: 2023-03-05 09:40:13 +0000 Commit: Xin LI CommitDate: 2023-03-08 03:51:36 +0000 xz: Improve compatibility with systems without capability mode support When the kernel is built without capability mode support, or when using an emulator like qemu-user-static that does not translate system calls, these calls will return a negative number and set the errno to ENOSYS. However, this error does not indicate a real programming or runtime error and is generally ignored by base system applications built with capability mode sandboxing. Match this behavior by making xz(1) to ignore ENOSYS errors when calling capability mode system calls too. PR: 269185 Reported by: Dan Kotowski Approved by: re (cperciva) (cherry picked from commit c237c10a2346dec422233db05b2012afd45363fa) (cherry picked from commit 0cc2deb476bec103ad7c8dbeb650aa2937d6a0da) --- contrib/xz/src/xz/file_io.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/contrib/xz/src/xz/file_io.c b/contrib/xz/src/xz/file_io.c index a5841b370302..3625393a5dc7 100644 --- a/contrib/xz/src/xz/file_io.c +++ b/contrib/xz/src/xz/file_io.c @@ -193,23 +193,24 @@ io_sandbox_enter(int src_fd) cap_rights_t rights; if (cap_rights_limit(src_fd, cap_rights_init(&rights, - CAP_EVENT, CAP_FCNTL, CAP_LOOKUP, CAP_READ, CAP_SEEK))) + CAP_EVENT, CAP_FCNTL, CAP_LOOKUP, CAP_READ, CAP_SEEK)) < 0 && + errno != ENOSYS) goto error; if (cap_rights_limit(STDOUT_FILENO, cap_rights_init(&rights, CAP_EVENT, CAP_FCNTL, CAP_FSTAT, CAP_LOOKUP, - CAP_WRITE, CAP_SEEK))) + CAP_WRITE, CAP_SEEK)) < 0 && errno != ENOSYS) goto error; if (cap_rights_limit(user_abort_pipe[0], cap_rights_init(&rights, - CAP_EVENT))) + CAP_EVENT)) < 0 && errno != ENOSYS) goto error; if (cap_rights_limit(user_abort_pipe[1], cap_rights_init(&rights, - CAP_WRITE))) + CAP_WRITE)) < 0 && errno != ENOSYS) goto error; - if (cap_enter()) + if (cap_enter() < 0 && errno != ENOSYS) goto error; #elif defined(HAVE_PLEDGE) From nobody Wed Mar 8 05:20:28 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PWgcs1n3Lz3x81N; Wed, 8 Mar 2023 05:20:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PWgcs1Jq4z3LbL; Wed, 8 Mar 2023 05:20:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678252829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FtCWEodikZWxfxlaWbiHqlDDylTdiZbAb11+u1RmeAQ=; b=lEtNwr2hwWXAaYe+szFM3wVz8KZ9yefek06GBIgJfT1pGzY9rsHP4LjdiIK8Sqpvp7JohC YdPcFp3WiQ8wlt686XqyY9RxcMbLcykkwn9pnIVXC/ze4mzvVSnaDL793lEsimYyzLiXAS P6Y88tBVR2lvS497nxoSkd6Q7C7Y5ScrH/Zfcb/AnM0KYkD5T6AvE69xCuB83d3mMyeMNf sVdTHg9O/fGJADDSrJLpJrbHtYHjjTd7fwA9+JFOyouWVAWjnX5x4ZjkbHi0aO1qbfNlXC krXwlTErPAasrrhzSfJrvfyl0DSHWA9M2+ZWggQ7iJ8mUKiwSFIRYA0N7CFRwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678252829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FtCWEodikZWxfxlaWbiHqlDDylTdiZbAb11+u1RmeAQ=; b=mPKjUFMbMRwzmZ5biZyqq/NpXAJTXDh4dm0eTPsHwVyFLbIjm4mCKeKY0wUURxXj8PKFo0 LT1SGTbH6huEakDRuNR6ygRHVYzgVirjGnTyiB88U8y87S/9dJSHjs/SB+qrj2XRRIHlUI vJESdESzxaXFH71dz7hMhTQ8oTAmo+6yDtPWq+bTXTP1JkdLn5GJ9xC3rxE8c5oVMW5Vhg 6mu4wCH4llcB9GneebmRHpMG65GRRXKlje7z+BIfoRhebCPuNa0QI+gKjRHFo5ABzX8m51 S0EK7weKr4W1DMsqLFchSlDE8H0wEUiFmPWj95Aa5a+eKpQBOYHEPF8Ws5pzVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678252829; a=rsa-sha256; cv=none; b=p6MK4eQ0Lpt1p8vEh0XQgysOqWNHPa8bzvf3YDifL9chfKdVqeaUnq8Hm9WT/UD9bd2e3n ATymeEI/uYEtyVKQ1hAuyQvkF/Yja1hgwExJw3VqfqOGJnp+s8U7/0mJU/KeN/KMXoHGzg ZoK2iiqiII2P9UejoGT0cdkTaAE3zdc0RRo4sMwMcuzc+uQ2wXRZ4KpD240y7dudSEo5nK khGx6oFLuzkMcmjvelsvYrtdZSzeELjXiNJqcSaFBcC6qlHk63/Bk4PTxelvOX3tfl/9be M2XRkBappNsqNWKsosT0/Dj6e0ZwDjGhlAxM32VaJWZ0gNBCyiP+0J4Ekc8vDw== 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 4PWgcs0Mx1z1C2n; Wed, 8 Mar 2023 05:20:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3285KSex054190; Wed, 8 Mar 2023 05:20:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3285KS3t054189; Wed, 8 Mar 2023 05:20:28 GMT (envelope-from git) Date: Wed, 8 Mar 2023 05:20:28 GMT Message-Id: <202303080520.3285KS3t054189@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 790dc4d825c9 - stable/13 - linux_80211: Don't dequeue lsta if not queued List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 790dc4d825c910c8a2eda49fe9e6dd827519f0f4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=790dc4d825c910c8a2eda49fe9e6dd827519f0f4 commit 790dc4d825c910c8a2eda49fe9e6dd827519f0f4 Author: Colin Percival AuthorDate: 2023-03-05 20:10:57 +0000 Commit: Colin Percival CommitDate: 2023-03-08 05:20:05 +0000 linux_80211: Don't dequeue lsta if not queued This fixes an instapanic when restarting wpa_supplicant on my laptop's iwlwifi device. After this change, iwlwifi enters a nonfunctional state if wpa_supplicant is restarted, but "service netif restart wlan0" is enough to get it working again. releng/13.2 candidate. Reviewed by: bz MFC after: 3 days (cherry picked from commit 3689f8aeab82150da6789be87b6c2f9385810c23) --- sys/compat/linuxkpi/common/src/linux_80211.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index d0a3b4b8586a..06b52ebaec88 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -174,10 +174,13 @@ lkpi_lsta_remove(struct lkpi_sta *lsta, struct lkpi_vif *lvif) { struct ieee80211_node *ni; + IMPROVE("XXX-BZ remove tqe_prev check once ni-sta-state-sync is fixed"); + ni = lsta->ni; LKPI_80211_LVIF_LOCK(lvif); - TAILQ_REMOVE(&lvif->lsta_head, lsta, lsta_entry); + if (lsta->lsta_entry.tqe_prev != NULL) + TAILQ_REMOVE(&lvif->lsta_head, lsta, lsta_entry); LKPI_80211_LVIF_UNLOCK(lvif); lsta->ni = NULL; From nobody Wed Mar 8 05:51:57 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PWhKB0v0Wz3xB7T; Wed, 8 Mar 2023 05:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PWhK96sQgz3Q7f; Wed, 8 Mar 2023 05:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678254718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iAa/+iwxxfl7h1OJmvPgs7CcXmODerKp4odi0a+VdTg=; b=OvR0slWd/MD/K3Y6jPtRBy6bNmC396eA55akSpY4t3dHy1n0vDPp3OlK9vAr0/P0QaEeRt dpdo8O7LrP/YOALjfPtw+gtCB4hLm1Ll7Qk7jB+lHgcW9/LgrgJ6rlBVrqMGxkGLniLeob pBwHd3VHbNnS+Nig7TOvNLKE7hT4KNnxE7/FGRJaUedC9xA0QafImUPMVS6laRjw9M8kl8 2k508Ih4DXdrzk+c00qn7yUN2qyPjylJVpZx0X3tN9NMARCiKBt7abq97JY6ZzOXnx5HtM gFJT4lGdtYKhoBakG+Q99it4Zj+iJ3IxJIN2EaVOo+E/FgvQNkXE5Fmq2siwAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678254718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iAa/+iwxxfl7h1OJmvPgs7CcXmODerKp4odi0a+VdTg=; b=LdWnWKBj3KTQdR3iR/V3+KKJpwF9CRJzLMUxH6lOZoMRRVSE49bmYFIqzU4oaHThYMjBjk h8/T6QhgEiMRri8LJ7y8S0ZFxy+K436yyLPwxgfhSqOT4YZ6Y5aBEnXAo73xEwpj5t/r8L NQ9Wx7MQb5nABhOZrhTpmyWR48WkFIRMfUfdP6zyeAumopwEZJowcVNCTB7S4n9L9cXlfZ UO1O5Szp/nRKtFKbwF1r/YmqMXc4YskE7O54ud4Wuqkpbq/XZMogra9xKuQXVpzvOLdTyO mP7apIwjnQdyk4rChc6YUaRe72nyUwAAvAeztHOoqGdJ177Jcoe70VvXW58Nhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678254718; a=rsa-sha256; cv=none; b=rovA6/Rl7vQ0VlRqiz7Dy8VRxN+JmSBoGeA4vV8rQBlBHIPd0z4F2K9hFmWl7U71K3BTJa DCzGE1rQy6OqdDQBcTZhctqOVWGu09mQygBNzKtJBua97/2N64TVL3jasKb3B8/pNTiXsy kDVKZB7FmuTpn6PwLM3aH4S6jmzm1v9ZqB15sRBlywhdHmZCcIDJkgb7z4/C90avF9iYDp vJGGvonERf0mUQ790zm81TlbPg2wFZ8xeLUtA2kcvnJsNQ4UffiRwjJTJV2g/Ibfq3iy9p BUO1UUQGOTfFOQzio37BPMmVlgAL28UPddRP/CFl79D5pvvoSwDqsB8XYY3mVQ== 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 4PWhK95ybWzDy2; Wed, 8 Mar 2023 05:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3285pvZ3009664; Wed, 8 Mar 2023 05:51:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3285pv1V009663; Wed, 8 Mar 2023 05:51:57 GMT (envelope-from git) Date: Wed, 8 Mar 2023 05:51:57 GMT Message-Id: <202303080551.3285pv1V009663@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 648bd2b1a6eb - releng/13.2 - linux_80211: Don't dequeue lsta if not queued List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 648bd2b1a6ebafddb07cbc024d42b99b7eaa1c9e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=648bd2b1a6ebafddb07cbc024d42b99b7eaa1c9e commit 648bd2b1a6ebafddb07cbc024d42b99b7eaa1c9e Author: Colin Percival AuthorDate: 2023-03-05 20:10:57 +0000 Commit: Colin Percival CommitDate: 2023-03-08 05:51:17 +0000 linux_80211: Don't dequeue lsta if not queued This fixes an instapanic when restarting wpa_supplicant on my laptop's iwlwifi device. After this change, iwlwifi enters a nonfunctional state if wpa_supplicant is restarted, but "service netif restart wlan0" is enough to get it working again. Approved by: re (kib) (cherry picked from commit 3689f8aeab82150da6789be87b6c2f9385810c23) (cherry picked from commit 790dc4d825c910c8a2eda49fe9e6dd827519f0f4) --- sys/compat/linuxkpi/common/src/linux_80211.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index d0a3b4b8586a..06b52ebaec88 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -174,10 +174,13 @@ lkpi_lsta_remove(struct lkpi_sta *lsta, struct lkpi_vif *lvif) { struct ieee80211_node *ni; + IMPROVE("XXX-BZ remove tqe_prev check once ni-sta-state-sync is fixed"); + ni = lsta->ni; LKPI_80211_LVIF_LOCK(lvif); - TAILQ_REMOVE(&lvif->lsta_head, lsta, lsta_entry); + if (lsta->lsta_entry.tqe_prev != NULL) + TAILQ_REMOVE(&lvif->lsta_head, lsta, lsta_entry); LKPI_80211_LVIF_UNLOCK(lvif); lsta->ni = NULL; From nobody Wed Mar 8 14:31:00 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PWvr42z9Qz3wSxs; Wed, 8 Mar 2023 14:31:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PWvr42XNYz3JWj; Wed, 8 Mar 2023 14:31:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678285860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6dpn1OCigYu+BsyNviT/egl6+vY9v5ytZMxS0Bfr49E=; b=KzOA7tL3yWG0Bj92b7uhUb9h9A/v6t68b/sXXbu2q0aRNXietjTCUjrt0PCvTMdsp4QTHj VWDSvBoImPSzBjjPAaLMacQkxnMMKFuFAstAAn5mSb3wILYuJa7YLDyTbOzS7O33MkpMdi m6PluZ2u9JADEZcKFFVFcsxlb9G8Kebh5QuKAty3mI6kMokpBN3HJiFXQd6mPVbxbAxY6C 8aG5BAq243740pxIfbgm2BQsx79o7VY5fSPKyn2YNj1V8BYbRRv4oR7/rfcJff4ZJ9EB0Z g8peW5lCdXDDarfFtmtayQEXccVVs3S6qs4vTPDk36G12qkeAgPLBX3Ni3ZQPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678285860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6dpn1OCigYu+BsyNviT/egl6+vY9v5ytZMxS0Bfr49E=; b=xYM6Z1vs1t5C6Bf7nyFjrdGg66QWMszVoZP2dDf1wcfBY67uUxekrXJWT9e4OJwyGxLOIC Ot4LyRznwRh/W/7t9RnfL+v+luB3QOFInfcKfEX3oJJDD3oLUkOmNQ/JqDgqZOBv/L2EUS Y916ktkeseRzwLcUlCkvD4lAt+L63cyRcCagpF5eHbiGJtHanvqDZZyuds8gXW3ZpIl8Cw kjimMebRZ3ckkEUDe5gT2BM3xeZKMgaQeiiDkRjzO4pFt+9Fqh8WBP6lE6MlOd9kEXp/iq 00qQbhE/hz6pYOBCSTme5QvxvQsZBCv+rb9N5+GcXcOTK15OFemHsZ+L1u23Iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678285860; a=rsa-sha256; cv=none; b=SJS01U/a/udcN5lD0HXKUmnf1ON3Yu2SGaMBrdzARX9s1PNt2vn50bdlvXUx5PXxEi0Hoo CzNY3acIWwbt+q8r2e9M6ZM1jbPehk7hYb/BY92xNnXy4H95sCZKDBTSyYvaArvDcVf0wt TDk+abgQF2nz0lUlKhyjgJya6/Kp0pQogfoB53NPVsmC4BK05Wfjx2paW0YI4QFPzE5vYb 6cJ4e5WO9xwR/hFRtiNI3RXDQ4K3KVoQRi2ERQWvKOohIhjJGk1wxUdKPZTdMYI5gtXrmg 9Udhx8DAWPx2NzSGCBp2WwmhFI35SwRlKGSe1d4EyCVBWNhunObvZROOOM/Rrg== 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 4PWvr41blTzV1N; Wed, 8 Mar 2023 14:31:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 328EV026057690; Wed, 8 Mar 2023 14:31:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 328EV0kg057689; Wed, 8 Mar 2023 14:31:00 GMT (envelope-from git) Date: Wed, 8 Mar 2023 14:31:00 GMT Message-Id: <202303081431.328EV0kg057689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: e6fe8ff07b8b - stable/13 - usbdevs: Remove duplicate APC entries List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e6fe8ff07b8bb40061c7a33ca505213df116673b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=e6fe8ff07b8bb40061c7a33ca505213df116673b commit e6fe8ff07b8bb40061c7a33ca505213df116673b Author: Cy Schubert AuthorDate: 2023-02-21 21:08:08 +0000 Commit: Cy Schubert CommitDate: 2023-03-08 14:30:06 +0000 usbdevs: Remove duplicate APC entries (cherry picked from commit b1723f48d8cdc9ac6fc3fc256b779b3c07827c0b) --- sys/dev/usb/usbdevs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 81abe91d93b4..74e4f7dc2913 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1104,9 +1104,6 @@ product AMBIT NTL_250 0x6098 NTL 250 cable modem /* Apacer products */ product APACER HT202 0xb113 USB 2.0 Flash Drive -/* American Power Conversion products */ -product APC UPS 0x0002 Uninterruptible Power Supply - /* Amigo Technology products */ product AMIGO RT2870_1 0x9031 RT2870 product AMIGO RT2870_2 0x9041 RT2870 @@ -1136,9 +1133,6 @@ product ANYDATA ADU_500A 0x6502 CDMA 2000 EV-DO USB Modem /* AOX, Inc. products */ product AOX USB101 0x0008 Ethernet -/* American Power Conversion products */ -product APC UPS 0x0002 Uninterruptible Power Supply - /* Apple Computer products */ product APPLE DUMMY 0x0000 Dummy product product APPLE IMAC_KBD 0x0201 USB iMac Keyboard From nobody Wed Mar 8 14:31:01 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PWvr62pr7z3wSsc; Wed, 8 Mar 2023 14:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PWvr542FJz3JXP; Wed, 8 Mar 2023 14:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678285861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8QsJxC3lsbQpxB5PFe4oG9Fo//5D/bfBPu0vqYS49Tk=; b=ZJRfmoiNbgmy/SLuEnId9sSOiEg8ZkifLNpjoL86N68z2XACJUAzDbdjpD8x4IEM59ebl+ cy2V6u4KlBWVZ+pELJI3fa/NzAFcM69To437TB02sxT2wuhzXCrhQ3KTuP+exuX08bJMjL g2l4v7Cm2UufgrufKJJY8IYsA0MZTLw1PpERuEdv9Z6g5MgjS679UyUkqzB11kqTxTqk2L DxaUyVWd+8wHhIJsMOvZ7WsQrqspJyqWDkGWIGP6c7Oiki99UAtcyrVGhPlGQLkCUNoOmV +Px0ex1sD1cmT6pi+3KDEh+LG3ZTGtILihHDRcCuJJNHZ/h8QPDbFArluZpiWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678285861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8QsJxC3lsbQpxB5PFe4oG9Fo//5D/bfBPu0vqYS49Tk=; b=TExqMrlKUS3ZGLpJ4z+bjq0GIWmiH07MUnTD6XQ8B7NIb6vjFKTysI9ncCOZgI11jPxRXX BPMzfxhbd8LEbcn8y1G85/2IXW4qWLV+8kEjmLbcg7Pvp+pfUzodDqZKric+h2HxNIE6iO RpZowXfUPQTOtNFtRn7dni10K4DwtfUKN/vxx8Jmfd7Dt8hKD9QhFjJAGUhzfYu5MnJLHv GhcM39PNJJ5avWtfUEVN8+iAtMspJBdVF+cMmJ5++mu1vC8OWwJwuyeKlUibGQnRauDW8d VmwbQrkZQ50H86Dp6+9qf4psdk8IxRafv2fiedYQwdBeCoR0f9fxprxx4XHZJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678285861; a=rsa-sha256; cv=none; b=LbsnsohA4FHk3eWkQYlBGnT1GveXdsaRXFxvCUZLr09osn3S5mQEuvukZvX6w+kuvgteMk j+M3/rX5QOPH4lIOls5ibHNQDXww+mUFlY0eoRfi1L1WtNyKfRXeos95Id3ZAN6wSue1pV Kpd6Y4oDCfTEeGXBgwV4CLERmoe9y0EcDQn5cbP083V6eP0REwDh8NwPeW1LlN7lVmyIoM 4i9OPLp6hGTIsEoMi6oBw4OGnhrLrJ03j65G2v4zcWSoepy93CrTt1ZY3QSjfcM4+vRbXK xVV7dGI3gSrP3YHa6WMr7Dx/oKsxOO8PVVsf6S3Ne/7L2lslawvUouDTfOUVIg== 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 4PWvr52nSszTrl; Wed, 8 Mar 2023 14:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 328EV1UL057709; Wed, 8 Mar 2023 14:31:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 328EV1DY057708; Wed, 8 Mar 2023 14:31:01 GMT (envelope-from git) Date: Wed, 8 Mar 2023 14:31:01 GMT Message-Id: <202303081431.328EV1DY057708@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 18549a5bfe99 - stable/13 - usbdevs: Add APC Smart-UPS1000 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 18549a5bfe99c5e47c3cac7f10751fb1085426a7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=18549a5bfe99c5e47c3cac7f10751fb1085426a7 commit 18549a5bfe99c5e47c3cac7f10751fb1085426a7 Author: Cy Schubert AuthorDate: 2023-02-21 21:10:35 +0000 Commit: Cy Schubert CommitDate: 2023-03-08 14:30:28 +0000 usbdevs: Add APC Smart-UPS1000 (cherry picked from commit 6f295aab8093e291d2166325e4627321953268c8) --- sys/dev/usb/usbdevs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 74e4f7dc2913..15cca3f8c6db 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1097,6 +1097,9 @@ product AMOI H02 0x0802 H02 3G modem /* American Power Conversion products */ product APC UPS 0x0002 Uninterruptible Power Supply +/* American Power Conversion products */ +product APC UPS1000 0x0003 Uninterruptible Power Supply + /* Ambit Microsystems products */ product AMBIT WLAN 0x0302 WLAN product AMBIT NTL_250 0x6098 NTL 250 cable modem From nobody Wed Mar 8 14:31:02 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PWvr7181Gz3wSdD; Wed, 8 Mar 2023 14:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PWvr64SMDz3JbD; Wed, 8 Mar 2023 14:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678285862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lBqihZ5qYmSAtGqcSJoRpJIiJjjSaEpiApP2Jjd6nJ8=; b=ZFUvhgHeas2iD96du7jO7C8sfkFkRxvZ8rScODi8b6nCH+TckBzSOiaVyYxszqA37nT0Da seG3ntn0cKWaSzxZvzEk1Ch/dx4qK2/s5HfF53DVC4kozHcGW6aLimEzHkuwKWGDQHu50U fZS4SxwxRBEHyz4ViOF86zy4BL3dJeUCrOdA7Jsb1X5+hzvn5oNdRxvd+mvy60jcvlduTm RwQaOKRo/UncS0+YmhRK9Uma4eqCMDBn2hQ+1yir3d96clSLTx7R80aqIOSA4b7jddd0wB qCqr71fO/SbFbTCVFC3gsrDz07w6eLBzPsMWABwbW/iqfgezvN5wfIje1WsXyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678285862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lBqihZ5qYmSAtGqcSJoRpJIiJjjSaEpiApP2Jjd6nJ8=; b=Aax1s0sQBKlcce9dK6mcu/p0FQoO7uIgXh16QLfyih2oG6+R4sKuq34nNbS32aUs9z9mnk 2pja9T/SiDLpr15XtgYKHS5Ed/ERLAC8RQY18i2jA7W+F5rPSYHC9gKjPHL51vQ3g47Wdx c4UjFuDUSgnzaKf2QOFPxjNLRygr6GXcJGdXHdjMlMHn9kMVlgf1vlRGN9Ch9jULpvCer9 d5b/6JRun9NC5boirqcEJ6yWNRmx1QlL6DR0/d0voVgWlUQG48tjotn1P7ygWi8OOL/BE6 CSpWYV5b/H/RJx00xXhAYePjMbWfAmEywVx/6lkZl9RAtaoQY/ZGxP8Rzh/CsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678285862; a=rsa-sha256; cv=none; b=f8cNxwXEpBD5586H0h99WYDCz0rbVMdA5mjg24KIbpmetC1H1TXn3EDMNp4faGvdTVrVK1 B/pCiauix9KrPSUy2g1BkBL9is3WU53U9SCuQ7VZruQKk3cxTzvwBLS1usBKKAnTesHdDx W95b35064ZpAVI5YiV32fzx/UczHz0xGU+HZ09k+J3d3g1UucwGVw1OzCuSbk34xuA/foX GDU7vZI6iRekmHd+uJmIHSJK3fLv8XbdY18PgY3zsSrB+Kj4KYd1Qc/J9KZDWCv6GPlR++ oEVuuwPXtY6nK5wVMz1TWdINY/hTIyKra+vhuQb9xCbReBa2NjkB68/h/+fd1g== 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 4PWvr63RH7zTrY; Wed, 8 Mar 2023 14:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 328EV2Rd057728; Wed, 8 Mar 2023 14:31:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 328EV29o057727; Wed, 8 Mar 2023 14:31:02 GMT (envelope-from git) Date: Wed, 8 Mar 2023 14:31:02 GMT Message-Id: <202303081431.328EV29o057727@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: c6ee35809ad3 - stable/13 - usb: Add HID_IGNORE quirk for APC Smart-UPS1000 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c6ee35809ad3a23d0aa9c9a3f3bab717d46432da Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=c6ee35809ad3a23d0aa9c9a3f3bab717d46432da commit c6ee35809ad3a23d0aa9c9a3f3bab717d46432da Author: Cy Schubert AuthorDate: 2023-02-22 02:38:16 +0000 Commit: Cy Schubert CommitDate: 2023-03-08 14:30:43 +0000 usb: Add HID_IGNORE quirk for APC Smart-UPS1000 Without the HID_IGNORE quirk enabled it will appear to be a uhid device. PR: 269729 (cherry picked from commit 8866ea619a1f91616ba7e002a3ad10dfb10148c9) --- sys/dev/usb/quirk/usb_quirk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index bb02b90ba4bd..a26de4f8d942 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -112,6 +112,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { USB_QUIRK(XEROX, WCM15, 0x0000, 0xffff, UQ_BROKEN_BIDIR), /* Devices which should be ignored by uhid */ USB_QUIRK(APC, UPS, 0x0000, 0xffff, UQ_HID_IGNORE), + USB_QUIRK(APC, UPS1000, 0x0000, 0xffff, UQ_HID_IGNORE), USB_QUIRK(BELKIN, F6H375USB, 0x0000, 0xffff, UQ_HID_IGNORE), USB_QUIRK(BELKIN, F6C550AVR, 0x0000, 0xffff, UQ_HID_IGNORE), USB_QUIRK(BELKIN, F6C1250TWRK, 0x0000, 0xffff, UQ_HID_IGNORE), From nobody Wed Mar 8 14:32:26 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PWvsk6FqJz3wShn; Wed, 8 Mar 2023 14:32:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PWvsk5qJGz3KNx; Wed, 8 Mar 2023 14:32:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678285946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TvHytf6dQbjqA0wdcghxEM+RdAFShb3s2Tnb7ZU8Z18=; b=CIXPBX315Bl1AbbKqYnOvMnu//muu1GiA+p2kuZ2TFf+Z1kK+PNQjXCIbIpCitwDGLNMn6 5mM4JJVYgrgQt2T/02lpVxoq7gvfcH0t+EuYkgZf/m2WhanbiEqxe/8XxxYTH1nQxhQyG5 xX/G5NfwKq/rJNy/yI711yvJSZImgOvyOgPIAh04OA080iuMmnhPrMeN/VDCgz5G51L2NA xuvE8wG3vq0RPLR2h3puw/MEcfOATmO0luPEK18ta9bUFFTpLpWkRmdJQgpCw9lunKTtHp 8NFl0rYFYeLh//nqhR+2DiZm6gO7hUnPfZCRWoVtjIzjOr+rjvgY9MKrGl4sHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678285946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TvHytf6dQbjqA0wdcghxEM+RdAFShb3s2Tnb7ZU8Z18=; b=cwxXZjd48hEwBW87xK0GbXoTXSyxnCoWh50Cec6Ei7EkXXAecOqOC+Bc2VMyingLzZVQYO 0fsKWiV9VSkAEriQsIJSqGnrxfJ+pXE4lYLwtdEuwMVCArXzi6wk6y31dw0DggcWQUjLPH Qtg13JfoPD76GoNd/ekltVrSa+ql+yL77MYOIO9q+Flt31JvO6pbQ9uUE/cMN0ZAwZAzfZ 6a7KBOBYg/Y2Wze/i8wFQ8NeDqVH0XZ5KOVr7BUJvg8ty/dsBmH/VrSU6d13u4fENrFkbE DIy1xe5A1xl0ZwQvH1iclvofnGZSZex41q5hEchsE68/PdoYehxsRKKNWvY/VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678285946; a=rsa-sha256; cv=none; b=Fa1JY2hpsi3LnLrsclRf90gc3kDyJkKivKsL6/prnqgY/FNI/tsiQNussg/ayxMzYkcWeD Zpor1iSx0vWBtkTWIYaV4rAXF79j8u8LVKzeCo89j1wu2+BzAYL9mQNgfrsGY1mQJjXTXz qBY4DxIX8Y3lmS9lei0/t8oC5I342bE5vzF4O/0KANJdE6glXihklINq9FfGKl0x+XKQVz M6XXncxLtMvER87i9ventt54Ye7VEsDDKb11yWVOGKOYhK3hDG8hZ70aMjJf9IHRrMaed1 kgALPar+aEMEt0RJUv+XHMI7nqhUvJy0449EfY4uc4Oeg3e/EpPZA83qHTbvww== 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 4PWvsk4tVbzV9d; Wed, 8 Mar 2023 14:32:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 328EWQhF064530; Wed, 8 Mar 2023 14:32:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 328EWQ5p064529; Wed, 8 Mar 2023 14:32:26 GMT (envelope-from git) Date: Wed, 8 Mar 2023 14:32:26 GMT Message-Id: <202303081432.328EWQ5p064529@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: bf04aa1701ae - stable/12 - usbdevs: Remove duplicate APC entries List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: bf04aa1701aed9b97be83f80e5bf73bd7e536043 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=bf04aa1701aed9b97be83f80e5bf73bd7e536043 commit bf04aa1701aed9b97be83f80e5bf73bd7e536043 Author: Cy Schubert AuthorDate: 2023-02-21 21:08:08 +0000 Commit: Cy Schubert CommitDate: 2023-03-08 14:31:49 +0000 usbdevs: Remove duplicate APC entries (cherry picked from commit b1723f48d8cdc9ac6fc3fc256b779b3c07827c0b) --- sys/dev/usb/usbdevs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 7945e94f8cce..a60f2b68e652 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1104,9 +1104,6 @@ product AMBIT NTL_250 0x6098 NTL 250 cable modem /* Apacer products */ product APACER HT202 0xb113 USB 2.0 Flash Drive -/* American Power Conversion products */ -product APC UPS 0x0002 Uninterruptible Power Supply - /* Amigo Technology products */ product AMIGO RT2870_1 0x9031 RT2870 product AMIGO RT2870_2 0x9041 RT2870 @@ -1136,9 +1133,6 @@ product ANYDATA ADU_500A 0x6502 CDMA 2000 EV-DO USB Modem /* AOX, Inc. products */ product AOX USB101 0x0008 Ethernet -/* American Power Conversion products */ -product APC UPS 0x0002 Uninterruptible Power Supply - /* Apple Computer products */ product APPLE DUMMY 0x0000 Dummy product product APPLE IMAC_KBD 0x0201 USB iMac Keyboard From nobody Wed Mar 8 14:32:27 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PWvsm2fqlz3wSvd; Wed, 8 Mar 2023 14:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PWvsl6VG1z3Khn; Wed, 8 Mar 2023 14:32:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678285947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kEksUoDCgmC22WuPjfX8DEX6dvS55PiSJFvUJ+ZIEnc=; b=L2kjE+1W3z2nzhP9/EZ4UJjlpiPFzuT8FSOrNjCuRRgbeNBUx5uEq2G71wqQAPhtd35Z3Z A3nNfX2E064rZ21sfkoFNRFDQfPNH4SHOXe5IdF43NM0gzbkeE+KGJEYQ4vKa1C8XUHx/X lnOTgOqamj3ZZ2Id7AGYNbMMGkaHgdYkxDbRo0l/YZ0r8pqf9G0/0VyBV0CryyWXkvw1/D PEcuxUvvJOGrhcvwMUr6RnvkAiwqs14pP6ansrX3fIskkjwdT70Nvb40RQyMeCrNExsuXQ hIO6TpwIkrP4QqCgDLy/ht8kF5lyxmN1e4an+LaybNi8dIDpTaPQqndhvMu7Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678285947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kEksUoDCgmC22WuPjfX8DEX6dvS55PiSJFvUJ+ZIEnc=; b=F7lzIATmbCe4oj4wlsWazTXfWodTEaMH0MDCkIpGBkM8FZRRyjcO7UMD07pV5aqGKH6Bpv 2Jo7j6WegdBEON/e58kCFk/+0H4xltenUGx2I7/YY4cuNUJgZn6V/deAXX4EvPlGHYadpZ KMkTq1ndfpUOD+a+U9xRXZE67cwCIMg/mZw/SbgbVOu8Drjq1Wv88/0xt0GSY3hd5xyne+ knEZHNHFsyh7YBAC3CvcHIJkxh5/DDpKN7eYBHHJBy4uxR42S33+RLDop8B2M64KToHFfc bx4j3pn2SoP6ue4TbtAQt7r9MA/7OarXZynCujOe74+V8oA+xL95YHJ6ZZiM9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678285947; a=rsa-sha256; cv=none; b=PjotWir/mEFyEWkU521G7D7eaL50VbjbkOC1MzDrlapBMSgf6cnsvq9D5FummC0tOFaEzG CcMJocmymdR0CBh136NuVrMT9S32It7aHq+8aIWBJpOVEBUJBlWhGQ9Z86oIEAgyR0sH1a oVdY+q56oTSKqi7o9iHEjequrOECI9fczHSeloYSQm+vceTex+lVS4FmNT7uTAUKGe47us 2KHCTGBG9yRhhMSfYBom9gCl8QqnzUwoBjk/TXgOOcS3bcsvkg/R+ljJURZ6tjyqghYljK NePLd6vBMf0owvv4XjW0Tk2icmcc0x16ZBtV0PaAm69PoSRmVtrn+GNIS8oBzQ== 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 4PWvsl5bKFzV9f; Wed, 8 Mar 2023 14:32:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 328EWR4j064549; Wed, 8 Mar 2023 14:32:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 328EWRlw064548; Wed, 8 Mar 2023 14:32:27 GMT (envelope-from git) Date: Wed, 8 Mar 2023 14:32:27 GMT Message-Id: <202303081432.328EWRlw064548@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 9a5406cabc01 - stable/12 - usbdevs: Add APC Smart-UPS1000 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 9a5406cabc015a6d295f82ce34b3ccf57d8a31c6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=9a5406cabc015a6d295f82ce34b3ccf57d8a31c6 commit 9a5406cabc015a6d295f82ce34b3ccf57d8a31c6 Author: Cy Schubert AuthorDate: 2023-02-21 21:10:35 +0000 Commit: Cy Schubert CommitDate: 2023-03-08 14:32:03 +0000 usbdevs: Add APC Smart-UPS1000 (cherry picked from commit 6f295aab8093e291d2166325e4627321953268c8) --- sys/dev/usb/usbdevs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index a60f2b68e652..5ec3a33d0b1f 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1097,6 +1097,9 @@ product AMOI H02 0x0802 H02 3G modem /* American Power Conversion products */ product APC UPS 0x0002 Uninterruptible Power Supply +/* American Power Conversion products */ +product APC UPS1000 0x0003 Uninterruptible Power Supply + /* Ambit Microsystems products */ product AMBIT WLAN 0x0302 WLAN product AMBIT NTL_250 0x6098 NTL 250 cable modem From nobody Wed Mar 8 14:32:28 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PWvsn27XJz3wSvl; Wed, 8 Mar 2023 14:32:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PWvsn0fMsz3KZ0; Wed, 8 Mar 2023 14:32:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678285949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qzhf4ftaNVoT8aFMWPDRKGYLFccx1HLPxbalEfDcACA=; b=QtZ7Im7jQRufxTkArdmwAFDCoh2b1LJ0G9aUeGR+te6zgDtOFtfweOZ7Mj8PAzbEGE4a1f 1IbbPfXUPkMab3i2gsgAc1MCgskeW2Yz5B4nMVqFVi9ss7vSyusga4uAZr/WlX8U3v2W9j nzz4Kvwt2Hhj3oz+CnJ8EVmCWYBAhXfKhxhCb4VW9rlTzrXXsY4yd+4qVAjMXDSo4ks7h+ 5O5zlbr1CH2UgyNqVbQFhZBpzOjHK+hctK9ahkqpRphT4CHCUX+bRF/T+PGXwfSg0HRkdI Xlt0BVVao5MUJ7zwftsuzlTEd2jBmy+bF2fRyiwPR81mz5gclK6lDt+bJ88YLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678285949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qzhf4ftaNVoT8aFMWPDRKGYLFccx1HLPxbalEfDcACA=; b=gEPFbNXbJ28opnzbOUqQ/EyzWIepgMAFJnF/YHb8jiae/TbhSjmAAsiK6Yf6IS/iTpqKAT PvHIjcW0Pm9H0CXt74WIJMmduVce1mmd/w4GSi/dy+UaBVrubqq6gfqTKjCZTHLBT+7vnc 6wwQ6YYF9SjHPO41lOvNulaTnReUllt8RRvAI89RgwgkNUjNcQFQsoD4w4QlhdNx/k2ajt 571gOcLQtogZbYbHS7EctpWL+RWoyXUurW1BPRCWqgnUEf12t+8A2tN8f0k1Yed1fMr+Ol jxkrzFziYvSmINotBLBuncGBckdBTmTN/tXft8I+X+d0obA6AZ3t/4qFb/oYmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678285949; a=rsa-sha256; cv=none; b=gQ3iSlMEJjiGjcTiloob3+kpOW0nAUuziuYTD7M83Gv+jP/JIC9PwwdlC0XQfmzdbgsmlt YAskjBMZlpbnzAncF9Xs9gXEUQxb3NN7lEXYguewISQAL4sfUtu8rYI0UQbSHBDtIGe4Ex qCjXEK3J0NYKoy32WwBq4++x0kdVzFVIsdXGOfLDNgLUSbNEtpentAZ4chJc6OlmCi24B0 VN3dC6IDF+zPxa94ynGkK6VTgjgkf7W0iGBM4qtU1ivowBY+M8X49iAfnet7GXaM4+/AWH KaB47LTYsL4a6dsMh1cwgYrAeZJxzEmWdBaJoq24WXwoIFW83h0GTO5BrgswoA== 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 4PWvsm6j68zTy1; Wed, 8 Mar 2023 14:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 328EWS8J064568; Wed, 8 Mar 2023 14:32:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 328EWS9U064567; Wed, 8 Mar 2023 14:32:28 GMT (envelope-from git) Date: Wed, 8 Mar 2023 14:32:28 GMT Message-Id: <202303081432.328EWS9U064567@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 4e16ea3de70e - stable/12 - usb: Add HID_IGNORE quirk for APC Smart-UPS1000 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 4e16ea3de70ecc355a0c10adb8515a5bba27ae03 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=4e16ea3de70ecc355a0c10adb8515a5bba27ae03 commit 4e16ea3de70ecc355a0c10adb8515a5bba27ae03 Author: Cy Schubert AuthorDate: 2023-02-22 02:38:16 +0000 Commit: Cy Schubert CommitDate: 2023-03-08 14:32:17 +0000 usb: Add HID_IGNORE quirk for APC Smart-UPS1000 Without the HID_IGNORE quirk enabled it will appear to be a uhid device. PR: 269729 (cherry picked from commit 8866ea619a1f91616ba7e002a3ad10dfb10148c9) --- sys/dev/usb/quirk/usb_quirk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index b9d277692137..0a23eb29c177 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -111,6 +111,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { USB_QUIRK(XEROX, WCM15, 0x0000, 0xffff, UQ_BROKEN_BIDIR), /* Devices which should be ignored by uhid */ USB_QUIRK(APC, UPS, 0x0000, 0xffff, UQ_HID_IGNORE), + USB_QUIRK(APC, UPS1000, 0x0000, 0xffff, UQ_HID_IGNORE), USB_QUIRK(BELKIN, F6H375USB, 0x0000, 0xffff, UQ_HID_IGNORE), USB_QUIRK(BELKIN, F6C550AVR, 0x0000, 0xffff, UQ_HID_IGNORE), USB_QUIRK(BELKIN, F6C1250TWRK, 0x0000, 0xffff, UQ_HID_IGNORE), From nobody Thu Mar 9 13:09:31 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PXTzb5Q6Kz3wvXN; Thu, 9 Mar 2023 13:09:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PXTzb4wTKz3kc0; Thu, 9 Mar 2023 13:09:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678367371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wyfESV1Ge2RbhN9xPUJPWnZo1ynSI1u23r0UQnVT8rQ=; b=OwG7YEONx4q/8s3dZrbmzQkuNsZz+5exx+lWcTXOmZFLyeGLv17ZERBpbktXv06oCwSGgS XCrHTj7slepigepbLjSOQXYiXOGtFFGJRlpt3mlAA4UlaB4TMJ/ZynWP8cVR1sOI+jKoVU Lq4yL9OdIx0pMEnZgkMDH1lWCgZ63JJA/tOTpJfWL+sgtGrypAHcXpu1fV0tvZZcz/4/VL 2i3+cEJo6dv3bqxM3VarBJvgI4snxnl0WHWMM3ZWzGrGmpTJbxRqybgnJ4q2y314qeN0MS FgidBtA1z7eNb7AkHjbTx3gv7SMRRUbw/PvJ0eI/0PgVgeVdV12ffpqtCCuCiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678367371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wyfESV1Ge2RbhN9xPUJPWnZo1ynSI1u23r0UQnVT8rQ=; b=Pe0aLzGUpSVOxDQ8L878UZzcy1vZKULRAWAEC0WuXmDsw7YhxOyxtLZmjJbl5YOjCs2zJs Ovnh19/SEC2PmxhdHeSOxnqpSiCFe6MkFL1ydN2X921/sPx1xaTn7AFkSxNMZd2bio27Q4 GYYQfW65JtwwRaYYb0Ja4TpKJuhhh+qew+++/rqrTHjNGU0/R49xPiB2ow8s/T6M9bBmZ6 s2vju7KexWklD64sk4ud+7omoQ0frtLRN/eZqppB2eWJD4DXHQa1qf2iHTKVvktcZZaBSi r70W+ZW19n9IssbWirft3/P8lzuZ61Wp+yVDO0VoY6otqO0JbXWlIfVMdssNfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678367371; a=rsa-sha256; cv=none; b=eWtpQfxtPaDHfWxTh4wBF47m8s4n8SNcK0jfkSLZ+cpWXy+vDJa6c4GaGtYGlbtB62oqJS CjeoN1jEUs3vP0vi090aiAsF8DxXjldw/B2a3rQqXQmtrnJwgeQ6iIzJ5K55UNiz1IJqPg /DVRKJTb6yPU6Ne9O23ECUsQlTBTAXEX1yFtbxVle6bp3bXKenVjPSRAoBnJLU2aCagtVA OPw57RnYI6LRltXe16yZpJUHEjX6xxSqCC4UD9htJ6SPvf4pZ4Ggte6c96Tlv3BW5xoxRa G853HSUFLsmrPRBE7E5Mk1TNxliH9AQtOuav9zSujc09fWvokuG8Ii1SqwByUw== 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 4PXTzb40tTz17hb; Thu, 9 Mar 2023 13:09:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 329D9VlW085872; Thu, 9 Mar 2023 13:09:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 329D9VrX085871; Thu, 9 Mar 2023 13:09:31 GMT (envelope-from git) Date: Thu, 9 Mar 2023 13:09:31 GMT Message-Id: <202303091309.329D9VrX085871@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 62679a0594dd - releng/13.2 - growfs_fstab startup script: set dumpdev to AUTO List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 62679a0594ddd71292894e1c02df23c696ee7801 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=62679a0594ddd71292894e1c02df23c696ee7801 commit 62679a0594ddd71292894e1c02df23c696ee7801 Author: Mike Karels AuthorDate: 2023-02-28 13:55:35 +0000 Commit: Mike Karels CommitDate: 2023-03-09 13:05:01 +0000 growfs_fstab startup script: set dumpdev to AUTO The growfs_fstab script has been testing dumpdev, and if it is AUTO, enables dumps on the newly-added swap device for the initial boot. However, dumpdev defaults to AUTO on main, but NO on stable/13 and release branches. On the other hand, bsdinstall adds dumpdev="AUTO" by default (controlled by a menu item). bsdinstall is not used when booting an SD card or other disk image. Adopt the default from bsdinstall, and set dumpdev to AUTO in /etc/rc.conf in the growfs_fstab script if a swap partition has been added, along with the explanatory comment added by bsdinstall. Approved by: re (cperciva) Differential Revision: https://reviews.freebsd.org/D38751 (cherry picked from commit eef9f9900f118b5efcabbd5864e7b8b993d09922) (cherry picked from commit 009abff336b6e83219178e7d87f6a91f54e31839) --- libexec/rc/rc.d/growfs_fstab | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libexec/rc/rc.d/growfs_fstab b/libexec/rc/rc.d/growfs_fstab index 8ad34f452ce0..c51f0dd6f3de 100755 --- a/libexec/rc/rc.d/growfs_fstab +++ b/libexec/rc/rc.d/growfs_fstab @@ -51,14 +51,9 @@ growfs_fstab_start() ' < /etc/fstab then printf "/dev/label/growfs_swap\tnone\t\tswap\tsw\t\t0\t0\n" >>/etc/fstab - - case "$dumpdev" in - [Aa][Uu][Tt][Oo]) - dumpon $dumpon_flags /dev/label/growfs_swap - ;; - *) - ;; - esac + printf '# Set dumpdev to "AUTO" to enable crash dumps, "NO" to disable\n' >>/etc/rc.conf + printf 'dumpdev="AUTO"\n' >>/etc/rc.conf + dumpon $dumpon_flags /dev/label/growfs_swap fi fi } From nobody Fri Mar 10 00:24:52 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PXmyr74f5z3wqDH; Fri, 10 Mar 2023 00:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PXmyr6YJHz3pWg; Fri, 10 Mar 2023 00:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678407892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cWJAx9Mn0moox81Lz6asKKLUI1APpB6h2ybKTob5Cx4=; b=rnFCQgIIck50Rros5Xj2UdoSw9T67lwRsIhPhMzAKIqOg50DU5QQYr/cuXK1wpwZ1x8mp8 ZrJ1VBldvEUQxzkooj2SGg5NjlffjLBpTQp1YSetrFyKVw3kmEco9pIAQFEEcEqlZAoGb7 sM94sNfAuwLeghg/D2Hh36u4P5tz+IhPDbOfAFuQJuRoHntUN5AC0eh9B1m76EK7narbq2 B2EAznEuD/VM6sReWzQ3VDVPjF0LkyR+3xYUg0wV5hRa43VOvLdGiMCaIMNYGR44Y8LBXX YEwSj7Vyh4js27gLO6Rla4uDK9BJ5xECYw/RJVRYpz41f78G3vBERLqfb0PR0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678407892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cWJAx9Mn0moox81Lz6asKKLUI1APpB6h2ybKTob5Cx4=; b=U9XhMrhDjrE3J/FG1kfvlBbDuc8923QjSB1mhu70TwXI1z5/VuevvliEC10DFK8cSkger2 JlVPjE9c15ORa0Gv+vc6VV2BmjX+0rC7GGJ2X+2RcxTLC8Z1vqVVjoWbbS4tnpQJxbYNLq p6LrvEgDxLQ0wAq0a+XMeNVsDaCRHvp6S5snMWA8/rAKJ75xUQAWI/vNtbULGbfiupXFNG hkTsVf42OlxX7AWocnIUI/wO4wsTRtt+2N9Avqnvt7Ze4fw5VPKkN7WEpVTWXnGL0UZyWE BFdjWHP2w5li0e99SzIrlzkCyylJ8Xz6BnFQH0637uibkvdkFBwwFAq5bHGnrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678407892; a=rsa-sha256; cv=none; b=Rp6+/Aqd+UXK6J7eaR7m2/mVUYPismunORsKwElbfoljLPJMLZou4gIPWI88sewbRr1z6C HVJNpYGkQ49DFAQaJVKyRSKvgCId5DJGZTEDIjLB2OoaDdSYCknuk7GrW+ld20nZ8BdRoe 9ALAOSoVUH60R3ReaE9Bk6QhjrhWRm0D+ehEVMdA0ZRzgFG1IYcLhrsw7Axq5IbpktYycW MjrYP2xAKNqL+Nip/GdYkhtAkvahbx+3IDurNaBcJzLg/wd987TNP0RxNffDYYPaggO8nS qPd0xxyWwL9opwTuqAKy+kLViImo5wVNMk1MtYO15IXH/mDZx60IPMaD0XpNsA== 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 4PXmyr5Vh8zSZp; Fri, 10 Mar 2023 00:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32A0Oq7D005587; Fri, 10 Mar 2023 00:24:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32A0OqKN005586; Fri, 10 Mar 2023 00:24:52 GMT (envelope-from git) Date: Fri, 10 Mar 2023 00:24:52 GMT Message-Id: <202303100024.32A0OqKN005586@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 5a905d8219bb - releng/13.2 - 13.2: update to RC2 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 5a905d8219bb3cfdd0488af9da8c1299fa0e5b27 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=5a905d8219bb3cfdd0488af9da8c1299fa0e5b27 commit 5a905d8219bb3cfdd0488af9da8c1299fa0e5b27 Author: Colin Percival AuthorDate: 2023-03-10 00:24:24 +0000 Commit: Colin Percival CommitDate: 2023-03-10 00:24:24 +0000 13.2: update to RC2 Approved by: re (implicit) Sponsored by: https://www.patreon.com/cperciva --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index fee68579a00b..34a957021c62 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -54,7 +54,7 @@ TYPE="FreeBSD" REVISION="13.2" -BRANCH="RC1" +BRANCH="RC2" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Mar 10 20:32:14 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PYHly5DnFz3xvB1; Fri, 10 Mar 2023 20:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PYHly4pFDz4MdX; Fri, 10 Mar 2023 20:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678480334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=35B6krJSJCMryWqlO+/Md0YtuBIkiHbXj5lS+tJWFIY=; b=biT2av1/XHF1U+8Aj55YEq9jTnLcexGMywmdZzzBXRzlgR7Ng8oqBCu1dR1+rAmfM79s+j 1RXivTxxD69Jlw1eR5RV43dsw0Y7TbrIMkrz63c9RwIX6QlWDrMm++A15rtvxf3cJPUAlG I/9RUIXdBvyFF35C2/gtBbtn9eV9yCRQIlD0fXVgY5umJS1272LqoU3upEhLV/WWl3hJUY Dyg0Ido6MQuugVeWFHjxu6oxDi2q7PN7RnD6adSdSNPbgzeh3DLiC1hYdX4MwjkW0v7NiE 204hPeXDqTafVEmX+9kGAlhM4FztweAB4p7EoWy8wH3+PoGBUSIR0+NSbvTV2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678480334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=35B6krJSJCMryWqlO+/Md0YtuBIkiHbXj5lS+tJWFIY=; b=biwbdHPuH1XHW1kFomdu3D0EMAGcbHNeYo4I+A9eY/EqCv7lMJCZ++WHPRHU8C2Y49eQbl 2QsyfX0XlbfWN6fOKXtNOc6W13BwOzCimkyMc0Wt92AdeXKLZ1ZtBfBG4wRT8H8TfDwk6R UwBgUo+owKnLjiOCMgCi2hlt5H7yGiX6khES18xSi7BdLbgXMef9Tkb6GOFeWVvOuMF9H0 9MzMGNYckddf6We5+11IMsliQKRj3jIZO9aBON6wuiZ/Xt7Pk098jQA5sfLuKoiEwgjvQ8 anOlPrFDUWGZwTHfAOTl3MKApvqhfbpWW+k4Ixs4d4zD8L+lkD6yi/Ljjb7arw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678480334; a=rsa-sha256; cv=none; b=SmbRZUBzrYDkmvO6zhxCEruvC8gXBO+mxlKaOSZgVQol6TZDIUVj9HpJ/dwqrtXcPKnW4C lTrwIT0DU4HqlWGUKNOlRwo1JNprP6KdFwYd1lUuhhSA7qaodMviMvFLsSu5Nm9ZVw/fTB DXxoeISDjHXBJk5+39wPujm4vvXhAts2DVfQ5CSwxwSWjtRpRw13Zcp72Ya7tEAB971AJd cEX6jUS6HtBV/7qMDXGAhykVTksfe2sTfgZ+MT0lv2a8Llte9sCXUHmct7r2/8HU2RDXe3 71fpQc6c0HltvWcE5gsf7ZiCL4WwA2rRubUToU3/P/+rdCtsHNRigY9y33M1LA== 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 4PYHly3sW3z12nj; Fri, 10 Mar 2023 20:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32AKWEIr095869; Fri, 10 Mar 2023 20:32:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32AKWEY4095868; Fri, 10 Mar 2023 20:32:14 GMT (envelope-from git) Date: Fri, 10 Mar 2023 20:32:14 GMT Message-Id: <202303102032.32AKWEY4095868@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 59c26d1a95a0 - stable/13 - heimdal: Fix CVE-2022-4152, signature validation error List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 59c26d1a95a00418892e08341e3eae074c238680 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=59c26d1a95a00418892e08341e3eae074c238680 commit 59c26d1a95a00418892e08341e3eae074c238680 Author: Cy Schubert AuthorDate: 2023-03-10 01:03:52 +0000 Commit: Cy Schubert CommitDate: 2023-03-10 04:07:25 +0000 heimdal: Fix CVE-2022-4152, signature validation error When CVE-2022-3437 was fixed by changing memcmp to be a constant time and the workaround for th e compiler was to add "!=0". However the logic implmented was inverted resulting in CVE-2022-4152. Reported by: Timothy E Zingelman Security: CVE-2022-4152 Security: https://www.cve.org/CVERecord?id=CVE-2022-45142 Security: https://nvd.nist.gov/vuln/detail/CVE-2022-45142 Security: https://security-tracker.debian.org/tracker/CVE-2022-45142 Security: https://bugs.gentoo.org/show_bug.cgi?id=CVE-2022-45142 Security: https://bugzilla.samba.org/show_bug.cgi?id=15296 Security: https://www.openwall.com/lists/oss-security/2023/02/08/1 (cherry picked from commit 5abaf0866445a61c11665fffc148ecd13a7bb9ac) --- crypto/heimdal/lib/gssapi/krb5/arcfour.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/heimdal/lib/gssapi/krb5/arcfour.c b/crypto/heimdal/lib/gssapi/krb5/arcfour.c index 3b8d452877dd..7d1143c95d83 100644 --- a/crypto/heimdal/lib/gssapi/krb5/arcfour.c +++ b/crypto/heimdal/lib/gssapi/krb5/arcfour.c @@ -307,7 +307,7 @@ _gssapi_verify_mic_arcfour(OM_uint32 * minor_status, return GSS_S_FAILURE; } - cmp = (ct_memcmp(cksum_data, p + 8, 8) == 0); + cmp = (ct_memcmp(cksum_data, p + 8, 8) != 0); if (cmp) { *minor_status = 0; return GSS_S_BAD_MIC; @@ -695,7 +695,7 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status, return GSS_S_FAILURE; } - cmp = (ct_memcmp(cksum_data, p0 + 16, 8) == 0); /* SGN_CKSUM */ + cmp = (ct_memcmp(cksum_data, p0 + 16, 8) != 0); /* SGN_CKSUM */ if (cmp) { _gsskrb5_release_buffer(minor_status, output_message_buffer); *minor_status = 0; From nobody Fri Mar 10 20:32:32 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PYHmJ6ktJz3xvCv; Fri, 10 Mar 2023 20:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PYHmJ6Hrfz4MqG; Fri, 10 Mar 2023 20:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678480352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RKNqhQtMXe526nf+8wL4YL2d/CPgpAF1QetDbgIiMmQ=; b=d4WWyU/2cQYZ9RKUMLS4jdAhciiBDKqfZN+9ba5mzGBA0XvMQm7uvVn+q+vkDPIPD6RIIe Jj3LWL0CoIjld7Ub0v7EEfRYSyx7GC/LL1sfMEfWoGmAgqdagZEKJHOjsm24xxutDjDPxX FKpRiRM7vTRESXmvehwOPRnmyVUDlnkBKZomi4y3BCfG4PlnZncUp76I1uUs3rzrf6qtjn Bu89c99QAFRDH+dGO8wP50z1csyJYDII9YR/xD5z15EcqKXX+kFxybDOQT+fHPoPXFc62e MHWFPUf9fKZVBebHyIM+bkkCPAunzgkQPSBEM/RaNizlK1TX3QpDdhdNVrTDhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678480352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RKNqhQtMXe526nf+8wL4YL2d/CPgpAF1QetDbgIiMmQ=; b=IbHBYX0p8l+6lgs9uPUzl1h2oXbxhEX/2gSOvrUjJdnuX4DiFkoBtEyb8+NGDQdSAh11/o uP6N1kLFtpJ0FUyRdHlqAWqDvARl3JzAICSDMOFDbqi/2IRF38MAO+Am1XPgbZBbCU2RbK d9VDrhTuQFWb4+FptU15u3FBaOmfwtQFo0BUo5roNIepbP6Vlh02roOKDhUuZPuFD+GZdz LY6/zU7idmvwBDH8FA4fMe6y+UiAEpBmxJBDTMEKx72eQGXgBNc1p2AtNYTBw2LiQdI5Sw gHEU6hs+vFS5llPmqQTFsK3mMeQrmJ6G+F2pynYDqIkRbd6/c11dOuTdt8ER1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678480352; a=rsa-sha256; cv=none; b=MZbqH7chMIwt3e9wKY+FL+j/FfQ0DmUxBRlsltXauJkZRlNZcXCcsIma/+ndILZ0x3olOL f8mwlpstCDW3T+xcH0zNAdw+ZLLBZFWI6NHticm2UI8bF7HHum1ojYPjoDrG62OyalZtvm k52xR5hl/S14GnlhAzzjPP9YfB3HZe83AYR0qjBxxyCLzzL1LRTSXZ/LhMMFdMA9ihnNwN 0UKtErNLBEcupLT+ZwtlAK0Q9BzOFlriwEGKBYyFg8Vyw058QQJfX3ipWe2robICCjuz7R PexYKZr/ZtNxE3G2RhQLqBe/9E4c/RJqt0VNj9C8REA1j0oL5x7jRP9L/0F8pA== 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 4PYHmJ5LGcz130q; Fri, 10 Mar 2023 20:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32AKWWvB096006; Fri, 10 Mar 2023 20:32:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32AKWWNu096005; Fri, 10 Mar 2023 20:32:32 GMT (envelope-from git) Date: Fri, 10 Mar 2023 20:32:32 GMT Message-Id: <202303102032.32AKWWNu096005@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: c4c0bd4d0102 - stable/12 - heimdal: Fix CVE-2022-4152, signature validation error List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: c4c0bd4d0102feef22157491538b78c0e894b1aa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=c4c0bd4d0102feef22157491538b78c0e894b1aa commit c4c0bd4d0102feef22157491538b78c0e894b1aa Author: Cy Schubert AuthorDate: 2023-03-10 01:03:52 +0000 Commit: Cy Schubert CommitDate: 2023-03-10 04:07:43 +0000 heimdal: Fix CVE-2022-4152, signature validation error When CVE-2022-3437 was fixed by changing memcmp to be a constant time and the workaround for th e compiler was to add "!=0". However the logic implmented was inverted resulting in CVE-2022-4152. Reported by: Timothy E Zingelman Security: CVE-2022-4152 Security: https://www.cve.org/CVERecord?id=CVE-2022-45142 Security: https://nvd.nist.gov/vuln/detail/CVE-2022-45142 Security: https://security-tracker.debian.org/tracker/CVE-2022-45142 Security: https://bugs.gentoo.org/show_bug.cgi?id=CVE-2022-45142 Security: https://bugzilla.samba.org/show_bug.cgi?id=15296 Security: https://www.openwall.com/lists/oss-security/2023/02/08/1 (cherry picked from commit 5abaf0866445a61c11665fffc148ecd13a7bb9ac) --- crypto/heimdal/lib/gssapi/krb5/arcfour.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/heimdal/lib/gssapi/krb5/arcfour.c b/crypto/heimdal/lib/gssapi/krb5/arcfour.c index 3b8d452877dd..7d1143c95d83 100644 --- a/crypto/heimdal/lib/gssapi/krb5/arcfour.c +++ b/crypto/heimdal/lib/gssapi/krb5/arcfour.c @@ -307,7 +307,7 @@ _gssapi_verify_mic_arcfour(OM_uint32 * minor_status, return GSS_S_FAILURE; } - cmp = (ct_memcmp(cksum_data, p + 8, 8) == 0); + cmp = (ct_memcmp(cksum_data, p + 8, 8) != 0); if (cmp) { *minor_status = 0; return GSS_S_BAD_MIC; @@ -695,7 +695,7 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status, return GSS_S_FAILURE; } - cmp = (ct_memcmp(cksum_data, p0 + 16, 8) == 0); /* SGN_CKSUM */ + cmp = (ct_memcmp(cksum_data, p0 + 16, 8) != 0); /* SGN_CKSUM */ if (cmp) { _gsskrb5_release_buffer(minor_status, output_message_buffer); *minor_status = 0;