From: Jozsef Kadlecsik Date: Sat, 13 Apr 2013 12:30:54 +0000 (+0200) Subject: netfilter: ipset: bitmap:ip,mac: fix listing with timeout X-Git-Tag: v3.9-rc8~7^2~10^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5add189a125e6b497e31bffdaaed8145ec6d4984;p=platform%2Fkernel%2Flinux-3.10.git netfilter: ipset: bitmap:ip,mac: fix listing with timeout The type when timeout support was enabled, could not list all elements, just the first ones which could fit into one netlink message: it just did not continue listing after the first message. Reported-by: Yoann JUET Signed-off-by: Jozsef Kadlecsik Tested-by: Yoann JUET Signed-off-by: Pablo Neira Ayuso --- diff --git a/net/netfilter/ipset/ip_set_bitmap_ipmac.c b/net/netfilter/ipset/ip_set_bitmap_ipmac.c index 0f92dc2..d7df6ac 100644 --- a/net/netfilter/ipset/ip_set_bitmap_ipmac.c +++ b/net/netfilter/ipset/ip_set_bitmap_ipmac.c @@ -339,7 +339,11 @@ bitmap_ipmac_tlist(const struct ip_set *set, nla_put_failure: nla_nest_cancel(skb, nested); ipset_nest_end(skb, atd); - return -EMSGSIZE; + if (unlikely(id == first)) { + cb->args[2] = 0; + return -EMSGSIZE; + } + return 0; } static int