Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/809402/?format=api
{ "id": 809402, "url": "http://patchwork.ozlabs.org/api/1.2/patches/809402/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504477667-12130-6-git-send-email-pablo@netfilter.org/", "project": { "id": 26, "url": "http://patchwork.ozlabs.org/api/1.2/projects/26/?format=api", "name": "Netfilter Development", "link_name": "netfilter-devel", "list_id": "netfilter-devel.vger.kernel.org", "list_email": "netfilter-devel@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1504477667-12130-6-git-send-email-pablo@netfilter.org>", "list_archive_url": null, "date": "2017-09-03T22:27:15", "name": "[15/47] netfilter: nf_tables: Allow table names of up to 255 chars", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "ff1996a0e13b7a6dd21592433574f8df53e1b7d8", "submitter": { "id": 1315, "url": "http://patchwork.ozlabs.org/api/1.2/people/1315/?format=api", "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org" }, "delegate": { "id": 6139, "url": "http://patchwork.ozlabs.org/api/1.2/users/6139/?format=api", "username": "pablo", "first_name": "Pablo", "last_name": "Neira", "email": "pablo@netfilter.org" }, "mbox": "http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504477667-12130-6-git-send-email-pablo@netfilter.org/mbox/", "series": [ { "id": 1280, "url": "http://patchwork.ozlabs.org/api/1.2/series/1280/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=1280", "date": "2017-09-03T22:25:42", "name": "[01/47] netfilter: expect: add to hash table after expect init", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/1280/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/809402/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/809402/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netfilter-devel-owner@vger.kernel.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.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=netfilter-devel-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xlngq3sGlz9s06\n\tfor <incoming@patchwork.ozlabs.org>;\n\tMon, 4 Sep 2017 08:28:39 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753265AbdICW2P (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);\n\tSun, 3 Sep 2017 18:28:15 -0400", "from mail.us.es ([193.147.175.20]:51178 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1753260AbdICW2N (ORCPT <rfc822; netfilter-devel@vger.kernel.org>);\n\tSun, 3 Sep 2017 18:28:13 -0400", "from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id EF1C2190F61\n\tfor <netfilter-devel@vger.kernel.org>;\n\tMon, 4 Sep 2017 00:27:45 +0200 (CEST)", "from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id DEEE4B502D\n\tfor <netfilter-devel@vger.kernel.org>;\n\tMon, 4 Sep 2017 00:27:45 +0200 (CEST)", "by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid D49B72DC89; Mon, 4 Sep 2017 00:27:45 +0200 (CEST)", "from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id A1DA5DA2AF;\n\tMon, 4 Sep 2017 00:27:43 +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 00:27:43 +0200 (CEST)", "from salvia.here (unknown [31.4.193.113])\n\t(Authenticated sender: pneira@us.es)\n\tby entrada.int (Postfix) with ESMTPA id 595404265A20;\n\tMon, 4 Sep 2017 00:27:43 +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 <pablo@netfilter.org>", "To": "netfilter-devel@vger.kernel.org", "Cc": "davem@davemloft.net, netdev@vger.kernel.org", "Subject": "[PATCH 15/47] netfilter: nf_tables: Allow table names of up to 255\n\tchars", "Date": "Mon, 4 Sep 2017 00:27:15 +0200", "Message-Id": "<1504477667-12130-6-git-send-email-pablo@netfilter.org>", "X-Mailer": "git-send-email 2.1.4", "In-Reply-To": "<1504477667-12130-1-git-send-email-pablo@netfilter.org>", "References": "<1504477667-12130-1-git-send-email-pablo@netfilter.org>", "X-Virus-Scanned": "ClamAV using ClamSMTP", "Sender": "netfilter-devel-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netfilter-devel.vger.kernel.org>", "X-Mailing-List": "netfilter-devel@vger.kernel.org" }, "content": "From: Phil Sutter <phil@nwl.cc>\n\nAllocate all table names dynamically to allow for arbitrary lengths but\nintroduce NFT_NAME_MAXLEN as an upper sanity boundary. It's value was\nchosen to allow using a domain name as per RFC 1035.\n\nSigned-off-by: Phil Sutter <phil@nwl.cc>\nSigned-off-by: Pablo Neira Ayuso <pablo@netfilter.org>\n---\n include/net/netfilter/nf_tables.h | 2 +-\n include/uapi/linux/netfilter/nf_tables.h | 3 +-\n net/netfilter/nf_tables_api.c | 49 +++++++++++++++++++++++---------\n net/netfilter/nf_tables_trace.c | 2 +-\n 4 files changed, 40 insertions(+), 16 deletions(-)", "diff": "diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h\nindex bd5be0d691d5..05ecf78ec078 100644\n--- a/include/net/netfilter/nf_tables.h\n+++ b/include/net/netfilter/nf_tables.h\n@@ -957,7 +957,7 @@ struct nft_table {\n \tu32\t\t\t\tuse;\n \tu16\t\t\t\tflags:14,\n \t\t\t\t\tgenmask:2;\n-\tchar\t\t\t\tname[NFT_TABLE_MAXNAMELEN];\n+\tchar\t\t\t\t*name;\n };\n \n enum nft_af_flags {\ndiff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h\nindex 6f0a950e21c3..0b94e572ef16 100644\n--- a/include/uapi/linux/netfilter/nf_tables.h\n+++ b/include/uapi/linux/netfilter/nf_tables.h\n@@ -1,7 +1,8 @@\n #ifndef _LINUX_NF_TABLES_H\n #define _LINUX_NF_TABLES_H\n \n-#define NFT_TABLE_MAXNAMELEN\t32\n+#define NFT_NAME_MAXLEN\t\t256\n+#define NFT_TABLE_MAXNAMELEN\tNFT_NAME_MAXLEN\n #define NFT_CHAIN_MAXNAMELEN\t32\n #define NFT_SET_MAXNAMELEN\t32\n #define NFT_OBJ_MAXNAMELEN\t32\ndiff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c\nindex b77ad0813564..c2e392d5e512 100644\n--- a/net/netfilter/nf_tables_api.c\n+++ b/net/netfilter/nf_tables_api.c\n@@ -726,7 +726,10 @@ static int nf_tables_newtable(struct net *net, struct sock *nlsk,\n \tif (table == NULL)\n \t\tgoto err2;\n \n-\tnla_strlcpy(table->name, name, NFT_TABLE_MAXNAMELEN);\n+\ttable->name = nla_strdup(name, GFP_KERNEL);\n+\tif (table->name == NULL)\n+\t\tgoto err3;\n+\n \tINIT_LIST_HEAD(&table->chains);\n \tINIT_LIST_HEAD(&table->sets);\n \tINIT_LIST_HEAD(&table->objects);\n@@ -735,10 +738,12 @@ static int nf_tables_newtable(struct net *net, struct sock *nlsk,\n \tnft_ctx_init(&ctx, net, skb, nlh, afi, table, NULL, nla);\n \terr = nft_trans_table_add(&ctx, NFT_MSG_NEWTABLE);\n \tif (err < 0)\n-\t\tgoto err3;\n+\t\tgoto err4;\n \n \tlist_add_tail_rcu(&table->list, &afi->tables);\n \treturn 0;\n+err4:\n+\tkfree(table->name);\n err3:\n \tkfree(table);\n err2:\n@@ -865,6 +870,7 @@ static void nf_tables_table_destroy(struct nft_ctx *ctx)\n {\n \tBUG_ON(ctx->table->use > 0);\n \n+\tkfree(ctx->table->name);\n \tkfree(ctx->table);\n \tmodule_put(ctx->afi->owner);\n }\n@@ -1972,7 +1978,7 @@ static void nf_tables_rule_notify(const struct nft_ctx *ctx,\n }\n \n struct nft_rule_dump_ctx {\n-\tchar table[NFT_TABLE_MAXNAMELEN];\n+\tchar *table;\n \tchar chain[NFT_CHAIN_MAXNAMELEN];\n };\n \n@@ -1997,7 +2003,7 @@ static int nf_tables_dump_rules(struct sk_buff *skb,\n \t\t\tcontinue;\n \n \t\tlist_for_each_entry_rcu(table, &afi->tables, list) {\n-\t\t\tif (ctx && ctx->table[0] &&\n+\t\t\tif (ctx && ctx->table &&\n \t\t\t strcmp(ctx->table, table->name) != 0)\n \t\t\t\tcontinue;\n \n@@ -2037,7 +2043,12 @@ static int nf_tables_dump_rules(struct sk_buff *skb,\n \n static int nf_tables_dump_rules_done(struct netlink_callback *cb)\n {\n-\tkfree(cb->data);\n+\tstruct nft_rule_dump_ctx *ctx = cb->data;\n+\n+\tif (ctx) {\n+\t\tkfree(ctx->table);\n+\t\tkfree(ctx);\n+\t}\n \treturn 0;\n }\n \n@@ -2069,9 +2080,14 @@ static int nf_tables_getrule(struct net *net, struct sock *nlsk,\n \t\t\tif (!ctx)\n \t\t\t\treturn -ENOMEM;\n \n-\t\t\tif (nla[NFTA_RULE_TABLE])\n-\t\t\t\tnla_strlcpy(ctx->table, nla[NFTA_RULE_TABLE],\n-\t\t\t\t\t sizeof(ctx->table));\n+\t\t\tif (nla[NFTA_RULE_TABLE]) {\n+\t\t\t\tctx->table = nla_strdup(nla[NFTA_RULE_TABLE],\n+\t\t\t\t\t\t\tGFP_KERNEL);\n+\t\t\t\tif (!ctx->table) {\n+\t\t\t\t\tkfree(ctx);\n+\t\t\t\t\treturn -ENOMEM;\n+\t\t\t\t}\n+\t\t\t}\n \t\t\tif (nla[NFTA_RULE_CHAIN])\n \t\t\t\tnla_strlcpy(ctx->chain, nla[NFTA_RULE_CHAIN],\n \t\t\t\t\t sizeof(ctx->chain));\n@@ -4410,7 +4426,7 @@ static int nf_tables_fill_obj_info(struct sk_buff *skb, struct net *net,\n }\n \n struct nft_obj_filter {\n-\tchar\t\ttable[NFT_OBJ_MAXNAMELEN];\n+\tchar\t\t*table;\n \tu32\t\ttype;\n };\n \n@@ -4475,7 +4491,10 @@ static int nf_tables_dump_obj(struct sk_buff *skb, struct netlink_callback *cb)\n \n static int nf_tables_dump_obj_done(struct netlink_callback *cb)\n {\n-\tkfree(cb->data);\n+\tstruct nft_obj_filter *filter = cb->data;\n+\n+\tkfree(filter->table);\n+\tkfree(filter);\n \n \treturn 0;\n }\n@@ -4489,9 +4508,13 @@ nft_obj_filter_alloc(const struct nlattr * const nla[])\n \tif (!filter)\n \t\treturn ERR_PTR(-ENOMEM);\n \n-\tif (nla[NFTA_OBJ_TABLE])\n-\t\tnla_strlcpy(filter->table, nla[NFTA_OBJ_TABLE],\n-\t\t\t NFT_TABLE_MAXNAMELEN);\n+\tif (nla[NFTA_OBJ_TABLE]) {\n+\t\tfilter->table = nla_strdup(nla[NFTA_OBJ_TABLE], GFP_KERNEL);\n+\t\tif (!filter->table) {\n+\t\t\tkfree(filter);\n+\t\t\treturn ERR_PTR(-ENOMEM);\n+\t\t}\n+\t}\n \tif (nla[NFTA_OBJ_TYPE])\n \t\tfilter->type = ntohl(nla_get_be32(nla[NFTA_OBJ_TYPE]));\n \ndiff --git a/net/netfilter/nf_tables_trace.c b/net/netfilter/nf_tables_trace.c\nindex 0c3a0049e4aa..62787d985e9d 100644\n--- a/net/netfilter/nf_tables_trace.c\n+++ b/net/netfilter/nf_tables_trace.c\n@@ -175,7 +175,7 @@ void nft_trace_notify(struct nft_traceinfo *info)\n \t\treturn;\n \n \tsize = nlmsg_total_size(sizeof(struct nfgenmsg)) +\n-\t\tnla_total_size(NFT_TABLE_MAXNAMELEN) +\n+\t\tnla_total_size(strlen(info->chain->table->name)) +\n \t\tnla_total_size(NFT_CHAIN_MAXNAMELEN) +\n \t\tnla_total_size_64bit(sizeof(__be64)) +\t/* rule handle */\n \t\tnla_total_size(sizeof(__be32)) +\t/* trace type */\n", "prefixes": [ "15/47" ] }