Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17A85C4332F for ; Wed, 11 May 2022 16:55:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345190AbiEKQzQ (ORCPT ); Wed, 11 May 2022 12:55:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345202AbiEKQzP (ORCPT ); Wed, 11 May 2022 12:55:15 -0400 Received: from orbyte.nwl.cc (orbyte.nwl.cc [IPv6:2001:41d0:e:133a::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 293B821AA97 for ; Wed, 11 May 2022 09:55:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nwl.cc; s=mail2022; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=tFYK48sppjreSkfyC0tHo6J5wLWmwBOtafYcwOegDg8=; b=SkiEflcCoQQTecVapHTP3hEpFl fxa2vS9eDShJcMHnr8M21yQj0Dxr9r4XWyF+p5GjgRzwHbYIzDnGKRaJPRwro/kVjgS6QoeqH1l6q +InV6mctOMl9D7EUzvZcL2fOzi1zHzrkq0r7ZR+oPpMnp3/NDntBzcUbAp1kE6gY7b6b6kS5zd9ef S9BQ7KfjhY96Uaf2KmAaqf9P1PpE2sYbuQQMCE8A4gXNY7E95D9+Tz6kNdSVimhjPlCt9/ZWMXH1D QFH5U/t13e7YuPXtgVJafWp+Ap9AjzOTJzjKvGBgxJocq7L27fTDAZZL/Y4nEY6Y6Q5ZfHa0nDLN5 qB+4Gq/w==; Received: from localhost ([::1] helo=xic) by orbyte.nwl.cc with esmtp (Exim 4.94.2) (envelope-from ) id 1nopcG-0005jQ-FB; Wed, 11 May 2022 18:55:12 +0200 From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org Subject: [nf-next PATCH 1/2] netfilter: nf_tables: Introduce expression flags Date: Wed, 11 May 2022 18:54:52 +0200 Message-Id: <20220511165453.22425-2-phil@nwl.cc> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220511165453.22425-1-phil@nwl.cc> References: <20220511165453.22425-1-phil@nwl.cc> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Allow dumping some info bits about expressions to user space. Signed-off-by: Phil Sutter --- include/net/netfilter/nf_tables.h | 1 + include/uapi/linux/netfilter/nf_tables.h | 1 + net/netfilter/nf_tables_api.c | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h index 20af9d3557b9d..78db54737de00 100644 --- a/include/net/netfilter/nf_tables.h +++ b/include/net/netfilter/nf_tables.h @@ -346,6 +346,7 @@ struct nft_set_estimate { */ struct nft_expr { const struct nft_expr_ops *ops; + u32 flags; unsigned char data[] __attribute__((aligned(__alignof__(u64)))); }; diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h index 466fd3f4447c2..36bf019322a44 100644 --- a/include/uapi/linux/netfilter/nf_tables.h +++ b/include/uapi/linux/netfilter/nf_tables.h @@ -518,6 +518,7 @@ enum nft_expr_attributes { NFTA_EXPR_UNSPEC, NFTA_EXPR_NAME, NFTA_EXPR_DATA, + NFTA_EXPR_FLAGS, __NFTA_EXPR_MAX }; #define NFTA_EXPR_MAX (__NFTA_EXPR_MAX - 1) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index f3ad02a399f8a..fddc557983119 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -2731,6 +2731,7 @@ static const struct nft_expr_type *nft_expr_type_get(struct net *net, static const struct nla_policy nft_expr_policy[NFTA_EXPR_MAX + 1] = { [NFTA_EXPR_NAME] = { .type = NLA_STRING, .len = NFT_MODULE_AUTOLOAD_LIMIT }, + [NFTA_EXPR_FLAGS] = { .type = NLA_U32 }, [NFTA_EXPR_DATA] = { .type = NLA_NESTED }, }; @@ -2740,6 +2741,9 @@ static int nf_tables_fill_expr_info(struct sk_buff *skb, if (nla_put_string(skb, NFTA_EXPR_NAME, expr->ops->type->name)) goto nla_put_failure; + if (nla_put_u32(skb, NFTA_EXPR_FLAGS, expr->flags)) + goto nla_put_failure; + if (expr->ops->dump) { struct nlattr *data = nla_nest_start_noflag(skb, NFTA_EXPR_DATA); -- 2.34.1