From patchwork Tue Mar 9 21:01:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 1450193 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Dw72h4nNRz9sW5 for ; Wed, 10 Mar 2021 08:02:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231788AbhCIVCT (ORCPT ); Tue, 9 Mar 2021 16:02:19 -0500 Received: from correo.us.es ([193.147.175.20]:60886 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231858AbhCIVBs (ORCPT ); Tue, 9 Mar 2021 16:01:48 -0500 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id EA342E1230 for ; Tue, 9 Mar 2021 22:01:45 +0100 (CET) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id D990EDA78F for ; Tue, 9 Mar 2021 22:01:45 +0100 (CET) Received: by antivirus1-rhel7.int (Postfix, from userid 99) id CEC14DA78C; Tue, 9 Mar 2021 22:01:45 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on antivirus1-rhel7.int X-Spam-Level: X-Spam-Status: No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50, SMTPAUTH_US2,URIBL_BLOCKED,USER_IN_WELCOMELIST,USER_IN_WHITELIST autolearn=disabled version=3.4.1 Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 8C154DA73D; Tue, 9 Mar 2021 22:01:43 +0100 (CET) Received: from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int (F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); Tue, 09 Mar 2021 22:01:43 +0100 (CET) X-Virus-Status: clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int) Received: from localhost.localdomain (unknown [90.77.255.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: pneira@us.es) by entrada.int (Postfix) with ESMTPSA id 5F93E42DF562; Tue, 9 Mar 2021 22:01:43 +0100 (CET) X-SMTPAUTHUS: auth mail.us.es From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: fw@strlen.de, fmyhr@fhmtech.com, stefanh@hafenthal.de Subject: [PATCH nf-next 1/2] netfilter: nftables: rename NFT_CT_HELPER to NFT_CT_HELPER_TYPE Date: Tue, 9 Mar 2021 22:01:33 +0100 Message-Id: <20210309210134.13620-2-pablo@netfilter.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210309210134.13620-1-pablo@netfilter.org> References: <20210309210134.13620-1-pablo@netfilter.org> MIME-Version: 1.0 X-Virus-Scanned: ClamAV using ClamSMTP Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org The existing NFT_CT_HELPER allows to match on the helper type, rename this attribute to support for matching on the helper object name. NFT_CT_HELPER is left in place for backward compatibility. Signed-off-by: Pablo Neira Ayuso --- include/uapi/linux/netfilter/nf_tables.h | 5 +++-- net/netfilter/nft_ct.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h index 79bab7a36b30..481e32c1b1b2 100644 --- a/include/uapi/linux/netfilter/nf_tables.h +++ b/include/uapi/linux/netfilter/nf_tables.h @@ -1047,7 +1047,7 @@ enum nft_socket_keys { * @NFT_CT_MARK: conntrack mark value * @NFT_CT_SECMARK: conntrack secmark value * @NFT_CT_EXPIRATION: relative conntrack expiration time in ms - * @NFT_CT_HELPER: connection tracking helper assigned to conntrack + * @NFT_CT_HELPER_TYPE: connection tracking helper type assigned to conntrack * @NFT_CT_L3PROTOCOL: conntrack layer 3 protocol * @NFT_CT_SRC: conntrack layer 3 protocol source (IPv4/IPv6 address, deprecated) * @NFT_CT_DST: conntrack layer 3 protocol destination (IPv4/IPv6 address, deprecated) @@ -1073,7 +1073,8 @@ enum nft_ct_keys { NFT_CT_MARK, NFT_CT_SECMARK, NFT_CT_EXPIRATION, - NFT_CT_HELPER, + NFT_CT_HELPER_TYPE, +#define NFT_CT_HELPER NFT_CT_HELPER_TYPE NFT_CT_L3PROTOCOL, NFT_CT_SRC, NFT_CT_DST, diff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c index 882fe8648653..a9041dce9345 100644 --- a/net/netfilter/nft_ct.c +++ b/net/netfilter/nft_ct.c @@ -107,7 +107,7 @@ static void nft_ct_get_eval(const struct nft_expr *expr, case NFT_CT_EXPIRATION: *dest = jiffies_to_msecs(nf_ct_expires(ct)); return; - case NFT_CT_HELPER: + case NFT_CT_HELPER_TYPE: if (ct->master == NULL) goto err; help = nfct_help(ct->master); @@ -418,7 +418,7 @@ static int nft_ct_get_init(const struct nft_ctx *ctx, len = NF_CT_LABELS_MAX_SIZE; break; #endif - case NFT_CT_HELPER: + case NFT_CT_HELPER_TYPE: if (tb[NFTA_CT_DIRECTION] != NULL) return -EINVAL; len = NF_CT_HELPER_NAME_LEN; From patchwork Tue Mar 9 21:01:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 1450194 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Dw72j05YBz9sWL for ; Wed, 10 Mar 2021 08:02:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231858AbhCIVCU (ORCPT ); Tue, 9 Mar 2021 16:02:20 -0500 Received: from correo.us.es ([193.147.175.20]:60920 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230431AbhCIVBu (ORCPT ); Tue, 9 Mar 2021 16:01:50 -0500 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id 465FDE1227 for ; Tue, 9 Mar 2021 22:01:49 +0100 (CET) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 31EA9DA78A for ; Tue, 9 Mar 2021 22:01:49 +0100 (CET) Received: by antivirus1-rhel7.int (Postfix, from userid 99) id 268D3DA722; Tue, 9 Mar 2021 22:01:49 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on antivirus1-rhel7.int X-Spam-Level: X-Spam-Status: No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50, SMTPAUTH_US2,URIBL_BLOCKED,USER_IN_WELCOMELIST,USER_IN_WHITELIST autolearn=disabled version=3.4.1 Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id D4650DA72F; Tue, 9 Mar 2021 22:01:46 +0100 (CET) Received: from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int (F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); Tue, 09 Mar 2021 22:01:46 +0100 (CET) X-Virus-Status: clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int) Received: from localhost.localdomain (unknown [90.77.255.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: pneira@us.es) by entrada.int (Postfix) with ESMTPSA id AAD3C42DF562; Tue, 9 Mar 2021 22:01:46 +0100 (CET) X-SMTPAUTHUS: auth mail.us.es From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: fw@strlen.de, fmyhr@fhmtech.com, stefanh@hafenthal.de Subject: [PATCH nf-next 2/2] netfilter: nftables: add NFT_CT_HELPER_OBJNAME Date: Tue, 9 Mar 2021 22:01:34 +0100 Message-Id: <20210309210134.13620-3-pablo@netfilter.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210309210134.13620-1-pablo@netfilter.org> References: <20210309210134.13620-1-pablo@netfilter.org> MIME-Version: 1.0 X-Virus-Scanned: ClamAV using ClamSMTP Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Conntrack helper assignments refer to the helper object name, while NFT_CT_HELPER (now NFT_CT_HELPER_TYPE) refers to the helper type. This patch allows to match on helper object name so the ct helper matching and the assignment are consistent. Signed-off-by: Pablo Neira Ayuso --- include/net/netfilter/nf_conntrack_helper.h | 1 + include/uapi/linux/netfilter/nf_tables.h | 2 ++ net/netfilter/nf_conntrack_helper.c | 1 + net/netfilter/nft_ct.c | 26 ++++++++++++++++++--- 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h index 37f0fbefb060..c0020d5206cd 100644 --- a/include/net/netfilter/nf_conntrack_helper.h +++ b/include/net/netfilter/nf_conntrack_helper.h @@ -70,6 +70,7 @@ struct nf_conntrack_helper { struct nf_conn_help { /* Helper. if any */ struct nf_conntrack_helper __rcu *helper; + const char *objname; struct hlist_head expectations; diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h index 481e32c1b1b2..1cca009858bf 100644 --- a/include/uapi/linux/netfilter/nf_tables.h +++ b/include/uapi/linux/netfilter/nf_tables.h @@ -1065,6 +1065,7 @@ enum nft_socket_keys { * @NFT_CT_SRC_IP6: conntrack layer 3 protocol source (IPv6 address) * @NFT_CT_DST_IP6: conntrack layer 3 protocol destination (IPv6 address) * @NFT_CT_ID: conntrack id + * @NFT_CT_HELPER_OBJNAME: connection tracking helper object assigned to conntrack */ enum nft_ct_keys { NFT_CT_STATE, @@ -1092,6 +1093,7 @@ enum nft_ct_keys { NFT_CT_SRC_IP6, NFT_CT_DST_IP6, NFT_CT_ID, + NFT_CT_HELPER_OBJNAME, __NFT_CT_MAX }; #define NFT_CT_MAX (__NFT_CT_MAX - 1) diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c index 118f415928ae..c14b0733485b 100644 --- a/net/netfilter/nf_conntrack_helper.c +++ b/net/netfilter/nf_conntrack_helper.c @@ -311,6 +311,7 @@ void nf_ct_helper_destroy(struct nf_conn *ct) if (helper && helper->destroy) helper->destroy(ct); rcu_read_unlock(); + kfree(help->objname); } } diff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c index a9041dce9345..a412de6de9ca 100644 --- a/net/netfilter/nft_ct.c +++ b/net/netfilter/nft_ct.c @@ -219,6 +219,17 @@ static void nft_ct_get_eval(const struct nft_expr *expr, goto err; memcpy(dest, tuple->dst.u3.ip6, sizeof(struct in6_addr)); return; + case NFT_CT_HELPER_OBJNAME: + if (!ct->master) + goto err; + help = nfct_help(ct->master); + if (!help) + goto err; + helper = rcu_dereference(help->helper); + if (!helper || !help->objname) + goto err; + strncpy((char *)dest, help->objname, NF_CT_HELPER_NAME_LEN); + return; default: break; } @@ -1063,6 +1074,7 @@ static void nft_ct_helper_obj_eval(struct nft_object *obj, struct nf_conn *ct = (struct nf_conn *)skb_nfct(pkt->skb); struct nf_conntrack_helper *to_assign = NULL; struct nf_conn_help *help; + const char *objname; if (!ct || nf_ct_is_confirmed(ct) || @@ -1088,11 +1100,19 @@ static void nft_ct_helper_obj_eval(struct nft_object *obj, if (test_bit(IPS_HELPER_BIT, &ct->status)) return; + objname = kstrdup(obj->key.name, GFP_ATOMIC); + if (!objname) + return; + help = nf_ct_helper_ext_add(ct, GFP_ATOMIC); - if (help) { - rcu_assign_pointer(help->helper, to_assign); - set_bit(IPS_HELPER_BIT, &ct->status); + if (!help) { + kfree(objname); + return; } + + help->objname = objname; + rcu_assign_pointer(help->helper, to_assign); + set_bit(IPS_HELPER_BIT, &ct->status); } static int nft_ct_helper_obj_dump(struct sk_buff *skb,