Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6604271c authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik Committed by Patrick McHardy
Browse files

netfilter: ipset: References are protected by rwlock instead of mutex 



The timeout variant of the list:set type must reference the member sets.
However, its garbage collector runs at timer interrupt so the mutex protection
of the references is a no go. Therefore the reference protection
is converted to rwlock.

Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 49a341f2

include/linux/netfilter/ipset/ip_set.h

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ struct ip_set { 
	/* Lock protecting the set data */

	rwlock_t lock;

	/* References to the set */

	atomic_t ref;

	u32 ref;

	/* The core set type */

	struct ip_set_type *type;

	/* The type variant doing the real job */

include/linux/netfilter/ipset/ip_set_ahash.h

+1 −2
Original line number Diff line number Diff line
@@ -515,8 +515,7 @@ type_pf_head(struct ip_set *set, struct sk_buff *skb) 
	if (h->netmask != HOST_MASK)

		NLA_PUT_U8(skb, IPSET_ATTR_NETMASK, h->netmask);

#endif

	NLA_PUT_NET32(skb, IPSET_ATTR_REFERENCES,

		      htonl(atomic_read(&set->ref) - 1));

	NLA_PUT_NET32(skb, IPSET_ATTR_REFERENCES, htonl(set->ref - 1));

	NLA_PUT_NET32(skb, IPSET_ATTR_MEMSIZE, htonl(memsize));

	if (with_timeout(h->timeout))

		NLA_PUT_NET32(skb, IPSET_ATTR_TIMEOUT, htonl(h->timeout));

net/netfilter/ipset/ip_set_bitmap_ip.c

+1 −2
Original line number Diff line number Diff line
@@ -338,8 +338,7 @@ bitmap_ip_head(struct ip_set *set, struct sk_buff *skb) 
	NLA_PUT_IPADDR4(skb, IPSET_ATTR_IP_TO, htonl(map->last_ip));

	if (map->netmask != 32)

		NLA_PUT_U8(skb, IPSET_ATTR_NETMASK, map->netmask);

	NLA_PUT_NET32(skb, IPSET_ATTR_REFERENCES,

		      htonl(atomic_read(&set->ref) - 1));

	NLA_PUT_NET32(skb, IPSET_ATTR_REFERENCES, htonl(set->ref - 1));

	NLA_PUT_NET32(skb, IPSET_ATTR_MEMSIZE,

		      htonl(sizeof(*map) + map->memsize));

	if (with_timeout(map->timeout))

net/netfilter/ipset/ip_set_bitmap_ipmac.c

+1 −2
Original line number Diff line number Diff line
@@ -434,8 +434,7 @@ bitmap_ipmac_head(struct ip_set *set, struct sk_buff *skb) 
		goto nla_put_failure;

	NLA_PUT_IPADDR4(skb, IPSET_ATTR_IP, htonl(map->first_ip));

	NLA_PUT_IPADDR4(skb, IPSET_ATTR_IP_TO, htonl(map->last_ip));

	NLA_PUT_NET32(skb, IPSET_ATTR_REFERENCES,

		      htonl(atomic_read(&set->ref) - 1));

	NLA_PUT_NET32(skb, IPSET_ATTR_REFERENCES, htonl(set->ref - 1));

	NLA_PUT_NET32(skb, IPSET_ATTR_MEMSIZE,

		      htonl(sizeof(*map)

			    + (map->last_ip - map->first_ip + 1) * map->dsize));

net/netfilter/ipset/ip_set_bitmap_port.c

+1 −2
Original line number Diff line number Diff line
@@ -320,8 +320,7 @@ bitmap_port_head(struct ip_set *set, struct sk_buff *skb) 
		goto nla_put_failure;

	NLA_PUT_NET16(skb, IPSET_ATTR_PORT, htons(map->first_port));

	NLA_PUT_NET16(skb, IPSET_ATTR_PORT_TO, htons(map->last_port));

	NLA_PUT_NET32(skb, IPSET_ATTR_REFERENCES,

		      htonl(atomic_read(&set->ref) - 1));

	NLA_PUT_NET32(skb, IPSET_ATTR_REFERENCES, htonl(set->ref - 1));

	NLA_PUT_NET32(skb, IPSET_ATTR_MEMSIZE,

		      htonl(sizeof(*map) + map->memsize));

	if (with_timeout(map->timeout))