d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix carp(4) panics that can occur during carp interface configuration.

Browse Source 
Approved by:	mlaier (mentor)
Reported by:	Scott Ullrich
MFC after:	1 week
This commit is contained in:
Ermal Luçi 2008-07-14 20:11:51 +00:00
parent 189af44216
commit 7972c979c5
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/netinet/ip_carp.c
View File

@ -1464,7 +1464,11 @@ carp_set_addr(struct carp_softc *sc, struct sockaddr_in *sin)
carp_set_state(sc, INIT); carp_set_state(sc, INIT);
if (sc->sc_naddrs) if (sc->sc_naddrs)
SC2IFP(sc)->if_flags |= IFF_UP; SC2IFP(sc)->if_flags |= IFF_UP;
if (sc->sc_carpdev)
CARP_SCLOCK(sc);
carp_setrun(sc, 0); carp_setrun(sc, 0);
if (sc->sc_carpdev)
CARP_SCUNLOCK(sc);
return (0); return (0);
} }
@ -1625,7 +1629,11 @@ carp_set_addr6(struct carp_softc *sc, struct sockaddr_in6 *sin6)
carp_set_state(sc, INIT); carp_set_state(sc, INIT);
if (sc->sc_naddrs6) if (sc->sc_naddrs6)
SC2IFP(sc)->if_flags |= IFF_UP; SC2IFP(sc)->if_flags |= IFF_UP;
if (sc->sc_carpdev)
CARP_SCLOCK(sc);
carp_setrun(sc, 0); carp_setrun(sc, 0);
if (sc->sc_carpdev)
CARP_SCUNLOCK(sc);
return (0); return (0);
} }