From nobody Fri Sep 22 10:09:49 2023 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 4RsSgL10X7z4tdTx; Fri, 22 Sep 2023 10:09:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RsSgL0NBmz4ndk; Fri, 22 Sep 2023 10:09:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695377390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2wGvr/PzitNlHqmJwetOADQ1hmMgvVe5cvQlsZXUd5Q=; b=JVO0fmo9OApS2SZNGSgOhirVjD0Sik/aCF/cw8pRTc1NkDRVnrj/MLCLflr99CwOjrxOtr gPaTQCxfnMP4CqzaJLy8beQH9fbh1aAG7c1LPouoYjJNEurHP2YlrLWa/K6PmVN0UwvKfu X1ulFWkxWIsebdVOxXfEpRSgcDDC6j0QLfeYyFTeY55XpZgb/kxlO3IBtQ1+qkKQeIF8Uh vRIShaei/bEBpEQOgK4xVTo0A4rzFxWhwUPeSKTckivakOWrdkfO/C7mvlwsIcafFarPHJ vLnnlhllOgkwkai2vrExuQ82q/zj85OdQEvNfHtMMix33OxVox/urt2K+cqu8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695377390; a=rsa-sha256; cv=none; b=YPq1GktGz+8XizrKKNzWjKjS+4tkJcqljc+6RskOpm3DKZsVVRV0NDRyrxWj2NmORYX17k 0w4mHkE1hfFkt7r/Kn2TADai0HduZwYGfw77gSGgcsMS0JL+WXd7wsDFlJnGd9+hewnHb1 b1k6fBjyNA0/a1Nomh65hyWkK+8jKUqiWtXrLuQG+aTsFyx1wYew7BQmCUf3X8YFARoTng d2wtmatvIhuRhH/2RnZlTw+EEiv6qxINgm8FDgcn42sRRlgrIScdXayG3WmIwEfOafWLtM arDh/GpyVyk7CRsEc1Mm7P5IQtnujhNy4U6WaadUAifY4+6ItS5C3KhkPu5FLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695377390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2wGvr/PzitNlHqmJwetOADQ1hmMgvVe5cvQlsZXUd5Q=; b=kWyq2whVgRRG7rrNIfIx2khHxHcBNJFgEViUWVckFMgTdf/y+eLaR7xe5pel7fIRIvU3qO 7ucpJQgikNOMSbDzRjDkTRvwCKV/zza+WoH5ci53a1FdeWYIK5rlmkgNwWqINuUM8aaRkG rdoRhWPJMCwMx9WeXj8QNYVmZ8FIofwOTKnYE/LbP4f+rXTrtjCo8bMA0nUbSSv0Ew8TQf oiQUR3GSBg4Y3FQKGWe6LazC36a22xyjQXJegfwid8WVEvttLwUTgJs557X6vJhtnT40gO iNyZJ7WtJDTj3auCt/b1EEKlKdot8CcOOeuVL/rY8JtRJO0KuNi2G8Mx6mfGpw== 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 4RsSgK6WH6z30j; Fri, 22 Sep 2023 10:09:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38MA9nAN066512; Fri, 22 Sep 2023 10:09:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MA9nAO066509; Fri, 22 Sep 2023 10:09:49 GMT (envelope-from git) Date: Fri, 22 Sep 2023 10:09:49 GMT Message-Id: <202309221009.38MA9nAO066509@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: c531c1d1462c - main - pf: Convert PF_DEFAULT_TO_DROP into a vnet loader tunable 'net.pf.default_to_drop' 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c531c1d1462c45f7ce5de4f9913226801f3073bd Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c531c1d1462c45f7ce5de4f9913226801f3073bd commit c531c1d1462c45f7ce5de4f9913226801f3073bd Author: Zhenlei Huang AuthorDate: 2023-09-22 10:05:02 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-22 10:05:02 +0000 pf: Convert PF_DEFAULT_TO_DROP into a vnet loader tunable 'net.pf.default_to_drop' 7f7ef494f11d introduced a compile time option PF_DEFAULT_TO_DROP to make the pf(4) default rule to drop. While this change exposes a vnet loader tunable 'net.pf.default_to_drop' so that users can change the default rule without re-compiling the pf(4) module. This change is similiar to that for IPFW [1]. 1. 5f17ebf94db5 Convert IPFW_DEFAULT_TO_ACCEPT into a loader tunable 'net.inet.ip.fw.default_to_accept' Reviewed by: #network, kp MFC after: 2 weeks Relnotes: yes Differential Revision: https://reviews.freebsd.org/D39866 --- share/man/man4/pf.4 | 4 ++++ sys/netpfil/pf/pf_ioctl.c | 16 +++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/share/man/man4/pf.4 b/share/man/man4/pf.4 index 0f7bde1031cb..5309db10d807 100644 --- a/share/man/man4/pf.4 +++ b/share/man/man4/pf.4 @@ -87,6 +87,10 @@ Default value is 131072. Size of hash table that store source nodes. Should be power of 2. Default value is 32768. +.It Va net.pf.default_to_drop +This value overrides +.Cd "options PF_DEFAULT_TO_DROP" +from kernel configuration file. .El .Pp Read only diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 8dbc8986e7d3..db8f481a1567 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -199,6 +199,16 @@ SYSCTL_BOOL(_net_pf, OID_AUTO, filter_local, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(pf_filter_local), false, "Enable filtering for packets delivered to local network stack"); +#ifdef PF_DEFAULT_TO_DROP +VNET_DEFINE_STATIC(bool, default_to_drop) = true; +#else +VNET_DEFINE_STATIC(bool, default_to_drop); +#endif +#define V_default_to_drop VNET(default_to_drop) +SYSCTL_BOOL(_net_pf, OID_AUTO, default_to_drop, CTLFLAG_RDTUN | CTLFLAG_VNET, + &VNET_NAME(default_to_drop), false, + "Make the default rule drop all packets."); + static void pf_init_tagset(struct pf_tagset *, unsigned int *, unsigned int); static void pf_cleanup_tagset(struct pf_tagset *); @@ -335,11 +345,7 @@ pfattach_vnet(void) /* default rule should never be garbage collected */ V_pf_default_rule.entries.tqe_prev = &V_pf_default_rule.entries.tqe_next; -#ifdef PF_DEFAULT_TO_DROP - V_pf_default_rule.action = PF_DROP; -#else - V_pf_default_rule.action = PF_PASS; -#endif + V_pf_default_rule.action = V_default_to_drop ? PF_DROP : PF_PASS; V_pf_default_rule.nr = -1; V_pf_default_rule.rtableid = -1;