{"id":809809,"url":"http://patchwork.ozlabs.org/api/1.2/patches/809809/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1504555874-4168-10-git-send-email-pablo@netfilter.org/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504555874-4168-10-git-send-email-pablo@netfilter.org>","list_archive_url":null,"date":"2017-09-04T20:11:11","name":"[09/12] netfilter: nf_tables: add nf_tables_addchain()","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"7821ff8af27c786951436b84da1e0ca222eee1eb","submitter":{"id":1315,"url":"http://patchwork.ozlabs.org/api/1.2/people/1315/?format=json","name":"Pablo Neira Ayuso","email":"pablo@netfilter.org"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1504555874-4168-10-git-send-email-pablo@netfilter.org/mbox/","series":[{"id":1451,"url":"http://patchwork.ozlabs.org/api/1.2/series/1451/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=1451","date":"2017-09-04T20:11:02","name":"[01/12] netfilter: xt_hashlimit: add rate match mode","version":1,"mbox":"http://patchwork.ozlabs.org/series/1451/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/809809/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809809/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xmLbt2SXKz9t2R\n\tfor ;\n\tTue, 5 Sep 2017 06:12:10 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932068AbdIDUL4 (ORCPT );\n\tMon, 4 Sep 2017 16:11:56 -0400","from mail.us.es ([193.147.175.20]:42160 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1754619AbdIDULc (ORCPT );\n\tMon, 4 Sep 2017 16:11:32 -0400","from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id 92CDC532F8B\n\tfor ; Mon, 4 Sep 2017 22:11:04 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 84DD9B502A\n\tfor ; Mon, 4 Sep 2017 22:11:04 +0200 (CEST)","by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid 7A6EB35BA; Mon, 4 Sep 2017 22:11:04 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 47532B5027;\n\tMon, 4 Sep 2017 22:11:02 +0200 (CEST)","from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int\n\t(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); \n\tMon, 04 Sep 2017 22:11:02 +0200 (CEST)","from salvia.here (129.166.216.87.static.jazztel.es\n\t[87.216.166.129]) (Authenticated sender: pneira@us.es)\n\tby entrada.int (Postfix) with ESMTPA id E05B84265A20;\n\tMon, 4 Sep 2017 22:11:01 +0200 (CEST)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.1 (2015-04-28) on\n\tantivirus1-rhel7.int","X-Spam-Level":"","X-Spam-Status":"No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50,\n\tSMTPAUTH_US2,USER_IN_WHITELIST autolearn=disabled version=3.4.1","X-Virus-Status":"clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int)","X-SMTPAUTHUS":"auth mail.us.es","From":"Pablo Neira Ayuso ","To":"netfilter-devel@vger.kernel.org","Cc":"davem@davemloft.net, netdev@vger.kernel.org","Subject":"[PATCH 09/12] netfilter: nf_tables: add nf_tables_addchain()","Date":"Mon, 4 Sep 2017 22:11:11 +0200","Message-Id":"<1504555874-4168-10-git-send-email-pablo@netfilter.org>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1504555874-4168-1-git-send-email-pablo@netfilter.org>","References":"<1504555874-4168-1-git-send-email-pablo@netfilter.org>","X-Virus-Scanned":"ClamAV using ClamSMTP","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Wrap the chain addition path in a function to make it more maintainable.\n\nSigned-off-by: Pablo Neira Ayuso \n---\n net/netfilter/nf_tables_api.c | 199 ++++++++++++++++++++++--------------------\n 1 file changed, 106 insertions(+), 93 deletions(-)","diff":"diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c\nindex a910544acf59..d95dfafea1e7 100644\n--- a/net/netfilter/nf_tables_api.c\n+++ b/net/netfilter/nf_tables_api.c\n@@ -1335,6 +1335,106 @@ static void nft_chain_release_hook(struct nft_chain_hook *hook)\n \t\tdev_put(hook->dev);\n }\n \n+static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask,\n+\t\t\t u8 policy, bool create)\n+{\n+\tconst struct nlattr * const *nla = ctx->nla;\n+\tstruct nft_table *table = ctx->table;\n+\tstruct nft_af_info *afi = ctx->afi;\n+\tstruct nft_base_chain *basechain;\n+\tstruct nft_stats __percpu *stats;\n+\tstruct net *net = ctx->net;\n+\tstruct nft_chain *chain;\n+\tunsigned int i;\n+\tint err;\n+\n+\tif (table->use == UINT_MAX)\n+\t\treturn -EOVERFLOW;\n+\n+\tif (nla[NFTA_CHAIN_HOOK]) {\n+\t\tstruct nft_chain_hook hook;\n+\t\tstruct nf_hook_ops *ops;\n+\t\tnf_hookfn *hookfn;\n+\n+\t\terr = nft_chain_parse_hook(net, nla, afi, &hook, create);\n+\t\tif (err < 0)\n+\t\t\treturn err;\n+\n+\t\tbasechain = kzalloc(sizeof(*basechain), GFP_KERNEL);\n+\t\tif (basechain == NULL) {\n+\t\t\tnft_chain_release_hook(&hook);\n+\t\t\treturn -ENOMEM;\n+\t\t}\n+\n+\t\tif (hook.dev != NULL)\n+\t\t\tstrncpy(basechain->dev_name, hook.dev->name, IFNAMSIZ);\n+\n+\t\tif (nla[NFTA_CHAIN_COUNTERS]) {\n+\t\t\tstats = nft_stats_alloc(nla[NFTA_CHAIN_COUNTERS]);\n+\t\t\tif (IS_ERR(stats)) {\n+\t\t\t\tnft_chain_release_hook(&hook);\n+\t\t\t\tkfree(basechain);\n+\t\t\t\treturn PTR_ERR(stats);\n+\t\t\t}\n+\t\t\tbasechain->stats = stats;\n+\t\t\tstatic_branch_inc(&nft_counters_enabled);\n+\t\t}\n+\n+\t\thookfn = hook.type->hooks[hook.num];\n+\t\tbasechain->type = hook.type;\n+\t\tchain = &basechain->chain;\n+\n+\t\tfor (i = 0; i < afi->nops; i++) {\n+\t\t\tops = &basechain->ops[i];\n+\t\t\tops->pf\t\t= family;\n+\t\t\tops->hooknum\t= hook.num;\n+\t\t\tops->priority\t= hook.priority;\n+\t\t\tops->priv\t= chain;\n+\t\t\tops->hook\t= afi->hooks[ops->hooknum];\n+\t\t\tops->dev\t= hook.dev;\n+\t\t\tif (hookfn)\n+\t\t\t\tops->hook = hookfn;\n+\t\t\tif (afi->hook_ops_init)\n+\t\t\t\tafi->hook_ops_init(ops, i);\n+\t\t}\n+\n+\t\tchain->flags |= NFT_BASE_CHAIN;\n+\t\tbasechain->policy = policy;\n+\t} else {\n+\t\tchain = kzalloc(sizeof(*chain), GFP_KERNEL);\n+\t\tif (chain == NULL)\n+\t\t\treturn -ENOMEM;\n+\t}\n+\tINIT_LIST_HEAD(&chain->rules);\n+\tchain->handle = nf_tables_alloc_handle(table);\n+\tchain->table = table;\n+\tchain->name = nla_strdup(nla[NFTA_CHAIN_NAME], GFP_KERNEL);\n+\tif (!chain->name) {\n+\t\terr = -ENOMEM;\n+\t\tgoto err1;\n+\t}\n+\n+\terr = nf_tables_register_hooks(net, table, chain, afi->nops);\n+\tif (err < 0)\n+\t\tgoto err1;\n+\n+\tctx->chain = chain;\n+\terr = nft_trans_chain_add(ctx, NFT_MSG_NEWCHAIN);\n+\tif (err < 0)\n+\t\tgoto err2;\n+\n+\ttable->use++;\n+\tlist_add_tail_rcu(&chain->list, &table->chains);\n+\n+\treturn 0;\n+err2:\n+\tnf_tables_unregister_hooks(net, table, chain, afi->nops);\n+err1:\n+\tnf_tables_chain_destroy(chain);\n+\n+\treturn err;\n+}\n+\n static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy,\n \t\t\t bool create)\n {\n@@ -1433,19 +1533,15 @@ static int nf_tables_newchain(struct net *net, struct sock *nlsk,\n {\n \tconst struct nfgenmsg *nfmsg = nlmsg_data(nlh);\n \tconst struct nlattr * uninitialized_var(name);\n+\tu8 genmask = nft_genmask_next(net);\n+\tint family = nfmsg->nfgen_family;\n \tstruct nft_af_info *afi;\n \tstruct nft_table *table;\n \tstruct nft_chain *chain;\n-\tstruct nft_base_chain *basechain = NULL;\n-\tu8 genmask = nft_genmask_next(net);\n-\tint family = nfmsg->nfgen_family;\n \tu8 policy = NF_ACCEPT;\n+\tstruct nft_ctx ctx;\n \tu64 handle = 0;\n-\tunsigned int i;\n-\tstruct nft_stats __percpu *stats;\n-\tint err;\n \tbool create;\n-\tstruct nft_ctx ctx;\n \n \tcreate = nlh->nlmsg_flags & NLM_F_CREATE ? true : false;\n \n@@ -1493,101 +1589,18 @@ static int nf_tables_newchain(struct net *net, struct sock *nlsk,\n \t\t}\n \t}\n \n+\tnft_ctx_init(&ctx, net, skb, nlh, afi, table, chain, nla);\n+\n \tif (chain != NULL) {\n \t\tif (nlh->nlmsg_flags & NLM_F_EXCL)\n \t\t\treturn -EEXIST;\n \t\tif (nlh->nlmsg_flags & NLM_F_REPLACE)\n \t\t\treturn -EOPNOTSUPP;\n \n-\t\tnft_ctx_init(&ctx, net, skb, nlh, afi, table, chain, nla);\n-\n \t\treturn nf_tables_updchain(&ctx, genmask, policy, create);\n \t}\n \n-\tif (table->use == UINT_MAX)\n-\t\treturn -EOVERFLOW;\n-\n-\tif (nla[NFTA_CHAIN_HOOK]) {\n-\t\tstruct nft_chain_hook hook;\n-\t\tstruct nf_hook_ops *ops;\n-\t\tnf_hookfn *hookfn;\n-\n-\t\terr = nft_chain_parse_hook(net, nla, afi, &hook, create);\n-\t\tif (err < 0)\n-\t\t\treturn err;\n-\n-\t\tbasechain = kzalloc(sizeof(*basechain), GFP_KERNEL);\n-\t\tif (basechain == NULL) {\n-\t\t\tnft_chain_release_hook(&hook);\n-\t\t\treturn -ENOMEM;\n-\t\t}\n-\n-\t\tif (hook.dev != NULL)\n-\t\t\tstrncpy(basechain->dev_name, hook.dev->name, IFNAMSIZ);\n-\n-\t\tif (nla[NFTA_CHAIN_COUNTERS]) {\n-\t\t\tstats = nft_stats_alloc(nla[NFTA_CHAIN_COUNTERS]);\n-\t\t\tif (IS_ERR(stats)) {\n-\t\t\t\tnft_chain_release_hook(&hook);\n-\t\t\t\tkfree(basechain);\n-\t\t\t\treturn PTR_ERR(stats);\n-\t\t\t}\n-\t\t\tbasechain->stats = stats;\n-\t\t\tstatic_branch_inc(&nft_counters_enabled);\n-\t\t}\n-\n-\t\thookfn = hook.type->hooks[hook.num];\n-\t\tbasechain->type = hook.type;\n-\t\tchain = &basechain->chain;\n-\n-\t\tfor (i = 0; i < afi->nops; i++) {\n-\t\t\tops = &basechain->ops[i];\n-\t\t\tops->pf\t\t= family;\n-\t\t\tops->hooknum\t= hook.num;\n-\t\t\tops->priority\t= hook.priority;\n-\t\t\tops->priv\t= chain;\n-\t\t\tops->hook\t= afi->hooks[ops->hooknum];\n-\t\t\tops->dev\t= hook.dev;\n-\t\t\tif (hookfn)\n-\t\t\t\tops->hook = hookfn;\n-\t\t\tif (afi->hook_ops_init)\n-\t\t\t\tafi->hook_ops_init(ops, i);\n-\t\t}\n-\n-\t\tchain->flags |= NFT_BASE_CHAIN;\n-\t\tbasechain->policy = policy;\n-\t} else {\n-\t\tchain = kzalloc(sizeof(*chain), GFP_KERNEL);\n-\t\tif (chain == NULL)\n-\t\t\treturn -ENOMEM;\n-\t}\n-\n-\tINIT_LIST_HEAD(&chain->rules);\n-\tchain->handle = nf_tables_alloc_handle(table);\n-\tchain->table = table;\n-\tchain->name = nla_strdup(name, GFP_KERNEL);\n-\tif (!chain->name) {\n-\t\terr = -ENOMEM;\n-\t\tgoto err1;\n-\t}\n-\n-\terr = nf_tables_register_hooks(net, table, chain, afi->nops);\n-\tif (err < 0)\n-\t\tgoto err1;\n-\n-\tnft_ctx_init(&ctx, net, skb, nlh, afi, table, chain, nla);\n-\terr = nft_trans_chain_add(&ctx, NFT_MSG_NEWCHAIN);\n-\tif (err < 0)\n-\t\tgoto err2;\n-\n-\ttable->use++;\n-\tlist_add_tail_rcu(&chain->list, &table->chains);\n-\treturn 0;\n-err2:\n-\tnf_tables_unregister_hooks(net, table, chain, afi->nops);\n-err1:\n-\tnf_tables_chain_destroy(chain);\n-\treturn err;\n+\treturn nf_tables_addchain(&ctx, family, genmask, policy, create);\n }\n \n static int nf_tables_delchain(struct net *net, struct sock *nlsk,\n","prefixes":["09/12"]}