UBUNTU: SAUCE: netfilter: xt_connlimit: remove the 'addr' parameter in add_hlist()

BugLink: https://bugs.launchpad.net/bugs/1811094
In commit ce49480dba86 ("netfilter: xt_connlimit: don't store address in the
conn nodes)" the actual use of the addr argument in add_hlist() got dropped,
but it was still passed as an argument. This was done as part of a bigger
modification through commit 625c556118f3 ("netfilter: connlimit: split
xt_connlimit into front and backend").
For upstream stable 4.14.y, this was merged into the backport of ce49480dba86
but this is already in Bionic/4.15. So we do this as a separate SAUCE patch.

Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
Acked-by: Khalid Elmously <khalid.elmously@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/net/netfilter/xt_connlimit.c b/net/netfilter/xt_connlimit.c
index a6214f2353335c20fabdc2a60078ac6be918a22d..580239db4af2275c047877396aefd7d678a1fb54 100644 (file)
--- a/net/netfilter/xt_connlimit.c
+++ b/net/netfilter/xt_connlimit.c
@@ -97,8 +97,7 @@ same_source(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;
 
@@ -211,7 +210,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;