Author: yongari
Date: Mon Oct 17 19:49:00 2011
New Revision: 226478
URL: http://svn.freebsd.org/changeset/base/226478
Log:
Close a race where SIOCGIFMEDIA ioctl get inconsistent link status.
Because driver is accessing a common MII structure in
mii_pollstat(), updating user supplied structure should be done
before dropping a driver lock.
Reported by: Karim (fodillemlinkarimi <> gmail dot com)
Modified:
head/sys/dev/age/if_age.c
head/sys/dev/alc/if_alc.c
head/sys/dev/ale/if_ale.c
head/sys/dev/lge/if_lge.c
head/sys/dev/msk/if_msk.c
head/sys/dev/nfe/if_nfe.c
head/sys/dev/nge/if_nge.c
head/sys/dev/nve/if_nve.c
head/sys/dev/re/if_re.c
head/sys/dev/sge/if_sge.c
head/sys/dev/sis/if_sis.c
head/sys/dev/vge/if_vge.c
head/sys/dev/vr/if_vr.c
head/sys/dev/vte/if_vte.c
head/sys/mips/atheros/if_arge.c
head/sys/mips/idt/if_kr.c
head/sys/pci/if_rl.c
Modified: head/sys/dev/age/if_age.c
==============================================================================
--- head/sys/dev/age/if_age.c Mon Oct 17 19:40:26 2011 (r226477)
+++ head/sys/dev/age/if_age.c Mon Oct 17 19:49:00 2011 (r226478)
@@ -282,9 +282,9 @@ age_mediastatus(struct ifnet *ifp, struc
mii = device_get_softc(sc->age_miibus);
mii_pollstat(mii);
- AGE_UNLOCK(sc);
ifmr->ifm_status = mii->mii_media_status;
ifmr->ifm_active = mii->mii_media_active;
+ AGE_UNLOCK(sc);
}
/*
Modified: head/sys/dev/alc/if_alc.c
==============================================================================
--- head/sys/dev/alc/if_alc.c Mon Oct 17 19:40:26 2011 (r226477)
+++ head/sys/dev/alc/if_alc.c Mon Oct 17 19:49:00 2011 (r226478)
@@ -349,9 +349,9 @@ alc_mediastatus(struct ifnet *ifp, struc
mii = device_get_softc(sc->alc_miibus);
mii_pollstat(mii);
- ALC_UNLOCK(sc);
ifmr->ifm_status = mii->mii_media_status;
ifmr->ifm_active = mii->mii_media_active;
+ ALC_UNLOCK(sc);
}
static int
Modified: head/sys/dev/ale/if_ale.c
==============================================================================
--- head/sys/dev/ale/if_ale.c Mon Oct 17 19:40:26 2011 (r226477)
+++ head/sys/dev/ale/if_ale.c Mon Oct 17 19:49:00 2011 (r226478)
@@ -270,9 +270,9 @@ ale_mediastatus(struct ifnet *ifp, struc
mii = device_get_softc(sc->ale_miibus);
mii_pollstat(mii);
- ALE_UNLOCK(sc);
ifmr->ifm_status = mii->mii_media_status;
ifmr->ifm_active = mii->mii_media_active;
+ ALE_UNLOCK(sc);
}
static int
Modified: head/sys/dev/lge/if_lge.c
==============================================================================
--- head/sys/dev/lge/if_lge.c Mon Oct 17 19:40:26 2011 (r226477)
+++ head/sys/dev/lge/if_lge.c Mon Oct 17 19:49:00 2011 (r226478)
@@ -1430,9 +1430,9 @@ lge_ifmedia_sts(ifp, ifmr)
LGE_LOCK(sc);
mii = device_get_softc(sc->lge_miibus);
mii_pollstat(mii);
- LGE_UNLOCK(sc);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+ LGE_UNLOCK(sc);
return;
}
Modified: head/sys/dev/msk/if_msk.c
==============================================================================
--- head/sys/dev/msk/if_msk.c Mon Oct 17 19:40:26 2011 (r226477)
+++ head/sys/dev/msk/if_msk.c Mon Oct 17 19:49:00 2011 (r226478)
@@ -995,9 +995,9 @@ msk_mediastatus(struct ifnet *ifp, struc
mii = device_get_softc(sc_if->msk_miibus);
mii_pollstat(mii);
- MSK_IF_UNLOCK(sc_if);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+ MSK_IF_UNLOCK(sc_if);
}
static int
Modified: head/sys/dev/nfe/if_nfe.c
==============================================================================
--- head/sys/dev/nfe/if_nfe.c Mon Oct 17 19:40:26 2011 (r226477)
+++ head/sys/dev/nfe/if_nfe.c Mon Oct 17 19:49:00 2011 (r226478)
@@ -2952,10 +2952,10 @@ nfe_ifmedia_sts(struct ifnet *ifp, struc
NFE_LOCK(sc);
mii = device_get_softc(sc->nfe_miibus);
mii_pollstat(mii);
- NFE_UNLOCK(sc);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+ NFE_UNLOCK(sc);
}
Modified: head/sys/dev/nge/if_nge.c
==============================================================================
--- head/sys/dev/nge/if_nge.c Mon Oct 17 19:40:26 2011 (r226477)
+++ head/sys/dev/nge/if_nge.c Mon Oct 17 19:49:00 2011 (r226478)
@@ -2417,9 +2417,9 @@ nge_mediastatus(struct ifnet *ifp, struc
NGE_LOCK(sc);
mii = device_get_softc(sc->nge_miibus);
mii_pollstat(mii);
- NGE_UNLOCK(sc);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+ NGE_UNLOCK(sc);
}
static int
Modified: head/sys/dev/nve/if_nve.c
==============================================================================
--- head/sys/dev/nve/if_nve.c Mon Oct 17 19:40:26 2011 (r226477)
+++ head/sys/dev/nve/if_nve.c Mon Oct 17 19:49:00 2011 (r226478)
@@ -1202,10 +1202,10 @@ nve_ifmedia_sts(struct ifnet *ifp, struc
NVE_LOCK(sc);
mii = device_get_softc(sc->miibus);
mii_pollstat(mii);
- NVE_UNLOCK(sc);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+ NVE_UNLOCK(sc);
return;
}
Modified: head/sys/dev/re/if_re.c
==============================================================================
--- head/sys/dev/re/if_re.c Mon Oct 17 19:40:26 2011 (r226477)
+++ head/sys/dev/re/if_re.c Mon Oct 17 19:49:00 2011 (r226478)
@@ -3214,9 +3214,9 @@ re_ifmedia_sts(struct ifnet *ifp, struct
RL_LOCK(sc);
mii_pollstat(mii);
- RL_UNLOCK(sc);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+ RL_UNLOCK(sc);
}
static int
Modified: head/sys/dev/sge/if_sge.c
==============================================================================
--- head/sys/dev/sge/if_sge.c Mon Oct 17 19:40:26 2011 (r226477)
+++ head/sys/dev/sge/if_sge.c Mon Oct 17 19:49:00 2011 (r226478)
@@ -1746,9 +1746,9 @@ sge_ifmedia_sts(struct ifnet *ifp, struc
return;
}
mii_pollstat(mii);
- SGE_UNLOCK(sc);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+ SGE_UNLOCK(sc);
}
static int
Modified: head/sys/dev/sis/if_sis.c
==============================================================================
--- head/sys/dev/sis/if_sis.c Mon Oct 17 19:40:26 2011 (r226477)
+++ head/sys/dev/sis/if_sis.c Mon Oct 17 19:49:00 2011 (r226478)
@@ -2237,9 +2237,9 @@ sis_ifmedia_sts(struct ifnet *ifp, struc
SIS_LOCK(sc);
mii = device_get_softc(sc->sis_miibus);
mii_pollstat(mii);
- SIS_UNLOCK(sc);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+ SIS_UNLOCK(sc);
}
static int
Modified: head/sys/dev/vge/if_vge.c
==============================================================================
--- head/sys/dev/vge/if_vge.c Mon Oct 17 19:40:26 2011 (r226477)
+++ head/sys/dev/vge/if_vge.c Mon Oct 17 19:49:00 2011 (r226478)
@@ -2173,9 +2173,9 @@ vge_ifmedia_sts(struct ifnet *ifp, struc
return;
}
mii_pollstat(mii);
- VGE_UNLOCK(sc);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+ VGE_UNLOCK(sc);
}
static void
Modified: head/sys/dev/vr/if_vr.c
==============================================================================
--- head/sys/dev/vr/if_vr.c Mon Oct 17 19:40:26 2011 (r226477)
+++ head/sys/dev/vr/if_vr.c Mon Oct 17 19:49:00 2011 (r226478)
@@ -2155,9 +2155,9 @@ vr_ifmedia_sts(struct ifnet *ifp, struct
return;
}
mii_pollstat(mii);
- VR_UNLOCK(sc);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+ VR_UNLOCK(sc);
}
static int
Modified: head/sys/dev/vte/if_vte.c
==============================================================================
--- head/sys/dev/vte/if_vte.c Mon Oct 17 19:40:26 2011 (r226477)
+++ head/sys/dev/vte/if_vte.c Mon Oct 17 19:49:00 2011 (r226478)
@@ -284,9 +284,9 @@ vte_mediastatus(struct ifnet *ifp, struc
mii = device_get_softc(sc->vte_miibus);
mii_pollstat(mii);
- VTE_UNLOCK(sc);
ifmr->ifm_status = mii->mii_media_status;
ifmr->ifm_active = mii->mii_media_active;
+ VTE_UNLOCK(sc);
}
static int
Modified: head/sys/mips/atheros/if_arge.c
==============================================================================
--- head/sys/mips/atheros/if_arge.c Mon Oct 17 19:40:26 2011
(r226477)
+++ head/sys/mips/atheros/if_arge.c Mon Oct 17 19:49:00 2011
(r226478)
@@ -1199,9 +1199,9 @@ arge_ifmedia_sts(struct ifnet *ifp, stru
mii = device_get_softc(sc->arge_miibus);
ARGE_LOCK(sc);
mii_pollstat(mii);
- ARGE_UNLOCK(sc);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+ ARGE_UNLOCK(sc);
}
struct arge_dmamap_arg {
Modified: head/sys/mips/idt/if_kr.c
==============================================================================
--- head/sys/mips/idt/if_kr.c Mon Oct 17 19:40:26 2011 (r226477)
+++ head/sys/mips/idt/if_kr.c Mon Oct 17 19:49:00 2011 (r226478)
@@ -945,9 +945,9 @@ kr_ifmedia_sts(struct ifnet *ifp, struct
mii = device_get_softc(sc->kr_miibus);
KR_LOCK(sc);
mii_pollstat(mii);
- KR_UNLOCK(sc);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+ KR_UNLOCK(sc);
}
struct kr_dmamap_arg {
Modified: head/sys/pci/if_rl.c
==============================================================================
--- head/sys/pci/if_rl.c Mon Oct 17 19:40:26 2011 (r226477)
+++ head/sys/pci/if_rl.c Mon Oct 17 19:49:00 2011 (r226478)
@@ -1932,9 +1932,9 @@ rl_ifmedia_sts(struct ifnet *ifp, struct
RL_LOCK(sc);
mii_pollstat(mii);
- RL_UNLOCK(sc);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+ RL_UNLOCK(sc);
}
static int
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
