From owner-svn-src-stable@FreeBSD.ORG Sat Dec 31 01:10:30 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8C8501065677; Sat, 31 Dec 2011 01:10:30 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 77C378FC1A; Sat, 31 Dec 2011 01:10:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBV1AU87039713; Sat, 31 Dec 2011 01:10:30 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBV1AUeA039697; Sat, 31 Dec 2011 01:10:30 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201112310110.pBV1AUeA039697@svn.freebsd.org> From: Pyun YongHyeon Date: Sat, 31 Dec 2011 01:10:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r229059 - in stable/7/sys: dev/age dev/alc dev/ale dev/lge dev/msk dev/nfe dev/nge dev/nve dev/re dev/sge dev/sis dev/vge dev/vr dev/vte pci X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Dec 2011 01:10:30 -0000 Author: yongari Date: Sat Dec 31 01:10:29 2011 New Revision: 229059 URL: http://svn.freebsd.org/changeset/base/229059 Log: MFC r226478: 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: stable/7/sys/dev/age/if_age.c stable/7/sys/dev/alc/if_alc.c stable/7/sys/dev/ale/if_ale.c stable/7/sys/dev/lge/if_lge.c stable/7/sys/dev/msk/if_msk.c stable/7/sys/dev/nfe/if_nfe.c stable/7/sys/dev/nge/if_nge.c stable/7/sys/dev/nve/if_nve.c stable/7/sys/dev/re/if_re.c stable/7/sys/dev/sge/if_sge.c stable/7/sys/dev/sis/if_sis.c stable/7/sys/dev/vge/if_vge.c stable/7/sys/dev/vr/if_vr.c stable/7/sys/dev/vte/if_vte.c stable/7/sys/pci/if_rl.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/age/if_age.c ============================================================================== --- stable/7/sys/dev/age/if_age.c Sat Dec 31 01:08:31 2011 (r229058) +++ stable/7/sys/dev/age/if_age.c Sat Dec 31 01:10:29 2011 (r229059) @@ -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: stable/7/sys/dev/alc/if_alc.c ============================================================================== --- stable/7/sys/dev/alc/if_alc.c Sat Dec 31 01:08:31 2011 (r229058) +++ stable/7/sys/dev/alc/if_alc.c Sat Dec 31 01:10:29 2011 (r229059) @@ -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: stable/7/sys/dev/ale/if_ale.c ============================================================================== --- stable/7/sys/dev/ale/if_ale.c Sat Dec 31 01:08:31 2011 (r229058) +++ stable/7/sys/dev/ale/if_ale.c Sat Dec 31 01:10:29 2011 (r229059) @@ -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: stable/7/sys/dev/lge/if_lge.c ============================================================================== --- stable/7/sys/dev/lge/if_lge.c Sat Dec 31 01:08:31 2011 (r229058) +++ stable/7/sys/dev/lge/if_lge.c Sat Dec 31 01:10:29 2011 (r229059) @@ -1433,9 +1433,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: stable/7/sys/dev/msk/if_msk.c ============================================================================== --- stable/7/sys/dev/msk/if_msk.c Sat Dec 31 01:08:31 2011 (r229058) +++ stable/7/sys/dev/msk/if_msk.c Sat Dec 31 01:10:29 2011 (r229059) @@ -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: stable/7/sys/dev/nfe/if_nfe.c ============================================================================== --- stable/7/sys/dev/nfe/if_nfe.c Sat Dec 31 01:08:31 2011 (r229058) +++ stable/7/sys/dev/nfe/if_nfe.c Sat Dec 31 01:10:29 2011 (r229059) @@ -2943,10 +2943,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: stable/7/sys/dev/nge/if_nge.c ============================================================================== --- stable/7/sys/dev/nge/if_nge.c Sat Dec 31 01:08:31 2011 (r229058) +++ stable/7/sys/dev/nge/if_nge.c Sat Dec 31 01:10:29 2011 (r229059) @@ -2276,9 +2276,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: stable/7/sys/dev/nve/if_nve.c ============================================================================== --- stable/7/sys/dev/nve/if_nve.c Sat Dec 31 01:08:31 2011 (r229058) +++ stable/7/sys/dev/nve/if_nve.c Sat Dec 31 01:10:29 2011 (r229059) @@ -1203,10 +1203,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: stable/7/sys/dev/re/if_re.c ============================================================================== --- stable/7/sys/dev/re/if_re.c Sat Dec 31 01:08:31 2011 (r229058) +++ stable/7/sys/dev/re/if_re.c Sat Dec 31 01:10:29 2011 (r229059) @@ -3208,9 +3208,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: stable/7/sys/dev/sge/if_sge.c ============================================================================== --- stable/7/sys/dev/sge/if_sge.c Sat Dec 31 01:08:31 2011 (r229058) +++ stable/7/sys/dev/sge/if_sge.c Sat Dec 31 01:10:29 2011 (r229059) @@ -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: stable/7/sys/dev/sis/if_sis.c ============================================================================== --- stable/7/sys/dev/sis/if_sis.c Sat Dec 31 01:08:31 2011 (r229058) +++ stable/7/sys/dev/sis/if_sis.c Sat Dec 31 01:10:29 2011 (r229059) @@ -2108,9 +2108,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: stable/7/sys/dev/vge/if_vge.c ============================================================================== --- stable/7/sys/dev/vge/if_vge.c Sat Dec 31 01:08:31 2011 (r229058) +++ stable/7/sys/dev/vge/if_vge.c Sat Dec 31 01:10:29 2011 (r229059) @@ -2174,9 +2174,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: stable/7/sys/dev/vr/if_vr.c ============================================================================== --- stable/7/sys/dev/vr/if_vr.c Sat Dec 31 01:08:31 2011 (r229058) +++ stable/7/sys/dev/vr/if_vr.c Sat Dec 31 01:10:29 2011 (r229059) @@ -2147,9 +2147,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: stable/7/sys/dev/vte/if_vte.c ============================================================================== --- stable/7/sys/dev/vte/if_vte.c Sat Dec 31 01:08:31 2011 (r229058) +++ stable/7/sys/dev/vte/if_vte.c Sat Dec 31 01:10:29 2011 (r229059) @@ -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: stable/7/sys/pci/if_rl.c ============================================================================== --- stable/7/sys/pci/if_rl.c Sat Dec 31 01:08:31 2011 (r229058) +++ stable/7/sys/pci/if_rl.c Sat Dec 31 01:10:29 2011 (r229059) @@ -1925,9 +1925,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