From nobody Mon Feb 10 11:10:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys21423qWz5nkX2; Mon, 10 Feb 2025 11:10:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys21346Myz3dD9; Mon, 10 Feb 2025 11:10:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739185815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RzNMDix1uZ8s6vmmELu2kqO5oUMCNreF7UIviS2aWZI=; b=xwR2L+cWyv3hUBo4X7dURXFmsCOh+5KXsl7cV9IyXs3IQDpqnivP6xREOtWyWueW76SDjJ Qkou6idujnf0YJ7ei+ACam8CDFiq9H2rZxuVANtSkycrgc5FGzg8+nFmVkxbEUnTdCjQR/ I1n6tK0Pth52BCuoU0C8kiOT1U1EWAcuz3+Q/t9NqdWCtT8jVFtSTTkpA4nIfkGxh+X+EL m2mhhXmTrLep8uoq9WF/+lXK6naBgs/abMKKb4wxNUviDYADSHHlrxS0gQ2i5TfBAoo3uE xfqY6sC8Pdr0jb3MUf/1Ws7r3TTweOyB5eBsdD4YoR5i3d6P+tikcgZVGwc/dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739185815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RzNMDix1uZ8s6vmmELu2kqO5oUMCNreF7UIviS2aWZI=; b=e/nbGb0XaYXyq9JgVYHQVDMxgFvLWF6pyalHVygl6glBTZ2j8opGX0uV417g4GqItkz9a7 VuvW2UhLDjFQsT0MFfCFTTjHVT6+0men5nLypf5uFcTpzMIHoCOLyHvdhJtNNwT0UCQoKN o3etLAWQnFU9edPlM0yATEcsE9tVZ22cSYkxe5GcFWxj2RGDJxNtz3BjtbUslVrv7y7d9O 9DB6LJYt3AzVCPKAAu175LnNUtdJCzAaQmIHYF6hYYw5l86evKazugbM+Uoi21Sxk66kbL E+aUXabvcVTTch70owkyrI9J/IXiepMuNd+W5Z6C4B47tD98DQky7VcjuQyxqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739185815; a=rsa-sha256; cv=none; b=f8J3rJn4W0NzSdNxInDhIxbuE41jI3coZSSlqjjfhvArsZ2X6p4wjqIqodxkn5lTgK4j4M 5xd4gl5YhCKKm/m4Fzj9MIl1FPn4DcIrcAwuD4/+k1YELY9DGGuy0CPYreIl4SkVH28zio vJEhOqG649XFtdLg+QykN4eUfcctnfG/hx3e/nmppcHypOFfRk2UajvKEMK+bODEKePwdG sOeRyYx/y6mJ/L5SWp1VmjzDXu4WNTy+5heJIUVAUiOCy9rVivIc7ut4zluxkJO+luTiXX MrOtD4qfDcHTH4JDz0spr0QC7wVyTcqTz0++fY3q59iQ5izuLj48SkVA48InzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ys2124Zvbz8bD; Mon, 10 Feb 2025 11:10:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51ABAE54006245; Mon, 10 Feb 2025 11:10:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51ABAEII006236; Mon, 10 Feb 2025 11:10:14 GMT (envelope-from git) Date: Mon, 10 Feb 2025 11:10:14 GMT Message-Id: <202502101110.51ABAEII006236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 0d2058abf3b2 - main - pf: convert DIOCRDELTABLES to netlink List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d2058abf3b252e77dae8808dd744c0293b5f433 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0d2058abf3b252e77dae8808dd744c0293b5f433 commit 0d2058abf3b252e77dae8808dd744c0293b5f433 Author: Kristof Provost AuthorDate: 2025-02-07 17:39:51 +0000 Commit: Kristof Provost CommitDate: 2025-02-10 11:09:47 +0000 pf: convert DIOCRDELTABLES to netlink Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 38 ++++++++++++++++++++++++++++++++++++++ lib/libpfctl/libpfctl.h | 2 ++ sbin/pfctl/pfctl_radix.c | 15 +-------------- sys/netpfil/pf/pf_nl.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ sys/netpfil/pf/pf_nl.h | 1 + 5 files changed, 86 insertions(+), 14 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 50dfcfea703d..8569d691773c 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -3143,3 +3143,41 @@ pfctl_add_table(struct pfctl_handle *h, struct pfr_table *table, return (e.error); } +int +pfctl_del_table(struct pfctl_handle *h, struct pfr_table *table, + int *ndel, int flags) +{ + struct snl_writer nw; + struct snl_errmsg_data e = {}; + struct nlmsghdr *hdr; + uint32_t seq_id; + int family_id; + + family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); + if (family_id == 0) + return (ENOTSUP); + + snl_init_writer(&h->ss, &nw); + hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_DEL_TABLE); + + snl_add_msg_attr_string(&nw, PF_T_ANCHOR, table->pfrt_anchor); + snl_add_msg_attr_string(&nw, PF_T_NAME, table->pfrt_name); + snl_add_msg_attr_u32(&nw, PF_T_TABLE_FLAGS, table->pfrt_flags); + snl_add_msg_attr_u32(&nw, PF_T_FLAGS, flags); + + if ((hdr = snl_finalize_msg(&nw)) == NULL) + return (ENXIO); + + seq_id = hdr->nlmsg_seq; + + if (!snl_send_message(&h->ss, hdr)) + return (ENXIO); + + while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { + if (!snl_parse_nlmsg(&h->ss, hdr, &ndel_parser, ndel)) + continue; + } + + return (e.error); +} + diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index 300511452d8f..d5d0a43f90a3 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -544,5 +544,7 @@ int pfctl_clear_tables(struct pfctl_handle *h, struct pfr_table *filter, int *ndel, int flags); int pfctl_add_table(struct pfctl_handle *h, struct pfr_table *table, int *nadd, int flags); +int pfctl_del_table(struct pfctl_handle *h, struct pfr_table *table, + int *ndel, int flags); #endif diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c index 451b83371d05..94de63414885 100644 --- a/sbin/pfctl/pfctl_radix.c +++ b/sbin/pfctl/pfctl_radix.c @@ -82,20 +82,7 @@ pfr_add_table(struct pfr_table *tbl, int *nadd, int flags) int pfr_del_table(struct pfr_table *tbl, int *ndel, int flags) { - struct pfioc_table io; - - bzero(&io, sizeof io); - io.pfrio_flags = flags; - io.pfrio_buffer = tbl; - io.pfrio_esize = sizeof(*tbl); - io.pfrio_size = 1; - if (ioctl(dev, DIOCRDELTABLES, &io)) { - pfr_report_error(tbl, &io, "delete table"); - return (-1); - } - if (ndel != NULL) - *ndel = io.pfrio_ndel; - return (0); + return (pfctl_del_table(pfh, tbl, ndel, flags)); } int diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index 74c5bdca4f77..97552880b9e3 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -1879,6 +1879,43 @@ pf_handle_add_table(struct nlmsghdr *hdr, struct nl_pstate *npt) return (0); } +static int +pf_handle_del_table(struct nlmsghdr *hdr, struct nl_pstate *npt) +{ + struct pfioc_table attrs = { 0 }; + struct nl_writer *nw = npt->nw; + struct genlmsghdr *ghdr_new; + int error; + + error = nl_parse_nlmsg(hdr, &table_parser, npt, &attrs); + if (error != 0) + return (error); + + PF_RULES_WLOCK(); + error = pfr_del_tables(&attrs.pfrio_table, 1, &attrs.pfrio_ndel, + attrs.pfrio_flags | PFR_FLAG_USERIOCTL); + PF_RULES_WUNLOCK(); + if (error != 0) + return (error); + + if (!nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr))) + return (ENOMEM); + + ghdr_new = nlmsg_reserve_object(nw, struct genlmsghdr); + ghdr_new->cmd = PFNL_CMD_ADD_TABLE; + ghdr_new->version = 0; + ghdr_new->reserved = 0; + + nlattr_add_u32(nw, PF_T_NBR_DELETED, attrs.pfrio_ndel); + + if (!nlmsg_end(nw)) { + nlmsg_abort(nw); + return (ENOMEM); + } + + return (0); +} + static const struct nlhdr_parser *all_parsers[] = { &state_parser, &addrule_parser, @@ -2087,6 +2124,13 @@ static const struct genl_cmd pf_cmds[] = { .cmd_flags = GENL_CMD_CAP_DO | GENL_CMD_CAP_HASPOL, .cmd_priv = PRIV_NETINET_PF, }, + { + .cmd_num = PFNL_CMD_DEL_TABLE, + .cmd_name = "DEL_TABLE", + .cmd_cb = pf_handle_del_table, + .cmd_flags = GENL_CMD_CAP_DO | GENL_CMD_CAP_HASPOL, + .cmd_priv = PRIV_NETINET_PF, + }, }; void diff --git a/sys/netpfil/pf/pf_nl.h b/sys/netpfil/pf/pf_nl.h index 38a44c2c4395..a66ff5bc3f1e 100644 --- a/sys/netpfil/pf/pf_nl.h +++ b/sys/netpfil/pf/pf_nl.h @@ -63,6 +63,7 @@ enum { PFNL_CMD_GET_SRCNODES = 25, PFNL_CMD_CLEAR_TABLES = 26, PFNL_CMD_ADD_TABLE = 27, + PFNL_CMD_DEL_TABLE = 28, __PFNL_CMD_MAX, }; #define PFNL_CMD_MAX (__PFNL_CMD_MAX -1)