summaryrefslogtreecommitdiffstats
path: root/net/netfilter
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2013-10-18 14:03:41 +0200
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2013-10-27 19:24:39 +0100
commitdc476e7c8e7824fd326c79f50d7302faca7a4c2b (patch)
treeccdeee796df0a5a1e77755e9e6746f3d1aa1f1ef /net/netfilter
parentf2020b27be94222eb25c39ff46eb9917cb92897b (diff)
downloadlinux-stable-dc476e7c8e7824fd326c79f50d7302faca7a4c2b.tar.gz
linux-stable-dc476e7c8e7824fd326c79f50d7302faca7a4c2b.tar.bz2
linux-stable-dc476e7c8e7824fd326c79f50d7302faca7a4c2b.zip
netfilter:ipset: Fix memory allocation for bitmap:port
At the restructuring of the bitmap types creation in ipset, for the bitmap:port type wrong (too large) memory allocation was copied (netfilter bugzilla id #859). Reported-by: Quentin Armitage <quentin@armitage.org.uk> Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Diffstat (limited to 'net/netfilter')
-rw-r--r--net/netfilter/ipset/ip_set_bitmap_port.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/ipset/ip_set_bitmap_port.c b/net/netfilter/ipset/ip_set_bitmap_port.c
index e7603c5b53d7..cf99676e69f8 100644
--- a/net/netfilter/ipset/ip_set_bitmap_port.c
+++ b/net/netfilter/ipset/ip_set_bitmap_port.c
@@ -254,7 +254,7 @@ bitmap_port_create(struct net *net, struct ip_set *set, struct nlattr *tb[],
return -ENOMEM;
map->elements = last_port - first_port + 1;
- map->memsize = map->elements * sizeof(unsigned long);
+ map->memsize = bitmap_bytes(0, map->elements);
set->variant = &bitmap_port;
set->dsize = ip_set_elem_len(set, tb, 0);
if (!init_map_port(set, map, first_port, last_port)) {