Skip to content

Commit 00c83b0

Browse files
marceloleitnerdavem330
authored andcommitted
Fix race condition between vxlan_sock_add and vxlan_sock_release
Currently, when trying to reuse a socket, vxlan_sock_add will grab vn->sock_lock, locate a reusable socket, inc refcount and release vn->sock_lock. But vxlan_sock_release() will first decrement refcount, and then grab that lock. refcnt operations are atomic but as currently we have deferred works which hold vs->refcnt each, this might happen, leading to a use after free (specially after vxlan_igmp_leave): CPU 1 CPU 2 deferred work vxlan_sock_add ... ... spin_lock(&vn->sock_lock) vs = vxlan_find_sock(); vxlan_sock_release dec vs->refcnt, reaches 0 spin_lock(&vn->sock_lock) vxlan_sock_hold(vs), refcnt=1 spin_unlock(&vn->sock_lock) hlist_del_rcu(&vs->hlist); vxlan_notify_del_rx_port(vs) spin_unlock(&vn->sock_lock) So when we look for a reusable socket, we check if it wasn't freed already before reusing it. Signed-off-by: Marcelo Ricardo Leitner <[email protected]> Fixes: 7c47ced ("vxlan: move IGMP join/leave to work queue") Signed-off-by: David S. Miller <[email protected]>
1 parent 51f8301 commit 00c83b0

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

drivers/net/vxlan.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1985,9 +1985,8 @@ static int vxlan_init(struct net_device *dev)
19851985
spin_lock(&vn->sock_lock);
19861986
vs = vxlan_find_sock(vxlan->net, ipv6 ? AF_INET6 : AF_INET,
19871987
vxlan->dst_port);
1988-
if (vs) {
1988+
if (vs && atomic_add_unless(&vs->refcnt, 1, 0)) {
19891989
/* If we have a socket with same port already, reuse it */
1990-
atomic_inc(&vs->refcnt);
19911990
vxlan_vs_add_dev(vs, vxlan);
19921991
} else {
19931992
/* otherwise make new socket outside of RTNL */
@@ -2389,12 +2388,9 @@ struct vxlan_sock *vxlan_sock_add(struct net *net, __be16 port,
23892388

23902389
spin_lock(&vn->sock_lock);
23912390
vs = vxlan_find_sock(net, ipv6 ? AF_INET6 : AF_INET, port);
2392-
if (vs) {
2393-
if (vs->rcv == rcv)
2394-
atomic_inc(&vs->refcnt);
2395-
else
2391+
if (vs && ((vs->rcv != rcv) ||
2392+
!atomic_add_unless(&vs->refcnt, 1, 0)))
23962393
vs = ERR_PTR(-EBUSY);
2397-
}
23982394
spin_unlock(&vn->sock_lock);
23992395

24002396
if (!vs)

0 commit comments

Comments
 (0)