diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2016-11-10 14:05:34 +0300 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2016-11-10 15:28:45 +0300 |
| commit | 9e41f26a505cca04b7122e65053cf6447007ea79 (patch) | |
| tree | ac8cbb3c53a770b1b05dab0b84ca83602d440416 /net/netfilter/ipset/ip_set_core.c | |
| parent | 702b71e7c666a1c9be9d49e8cd173f0d4d1e859f (diff) | |
| download | linux-9e41f26a505cca04b7122e65053cf6447007ea79.tar.xz | |
netfilter: ipset: Count non-static extension memory for userspace
Non-static (i.e. comment) extension was not counted into the memory
size. A new internal counter is introduced for this. In the case of
the hash types the sizes of the arrays are counted there as well so
that we can avoid to scan the whole set when just the header data
is requested.
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Diffstat (limited to 'net/netfilter/ipset/ip_set_core.c')
| -rw-r--r-- | net/netfilter/ipset/ip_set_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c index bfacccff7196..23345d2d136a 100644 --- a/net/netfilter/ipset/ip_set_core.c +++ b/net/netfilter/ipset/ip_set_core.c @@ -324,7 +324,7 @@ ip_set_get_ipaddr6(struct nlattr *nla, union nf_inet_addr *ipaddr) } EXPORT_SYMBOL_GPL(ip_set_get_ipaddr6); -typedef void (*destroyer)(void *); +typedef void (*destroyer)(struct ip_set *, void *); /* ipset data extension types, in size order */ const struct ip_set_ext_type ip_set_extensions[] = { |