{"id":811735,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811735/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504892748-1605-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":"<1504892748-1605-9-git-send-email-pablo@netfilter.org>","list_archive_url":null,"date":"2017-09-08T17:45:47","name":"[8/9] netfilter: xt_hashlimit: alloc hashtable with right size","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"0260ba18e2c535d7b4d7fe9acfb0328af0394eb4","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/1504892748-1605-9-git-send-email-pablo@netfilter.org/mbox/","series":[{"id":2261,"url":"http://patchwork.ozlabs.org/api/1.2/series/2261/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=2261","date":"2017-09-08T17:45:46","name":"[1/9] netfilter: ipvs: fix the issue that sctp_conn_schedule drops non-INIT packet","version":1,"mbox":"http://patchwork.ozlabs.org/series/2261/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811735/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811735/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 3xpl9t3QS7z9s8J\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat,  9 Sep 2017 03:46:26 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1756798AbdIHRqY (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);\n\tFri, 8 Sep 2017 13:46:24 -0400","from mail.us.es ([193.147.175.20]:54488 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1756783AbdIHRqE (ORCPT <rfc822; netfilter-devel@vger.kernel.org>);\n\tFri, 8 Sep 2017 13:46:04 -0400","from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id EDC8C8D0508\n\tfor <netfilter-devel@vger.kernel.org>;\n\tFri,  8 Sep 2017 19:45:33 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id DF870B502E\n\tfor <netfilter-devel@vger.kernel.org>;\n\tFri,  8 Sep 2017 19:45:33 +0200 (CEST)","by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid D514BB502D; Fri,  8 Sep 2017 19:45:33 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id D881DB502A;\n\tFri,  8 Sep 2017 19:45:31 +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\tFri, 08 Sep 2017 19:45:31 +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 8C38744581E0;\n\tFri,  8 Sep 2017 19:45:31 +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 8/9] netfilter: xt_hashlimit: alloc hashtable with right size","Date":"Fri,  8 Sep 2017 19:45:47 +0200","Message-Id":"<1504892748-1605-9-git-send-email-pablo@netfilter.org>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1504892748-1605-1-git-send-email-pablo@netfilter.org>","References":"<1504892748-1605-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: Zhizhou Tian <zhizhou.tian@gmail.com>\n\nstruct xt_byteslimit_htable used hlist_head, but memory allocation is\ndone through sizeof(struct list_head).\n\nSigned-off-by: Zhizhou Tian <zhizhou.tian@gmail.com>\nSigned-off-by: Pablo Neira Ayuso <pablo@netfilter.org>\n---\n net/netfilter/xt_hashlimit.c | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)","diff":"diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c\nindex 10d48234f5f4..962ea4a63d9f 100644\n--- a/net/netfilter/xt_hashlimit.c\n+++ b/net/netfilter/xt_hashlimit.c\n@@ -279,7 +279,7 @@ static int htable_create(struct net *net, struct hashlimit_cfg3 *cfg,\n \t\tsize = cfg->size;\n \t} else {\n \t\tsize = (totalram_pages << PAGE_SHIFT) / 16384 /\n-\t\t       sizeof(struct list_head);\n+\t\t       sizeof(struct hlist_head);\n \t\tif (totalram_pages > 1024 * 1024 * 1024 / PAGE_SIZE)\n \t\t\tsize = 8192;\n \t\tif (size < 16)\n@@ -287,7 +287,7 @@ static int htable_create(struct net *net, struct hashlimit_cfg3 *cfg,\n \t}\n \t/* FIXME: don't use vmalloc() here or anywhere else -HW */\n \thinfo = vmalloc(sizeof(struct xt_hashlimit_htable) +\n-\t                sizeof(struct list_head) * size);\n+\t                sizeof(struct hlist_head) * size);\n \tif (hinfo == NULL)\n \t\treturn -ENOMEM;\n \t*out_hinfo = hinfo;\n","prefixes":["8/9"]}