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

fixed a kernel crash when IPv6 PIM-SM routing is enabled and a PIM register message is received

Browse Source 
Obtained from: KAME
MFC After: 3 days
This commit is contained in:
SUZUKI Shinsuke 2005-10-17 13:47:31 +00:00
parent 4c2501483a
commit 2d70ebe43d
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/netinet6/ip6_mroute.c
View File

@ -174,7 +174,7 @@ extern struct socket *ip_mrouter;
* can't be sent this way. They only exist as a placeholder for
* multicast source verification.
*/
struct ifnet multicast_register_if;
struct ifnet multicast_register_if6;
#define ENCAP_HOPS 64
@ -550,9 +550,12 @@ ip6_mrouter_done()
bzero((caddr_t)mf6ctable, sizeof(mf6ctable));
/*
* Reset de-encapsulation cache
* Reset register interface
*/
reg_mif_num = -1;
if (reg_mif_num != (mifi_t)-1) {
if_detach(&multicast_register_if6);
reg_mif_num = (mifi_t)-1;
}
ip6_mrouter = NULL;
ip6_mrouter_ver = 0;
@ -593,15 +596,15 @@ add_m6if(mifcp)
ifp = ifnet_byindex(mifcp->mif6c_pifi);
if (mifcp->mif6c_flags & MIFF_REGISTER) {
if (reg_mif_num == (mifi_t)-1) {
strlcpy(multicast_register_if.if_xname, "register_mif",
IFNAMSIZ);
multicast_register_if.if_flags |= IFF_LOOPBACK;
multicast_register_if.if_index = mifcp->mif6c_mifi;
reg_mif_num = mifcp->mif6c_mifi;
}
ifp = &multicast_register_if6;
ifp = &multicast_register_if;
if (reg_mif_num == (mifi_t)-1) {
if_initname(ifp, "register_mif", 0);
ifp->if_flags |= IFF_LOOPBACK;
ifp->if_index = mifcp->mif6c_mifi;
reg_mif_num = mifcp->mif6c_mifi;
if_attach(ifp);
}
} /* if REGISTER */
else {
@ -672,6 +675,11 @@ del_m6if(mifip)
ifp = mifp->m6_ifp;
if_allmulti(ifp, 0);
} else {
if (reg_mif_num != (mifi_t)-1) {
if_detach(&multicast_register_if6);
reg_mif_num = (mifi_t)-1;
}
}
#ifdef notyet