Merge remote-tracking branch 'regulator/fix/arizona' into regulator-linus

[~andy/linux] / net / netfilter / ipset / ip_set_bitmap_port.c

diff --git a/net/netfilter/ipset/ip_set_bitmap_port.c b/net/netfilter/ipset/ip_set_bitmap_port.c
index e7603c5b53d737b9de6248bfd0b87d0005c242fd..cf99676e69f81bdc326b2a187dc8de1450b23e87 100644 (file)
--- 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)) {