diff options
| author | bz <bz@FreeBSD.org> | 2010-04-11 18:41:31 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2010-04-11 18:41:31 +0000 |
| commit | 35f1e4bd73b81f6e82bfa29f1b502ad624c17cb2 (patch) | |
| tree | 5e7428262cc4961f28340102167c5ba10af773f1 /sys/net | |
| parent | dec738d25db82609df5cb5d40bd1bea4b18d2be0 (diff) | |
| download | FreeBSD-src-35f1e4bd73b81f6e82bfa29f1b502ad624c17cb2.zip FreeBSD-src-35f1e4bd73b81f6e82bfa29f1b502ad624c17cb2.tar.gz | |
Check that the interface is on the list of cloned interfaces before trying
to remove it to avoid panics in case of two threads trying to remove it in
parallel.
PR: kern/116837
Submitted by: Takahiro Kurosawa (takahiro.kurosawa gmail.com) (orig version)
MFC after: 10 days
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_clone.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sys/net/if_clone.c b/sys/net/if_clone.c index 0dd20fb..81ac7ff 100644 --- a/sys/net/if_clone.c +++ b/sys/net/if_clone.c @@ -234,6 +234,7 @@ int if_clone_destroyif(struct if_clone *ifc, struct ifnet *ifp) { int err; + struct ifnet *ifcifp; if (ifc->ifc_destroy == NULL) return(EOPNOTSUPP); @@ -246,8 +247,17 @@ if_clone_destroyif(struct if_clone *ifc, struct ifnet *ifp) CURVNET_SET_QUIET(ifp->if_vnet); IF_CLONE_LOCK(ifc); - IFC_IFLIST_REMOVE(ifc, ifp); + LIST_FOREACH(ifcifp, &ifc->ifc_iflist, if_clones) { + if (ifcifp == ifp) { + IFC_IFLIST_REMOVE(ifc, ifp); + break; + } + } IF_CLONE_UNLOCK(ifc); + if (ifcifp == NULL) { + CURVNET_RESTORE(); + return (ENXIO); /* ifp is not on the list. */ + } if_delgroup(ifp, ifc->ifc_name); |
