From: Jozsef Kadlecsik <kadlec@netfilter.org>
Date: Fri, 21 Feb 2020 20:53:11 +0000 (+0100)
Subject: netfilter: ipset: Correct the reported memory size
X-Git-Tag: v7.6~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa035df78aa6a2b14b4722a681d3c051bc9cf92e;p=thirdparty%2Fipset.git

netfilter: ipset: Correct the reported memory size

The patch

netfilter: ipset: Fix "INFO: rcu detected stall in hash_xxx" reports

did not include the size of the comment extensions from the memory size
for set listing. Add it, so the proper size is printed.

Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
---

diff --git a/kernel/net/netfilter/ipset/ip_set_hash_gen.h b/kernel/net/netfilter/ipset/ip_set_hash_gen.h
index 9ba0b993..e5f99ec9 100644
--- a/kernel/net/netfilter/ipset/ip_set_hash_gen.h
+++ b/kernel/net/netfilter/ipset/ip_set_hash_gen.h
@@ -1284,7 +1284,7 @@ mtype_head(struct ip_set *set, struct sk_buff *skb)
 	rcu_read_lock_bh();
 	t = rcu_dereference_bh(h->table);
 	mtype_ext_size(set, &elements, &ext_size);
-	memsize = mtype_ahash_memsize(h, t) + ext_size;
+	memsize = mtype_ahash_memsize(h, t) + ext_size + set->ext_size;
 	htable_bits = t->htable_bits;
 	rcu_read_unlock_bh();