diff options
author | glebius <glebius@FreeBSD.org> | 2011-04-04 07:45:08 +0000 |
---|---|---|
committer | glebius <glebius@FreeBSD.org> | 2011-04-04 07:45:08 +0000 |
commit | 8c3b1b83f91d3ae32e57985dc139f3728564c2f5 (patch) | |
tree | 6ab7d9d922cc6d5c8f4554b032a000102622d5b1 | |
parent | 44e946c1dd34a24a0c9d74ba5420fac22fa3f693 (diff) | |
download | FreeBSD-src-8c3b1b83f91d3ae32e57985dc139f3728564c2f5.zip FreeBSD-src-8c3b1b83f91d3ae32e57985dc139f3728564c2f5.tar.gz |
When removing ifnets, we should first remove the reference to ifnet
from the interface index, then decrease refcount, not vice versa.
Otherwise there is a race (reproducible) when if_free_internal()
contests on IFNET_WLOCK(), and we got a zero-refed ifnet in the
index for a long time. It may be picked by some other thread,
that runs ifnet_byindex_ref(), who takes the ifnet from index,
and bumps refcount. When reader drops the lock, if_free_internal()
proceeds with free. Then reader tries to free it a second time.
-rw-r--r-- | sys/net/if.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index 729c1c2..b7c2ad1 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -465,8 +465,8 @@ if_alloc(u_char type) } /* - * Do the actual work of freeing a struct ifnet, associated index, and layer - * 2 common structure. This call is made when the last reference to an + * Do the actual work of freeing a struct ifnet, and layer 2 common + * structure. This call is made when the last reference to an * interface is released. */ static void @@ -476,13 +476,6 @@ if_free_internal(struct ifnet *ifp) KASSERT((ifp->if_flags & IFF_DYING), ("if_free_internal: interface not dying")); - IFNET_WLOCK(); - KASSERT(ifp == ifnet_byindex_locked(ifp->if_index), - ("%s: freeing unallocated ifnet", ifp->if_xname)); - - ifindex_free_locked(ifp->if_index); - IFNET_WUNLOCK(); - if (if_com_free[ifp->if_alloctype] != NULL) if_com_free[ifp->if_alloctype](ifp->if_l2com, ifp->if_alloctype); @@ -513,6 +506,14 @@ if_free_type(struct ifnet *ifp, u_char type) ifp->if_alloctype)); ifp->if_flags |= IFF_DYING; /* XXX: Locking */ + + IFNET_WLOCK(); + KASSERT(ifp == ifnet_byindex_locked(ifp->if_index), + ("%s: freeing unallocated ifnet", ifp->if_xname)); + + ifindex_free_locked(ifp->if_index); + IFNET_WUNLOCK(); + if (!refcount_release(&ifp->if_refcount)) return; if_free_internal(ifp); |