Skip to contentSkip to conversation

ipt_CLUSTERIP: fix a refcount bug in clusterip_config_find_get()

PATCH Applied Cong Wang 3 participants 3 messages Feb 8, 2018 – Feb 14, 2018

Subsystems (3)
lore
Share & tools
lore

Cong Wang

author
#0 lore raw

PATCH v2 1/1 ipt_CLUSTERIP: fix a refcount bug in clusterip_config_find_get()

In clusterip_config_find_get() we hold RCU read lock so it could run concurrently with clusterip_config_entry_put(), as a result, the refcnt could go back to 1 from 0, which leads to a double list_del()... Just replace refcount_inc() with refcount_inc_not_zero(), as for c->refcount.

Fixes d73f33b16883 ("netfilter: CLUSTERIP: RCU conversion")
Cc Eric Dumazet <[email protected]>
Cc Pablo Neira Ayuso <[email protected]>
Cc Florian Westphal <[email protected]>
---
 net/ipv4/netfilter/ipt_CLUSTERIP.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
net/ipv4/netfilter/ipt_CLUSTERIP.c +6 -2
index 1ff72b87a066..4b02ab39ebc5 100644
@@ -154,8 +154,12 @@ clusterip_config_find_get(struct net *net, __be32 clusterip, int entry)
 #endif
 		if (unlikely(!refcount_inc_not_zero(&c->refcount)))
 			c = NULL;
-		else if (entry)
-			refcount_inc(&c->entries);
+		else if (entry) {
+			if (unlikely(!refcount_inc_not_zero(&c->entries))) {
+				clusterip_config_put(c);
+				c = NULL;
+			}
+		}
 	}
 	rcu_read_unlock_bh();
 
Signature · 1 line
2.13.0
maintainer Reviewed-by on v2 1/1
#1 lore raw
Quoted 5 lines · Cong Wang

In clusterip_config_find_get() we hold RCU read lock so it could run concurrently with clusterip_config_entry_put(), as a result, the refcnt could go back to 1 from 0, which leads to a double list_del()... Just replace refcount_inc() with refcount_inc_not_zero(), as for c->refcount.

maintainer Applied
#2 lore raw
In reply to Cong Wang
Quoted 5 lines · Cong Wang

In clusterip_config_find_get() we hold RCU read lock so it could run concurrently with clusterip_config_entry_put(), as a result, the refcnt could go back to 1 from 0, which leads to a double list_del()... Just replace refcount_inc() with refcount_inc_not_zero(), as for c->refcount.

Applied, thanks Cong.