From nobody Wed Nov 24 16:58:45 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0BE7218AC883; Wed, 24 Nov 2021 16:58:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HznK15J6Vz4djf; Wed, 24 Nov 2021 16:58:45 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 9614D5467; Wed, 24 Nov 2021 16:58: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 1AOGwjZq059572; Wed, 24 Nov 2021 16:58:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AOGwjkp059571; Wed, 24 Nov 2021 16:58:45 GMT (envelope-from git) Date: Wed, 24 Nov 2021 16:58:45 GMT Message-Id: <202111241658.1AOGwjkp059571@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: eaab06d53dfa - stable/13 - devfs.rules: Correctly unhide pf in vnet jails List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eaab06d53dfa7fbf926a2c19aa00a6804b5e6349 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637773125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bJGb2/pIWW1JtG9uuWE4R/eTYmyJDpJ3wGgjZMAI54Q=; b=lec5BiuUy51RjCxiueAG7JQGLg8u75zfOd51vujyke+Xr9FUH8T1Ul+EQxkaXI800q2+8H QjPdxvehcCA+exJ0lSfwyvBaIyo+4iLxRB8VtSaxbK5DQxWY8XAWGBkOGYK/MyzQIJmtcj ul3DRe3VFzUnFZcEzCDjFylNHwTcsA8U+UshVpHBFMDqo52Jeoq88qy+MW+ugljozB3Vxn IOCWui1QxmnCPlrebIP5VPvjX/MriK0lyJoxMw4jko5G5otP/FFXd3yJK8nzfWSZqy970/ NBrnSVj4HBX/Eq0UOY+nRVJSjprOqHBh4iutQ5uwVH7WJcI+8zhN8guqi8hBhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637773125; a=rsa-sha256; cv=none; b=SLc7G1Sm7PDFRgEHrJzgSdVvS0ZSD5qaFKu405nBupOfoOVnxUQWjevNHMsGkADFNffLm/ 22TRxzelEYTbn+/wsPmvzH9l0ng0M2Q+M/sOQIbIw6/LlEXB25goIjGvNvzuVDgAeWMx3U tUam8+R5iyKJ+bS+b3mpu7JusMCJix6VaQH42NIBvS4UEZnwOHdpq2f+LEccQZgD0gDRyy piQighnset5N5Rs+zesK8R+QWvp5mxX9FEjUWNGYFH2+0LP9yvMPFI6JVijghI4StDNIYk WfuJkhwFrzz46t9+SLk3/XAF5padCHPQClvdywZTjdQ0U1nhVZY0NJ07x9gIjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=eaab06d53dfa7fbf926a2c19aa00a6804b5e6349 commit eaab06d53dfa7fbf926a2c19aa00a6804b5e6349 Author: Zhenlei Huang AuthorDate: 2021-11-03 11:46:48 +0000 Commit: Kristof Provost CommitDate: 2021-11-24 16:45:51 +0000 devfs.rules: Correctly unhide pf in vnet jails Revision 9e9be081d8 introduced a new devfs rule devfsrules_jail_vnet. It includes rule devfsrules_jail which include other rules. Unfortunately devfs could not recursively parse the action include and thus devfsrules_jail_vnet will expose all nodes. PR: 255660 Reviewed by: kp Obtained from: Gijs Peskens MFC after: 3 weeks Differential Revision: https://reviews.freebsd.org/D32814 (cherry picked from commit 7acd322ebe2072b1d73b1d19c14ab12a300ba8e8) --- sbin/devfs/devfs.rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sbin/devfs/devfs.rules b/sbin/devfs/devfs.rules index 01d8e5194c17..9543e20947d9 100644 --- a/sbin/devfs/devfs.rules +++ b/sbin/devfs/devfs.rules @@ -88,5 +88,8 @@ add path fuse unhide add path zfs unhide [devfsrules_jail_vnet=5] +add include $devfsrules_hide_all +add include $devfsrules_unhide_basic +add include $devfsrules_unhide_login add include $devfsrules_jail add path pf unhide