{"id":809807,"url":"http://patchwork.ozlabs.org/api/1.2/patches/809807/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1504555874-4168-9-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-9-git-send-email-pablo@netfilter.org>","list_archive_url":null,"date":"2017-09-04T20:11:10","name":"[08/12] netfilter: nf_tables: add nf_tables_updchain()","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"f0e81efde9369790db33007a28e21571ee29c456","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-9-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/809807/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809807/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 3xmLbj4lJmz9t2R\n\tfor ;\n\tTue, 5 Sep 2017 06:12:01 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932080AbdIDUL7 (ORCPT );\n\tMon, 4 Sep 2017 16:11:59 -0400","from mail.us.es ([193.147.175.20]:42150 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1754690AbdIDULb (ORCPT );\n\tMon, 4 Sep 2017 16:11:31 -0400","from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id BAFFB532F94\n\tfor ; Mon, 4 Sep 2017 22:11:03 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id ABF9CB502C\n\tfor ; Mon, 4 Sep 2017 22:11:03 +0200 (CEST)","by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid A1AA6B5026; Mon, 4 Sep 2017 22:11:03 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 75792B503F;\n\tMon, 4 Sep 2017 22:11:01 +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:01 +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 154024265A20;\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 08/12] netfilter: nf_tables: add nf_tables_updchain()","Date":"Mon, 4 Sep 2017 22:11:10 +0200","Message-Id":"<1504555874-4168-9-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":"nf_tables_newchain() is too large, wrap the chain update path in a\nfunction to make it more maintainable.\n\nSigned-off-by: Pablo Neira Ayuso \n---\n net/netfilter/nf_tables_api.c | 170 +++++++++++++++++++++++-------------------\n 1 file changed, 92 insertions(+), 78 deletions(-)","diff":"diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c\nindex b37c178897f3..a910544acf59 100644\n--- a/net/netfilter/nf_tables_api.c\n+++ b/net/netfilter/nf_tables_api.c\n@@ -1335,6 +1335,97 @@ static void nft_chain_release_hook(struct nft_chain_hook *hook)\n \t\tdev_put(hook->dev);\n }\n \n+static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy,\n+\t\t\t bool create)\n+{\n+\tconst struct nlattr * const *nla = ctx->nla;\n+\tstruct nft_table *table = ctx->table;\n+\tstruct nft_chain *chain = ctx->chain;\n+\tstruct nft_af_info *afi = ctx->afi;\n+\tstruct nft_base_chain *basechain;\n+\tstruct nft_stats *stats = NULL;\n+\tstruct nft_chain_hook hook;\n+\tconst struct nlattr *name;\n+\tstruct nf_hook_ops *ops;\n+\tstruct nft_trans *trans;\n+\tint err, i;\n+\n+\tif (nla[NFTA_CHAIN_HOOK]) {\n+\t\tif (!nft_is_base_chain(chain))\n+\t\t\treturn -EBUSY;\n+\n+\t\terr = nft_chain_parse_hook(ctx->net, nla, ctx->afi, &hook,\n+\t\t\t\t\t create);\n+\t\tif (err < 0)\n+\t\t\treturn err;\n+\n+\t\tbasechain = nft_base_chain(chain);\n+\t\tif (basechain->type != hook.type) {\n+\t\t\tnft_chain_release_hook(&hook);\n+\t\t\treturn -EBUSY;\n+\t\t}\n+\n+\t\tfor (i = 0; i < afi->nops; i++) {\n+\t\t\tops = &basechain->ops[i];\n+\t\t\tif (ops->hooknum != hook.num ||\n+\t\t\t ops->priority != hook.priority ||\n+\t\t\t ops->dev != hook.dev) {\n+\t\t\t\tnft_chain_release_hook(&hook);\n+\t\t\t\treturn -EBUSY;\n+\t\t\t}\n+\t\t}\n+\t\tnft_chain_release_hook(&hook);\n+\t}\n+\n+\tif (nla[NFTA_CHAIN_HANDLE] &&\n+\t nla[NFTA_CHAIN_NAME]) {\n+\t\tstruct nft_chain *chain2;\n+\n+\t\tchain2 = nf_tables_chain_lookup(table, nla[NFTA_CHAIN_NAME],\n+\t\t\t\t\t\tgenmask);\n+\t\tif (IS_ERR(chain2))\n+\t\t\treturn PTR_ERR(chain2);\n+\t}\n+\n+\tif (nla[NFTA_CHAIN_COUNTERS]) {\n+\t\tif (!nft_is_base_chain(chain))\n+\t\t\treturn -EOPNOTSUPP;\n+\n+\t\tstats = nft_stats_alloc(nla[NFTA_CHAIN_COUNTERS]);\n+\t\tif (IS_ERR(stats))\n+\t\t\treturn PTR_ERR(stats);\n+\t}\n+\n+\ttrans = nft_trans_alloc(ctx, NFT_MSG_NEWCHAIN,\n+\t\t\t\tsizeof(struct nft_trans_chain));\n+\tif (trans == NULL) {\n+\t\tfree_percpu(stats);\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\tnft_trans_chain_stats(trans) = stats;\n+\tnft_trans_chain_update(trans) = true;\n+\n+\tif (nla[NFTA_CHAIN_POLICY])\n+\t\tnft_trans_chain_policy(trans) = policy;\n+\telse\n+\t\tnft_trans_chain_policy(trans) = -1;\n+\n+\tname = nla[NFTA_CHAIN_NAME];\n+\tif (nla[NFTA_CHAIN_HANDLE] && name) {\n+\t\tnft_trans_chain_name(trans) =\n+\t\t\tnla_strdup(name, GFP_KERNEL);\n+\t\tif (!nft_trans_chain_name(trans)) {\n+\t\t\tkfree(trans);\n+\t\t\tfree_percpu(stats);\n+\t\t\treturn -ENOMEM;\n+\t\t}\n+\t}\n+\tlist_add_tail(&trans->list, &ctx->net->nft.commit_list);\n+\n+\treturn 0;\n+}\n+\n static int nf_tables_newchain(struct net *net, struct sock *nlsk,\n \t\t\t struct sk_buff *skb, const struct nlmsghdr *nlh,\n \t\t\t const struct nlattr * const nla[],\n@@ -1403,91 +1494,14 @@ static int nf_tables_newchain(struct net *net, struct sock *nlsk,\n \t}\n \n \tif (chain != NULL) {\n-\t\tstruct nft_stats *stats = NULL;\n-\t\tstruct nft_trans *trans;\n-\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\tif (nla[NFTA_CHAIN_HOOK]) {\n-\t\t\tstruct nft_base_chain *basechain;\n-\t\t\tstruct nft_chain_hook hook;\n-\t\t\tstruct nf_hook_ops *ops;\n-\n-\t\t\tif (!nft_is_base_chain(chain))\n-\t\t\t\treturn -EBUSY;\n-\n-\t\t\terr = nft_chain_parse_hook(net, nla, afi, &hook,\n-\t\t\t\t\t\t create);\n-\t\t\tif (err < 0)\n-\t\t\t\treturn err;\n-\n-\t\t\tbasechain = nft_base_chain(chain);\n-\t\t\tif (basechain->type != hook.type) {\n-\t\t\t\tnft_chain_release_hook(&hook);\n-\t\t\t\treturn -EBUSY;\n-\t\t\t}\n-\n-\t\t\tfor (i = 0; i < afi->nops; i++) {\n-\t\t\t\tops = &basechain->ops[i];\n-\t\t\t\tif (ops->hooknum != hook.num ||\n-\t\t\t\t ops->priority != hook.priority ||\n-\t\t\t\t ops->dev != hook.dev) {\n-\t\t\t\t\tnft_chain_release_hook(&hook);\n-\t\t\t\t\treturn -EBUSY;\n-\t\t\t\t}\n-\t\t\t}\n-\t\t\tnft_chain_release_hook(&hook);\n-\t\t}\n-\n-\t\tif (nla[NFTA_CHAIN_HANDLE] && name) {\n-\t\t\tstruct nft_chain *chain2;\n-\n-\t\t\tchain2 = nf_tables_chain_lookup(table,\n-\t\t\t\t\t\t\tnla[NFTA_CHAIN_NAME],\n-\t\t\t\t\t\t\tgenmask);\n-\t\t\tif (IS_ERR(chain2))\n-\t\t\t\treturn PTR_ERR(chain2);\n-\t\t}\n-\n-\t\tif (nla[NFTA_CHAIN_COUNTERS]) {\n-\t\t\tif (!nft_is_base_chain(chain))\n-\t\t\t\treturn -EOPNOTSUPP;\n-\n-\t\t\tstats = nft_stats_alloc(nla[NFTA_CHAIN_COUNTERS]);\n-\t\t\tif (IS_ERR(stats))\n-\t\t\t\treturn PTR_ERR(stats);\n-\t\t}\n-\n \t\tnft_ctx_init(&ctx, net, skb, nlh, afi, table, chain, nla);\n-\t\ttrans = nft_trans_alloc(&ctx, NFT_MSG_NEWCHAIN,\n-\t\t\t\t\tsizeof(struct nft_trans_chain));\n-\t\tif (trans == NULL) {\n-\t\t\tfree_percpu(stats);\n-\t\t\treturn -ENOMEM;\n-\t\t}\n-\n-\t\tnft_trans_chain_stats(trans) = stats;\n-\t\tnft_trans_chain_update(trans) = true;\n \n-\t\tif (nla[NFTA_CHAIN_POLICY])\n-\t\t\tnft_trans_chain_policy(trans) = policy;\n-\t\telse\n-\t\t\tnft_trans_chain_policy(trans) = -1;\n-\n-\t\tif (nla[NFTA_CHAIN_HANDLE] && name) {\n-\t\t\tnft_trans_chain_name(trans) =\n-\t\t\t\tnla_strdup(name, GFP_KERNEL);\n-\t\t\tif (!nft_trans_chain_name(trans)) {\n-\t\t\t\tkfree(trans);\n-\t\t\t\tfree_percpu(stats);\n-\t\t\t\treturn -ENOMEM;\n-\t\t\t}\n-\t\t}\n-\t\tlist_add_tail(&trans->list, &net->nft.commit_list);\n-\t\treturn 0;\n+\t\treturn nf_tables_updchain(&ctx, genmask, policy, create);\n \t}\n \n \tif (table->use == UINT_MAX)\n","prefixes":["08/12"]}