From patchwork Wed Jan 2 17:00:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauricio Faria de Oliveira X-Patchwork-Id: 1020034 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43VHPr1HTCz9s4s for ; Thu, 3 Jan 2019 04:01:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730539AbfABRBT (ORCPT ); Wed, 2 Jan 2019 12:01:19 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:41789 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729284AbfABRBS (ORCPT ); Wed, 2 Jan 2019 12:01:18 -0500 Received: from mail-qk1-f197.google.com ([209.85.222.197]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1gejtN-00043j-D2 for netdev@vger.kernel.org; Wed, 02 Jan 2019 17:01:17 +0000 Received: by mail-qk1-f197.google.com with SMTP id z126so37576173qka.10 for ; Wed, 02 Jan 2019 09:01:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7hsB4K/KXe1k3QlsGyVqMxbvu2djv1itGQLn7RbJ1+Q=; b=tlSPn8mUNxz71dxI1yGF8UaS/cAK9/IkAp15EYCuGFTHO43NXN/UaRgK0l3uWtaBVR rHFY+Fq4KyE71qtbAvT6vkAyH+7VLYxSsMk+fpfca7OP0ZW6CMVhmmuskBq5fbIhP7HB wer+1biTF8hp6CFZGbiXZoIGuQRJh/C361iLLjcurYxmK6V5Qi88oWhPDQ7ODbEd9GH4 8ZepxnaVqPvm0uy/6t+27a57xFiRibk5W1Vd3R2/aCcMgxenu0WFpuvPQBD+Y5vxwMiZ nehdsuumeENPHAPdvqpmaOxFaEYngDSZnCyCTL/uzRKCSp/J+8IeOrliHbb8tL61zevK LZvw== X-Gm-Message-State: AJcUukc5aR4YHpDxl0nYgEeEK2SblZhtXhjLjAyK/j+g6V2Y276Vvzo4 yHt0l2tpwFYeoeLTRLCvI/rBp27lLifldO2gFzQYMx9EUXt/EuvAQVWqV9R6b067FWeuZQqZR8u bIWU7U8T9JIwrpseSkAJpqaX4r690K+qiaw== X-Received: by 2002:a0c:e010:: with SMTP id j16mr43155393qvk.111.1546448475912; Wed, 02 Jan 2019 09:01:15 -0800 (PST) X-Google-Smtp-Source: ALg8bN6SIXcRuZMkbpeZ+9HAX6zSjU+1doht1KY83mLKhErU3/VZyoxlmVBd9XVMRfkd8oYYj0vM9w== X-Received: by 2002:a0c:e010:: with SMTP id j16mr43155286qvk.111.1546448474488; Wed, 02 Jan 2019 09:01:14 -0800 (PST) Received: from localhost.localdomain ([179.159.56.118]) by smtp.gmail.com with ESMTPSA id i26sm20333938qkg.12.2019.01.02.09.01.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Jan 2019 09:01:12 -0800 (PST) From: Mauricio Faria de Oliveira To: stable@vger.kernel.org, netdev@vger.kernel.org, Florian Westphal Cc: Alakesh Haloi , nivedita.singhvi@canonical.com, Pablo Neira Ayuso , Jozsef Kadlecsik , "David S. Miller" , Yi-Hung Wei Subject: [PATCH 4.14 1/4] netfilter: xt_connlimit: don't store address in the conn nodes Date: Wed, 2 Jan 2019 15:00:20 -0200 Message-Id: <20190102170023.10415-2-mfo@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190102170023.10415-1-mfo@canonical.com> References: <20190102170023.10415-1-mfo@canonical.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Florian Westphal commit ce49480dba8666cba0106e8e31a942c9ce4c438a upstream. Only stored, never read. This is a leftover from commit 7d08487777c8 ("netfilter: connlimit: use rbtree for per-host conntrack obj storage"), which added the rbtree node struct that stores the address instead. Signed-off-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso [mfo: backport: refresh context lines and use older symbol/file names: - nf_conncount.c -> xt_connlimit.c. - nf_conncount_rb -> xt_connlimit_rb - nf_conncount_tuple -> xt_connlimit_conn - additionally, remove the add_hlist() 'addr' parameter that isn't used and removed later upstream with commit 625c556118f3 ("netfilter: connlimit: split xt_connlimit into front and backend") in the rename from 'xt_connlimit.c' to 'nf_conncount.c', a big refactor, so do it here, while still here in this related patch.] Signed-off-by: Mauricio Faria de Oliveira --- net/netfilter/xt_connlimit.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/net/netfilter/xt_connlimit.c b/net/netfilter/xt_connlimit.c index ffa8eec..79d4151 100644 --- a/net/netfilter/xt_connlimit.c +++ b/net/netfilter/xt_connlimit.c @@ -46,7 +46,6 @@ struct xt_connlimit_conn { struct hlist_node node; struct nf_conntrack_tuple tuple; - union nf_inet_addr addr; }; struct xt_connlimit_rb { @@ -116,8 +115,7 @@ same_source_net(const union nf_inet_addr *addr, } static bool add_hlist(struct hlist_head *head, - const struct nf_conntrack_tuple *tuple, - const union nf_inet_addr *addr) + const struct nf_conntrack_tuple *tuple) { struct xt_connlimit_conn *conn; @@ -125,7 +123,6 @@ static bool add_hlist(struct hlist_head *head, if (conn == NULL) return false; conn->tuple = *tuple; - conn->addr = *addr; hlist_add_head(&conn->node, head); return true; } @@ -231,7 +228,7 @@ count_tree(struct net *net, struct rb_root *root, if (!addit) return count; - if (!add_hlist(&rbconn->hhead, tuple, addr)) + if (!add_hlist(&rbconn->hhead, tuple)) return 0; /* hotdrop */ return count + 1; @@ -270,7 +267,6 @@ count_tree(struct net *net, struct rb_root *root, } conn->tuple = *tuple; - conn->addr = *addr; rbconn->addr = *addr; INIT_HLIST_HEAD(&rbconn->hhead);