{"id":809401,"url":"http://patchwork.ozlabs.org/api/1.2/patches/809401/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504477667-12130-9-git-send-email-pablo@netfilter.org/","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/1.2/projects/26/?format=json","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-9-git-send-email-pablo@netfilter.org>","list_archive_url":null,"date":"2017-09-03T22:27:18","name":"[18/47] netfilter: nf_tables: Allow object names of up to 255 chars","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"cfaf8163c8ac7cc860037c2099285d5fc72ff964","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":6139,"url":"http://patchwork.ozlabs.org/api/1.2/users/6139/?format=json","username":"pablo","first_name":"Pablo","last_name":"Neira","email":"pablo@netfilter.org"},"mbox":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504477667-12130-9-git-send-email-pablo@netfilter.org/mbox/","series":[{"id":1280,"url":"http://patchwork.ozlabs.org/api/1.2/series/1280/?format=json","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/809401/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809401/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xlngp3vFJz9s06\n\tfor ;\n\tMon, 4 Sep 2017 08:28:38 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753286AbdICW2h (ORCPT );\n\tSun, 3 Sep 2017 18:28:37 -0400","from mail.us.es ([193.147.175.20]:51224 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1753273AbdICW2S (ORCPT );\n\tSun, 3 Sep 2017 18:28:18 -0400","from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id 726EE190F66\n\tfor ;\n\tMon, 4 Sep 2017 00:27:51 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 636BBB5027\n\tfor ;\n\tMon, 4 Sep 2017 00:27:51 +0200 (CEST)","by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid 5923AB5024; Mon, 4 Sep 2017 00:27:51 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 3D285B502A;\n\tMon, 4 Sep 2017 00:27:49 +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:49 +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 CA1644265A20;\n\tMon, 4 Sep 2017 00:27:48 +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 18/47] netfilter: nf_tables: Allow object names of up to 255\n\tchars","Date":"Mon, 4 Sep 2017 00:27:18 +0200","Message-Id":"<1504477667-12130-9-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":"","X-Mailing-List":"netfilter-devel@vger.kernel.org"},"content":"From: Phil Sutter \n\nSame conversion as for table names, use NFT_NAME_MAXLEN as upper\nboundary as well.\n\nSigned-off-by: Phil Sutter \nSigned-off-by: Pablo Neira Ayuso \n---\n include/net/netfilter/nf_tables.h | 2 +-\n include/uapi/linux/netfilter/nf_tables.h | 2 +-\n net/netfilter/nf_tables_api.c | 11 +++++++++--\n 3 files changed, 11 insertions(+), 4 deletions(-)","diff":"diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h\nindex 66ba62fa7d90..f9795fe394f3 100644\n--- a/include/net/netfilter/nf_tables.h\n+++ b/include/net/netfilter/nf_tables.h\n@@ -1016,7 +1016,7 @@ int nft_verdict_dump(struct sk_buff *skb, int type,\n */\n struct nft_object {\n \tstruct list_head\t\tlist;\n-\tchar\t\t\t\tname[NFT_OBJ_MAXNAMELEN];\n+\tchar\t\t\t\t*name;\n \tstruct nft_table\t\t*table;\n \tu32\t\t\t\tgenmask:2,\n \t\t\t\t\tuse:30;\ndiff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h\nindex b5e73e80b7b6..be25cf69295b 100644\n--- a/include/uapi/linux/netfilter/nf_tables.h\n+++ b/include/uapi/linux/netfilter/nf_tables.h\n@@ -5,7 +5,7 @@\n #define NFT_TABLE_MAXNAMELEN\tNFT_NAME_MAXLEN\n #define NFT_CHAIN_MAXNAMELEN\tNFT_NAME_MAXLEN\n #define NFT_SET_MAXNAMELEN\tNFT_NAME_MAXLEN\n-#define NFT_OBJ_MAXNAMELEN\t32\n+#define NFT_OBJ_MAXNAMELEN\tNFT_NAME_MAXLEN\n #define NFT_USERDATA_MAXLEN\t256\n \n /**\ndiff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c\nindex e6a07f27b1a3..149785ff1c7b 100644\n--- a/net/netfilter/nf_tables_api.c\n+++ b/net/netfilter/nf_tables_api.c\n@@ -4402,15 +4402,21 @@ static int nf_tables_newobj(struct net *net, struct sock *nlsk,\n \t\tgoto err1;\n \t}\n \tobj->table = table;\n-\tnla_strlcpy(obj->name, nla[NFTA_OBJ_NAME], NFT_OBJ_MAXNAMELEN);\n+\tobj->name = nla_strdup(nla[NFTA_OBJ_NAME], GFP_KERNEL);\n+\tif (!obj->name) {\n+\t\terr = -ENOMEM;\n+\t\tgoto err2;\n+\t}\n \n \terr = nft_trans_obj_add(&ctx, NFT_MSG_NEWOBJ, obj);\n \tif (err < 0)\n-\t\tgoto err2;\n+\t\tgoto err3;\n \n \tlist_add_tail_rcu(&obj->list, &table->objects);\n \ttable->use++;\n \treturn 0;\n+err3:\n+\tkfree(obj->name);\n err2:\n \tif (obj->type->destroy)\n \t\tobj->type->destroy(obj);\n@@ -4626,6 +4632,7 @@ static void nft_obj_destroy(struct nft_object *obj)\n \t\tobj->type->destroy(obj);\n \n \tmodule_put(obj->type->owner);\n+\tkfree(obj->name);\n \tkfree(obj);\n }\n \n","prefixes":["18/47"]}