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

Close a race acquiring the IF_ADDR_LOCK() for each entry while iterating

Browse Source 
over all interfaces to make sure the address will neither change nor be
freed while we are working on it.

PR:		kern/146250
Submitted by:	Mikolaj Golub (to.my.trociny gmail.com)
MFC after:	1 week
This commit is contained in:
Bjoern A. Zeeb 2010-10-16 19:25:27 +00:00
parent fc2bfb3294
commit ee7c7fee94
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/net/rtsock.c
View File

@ -1473,6 +1473,7 @@ sysctl_iflist(int af, struct walkarg *w)
TAILQ_FOREACH(ifp, &V_ifnet, if_link) {
if (w->w_arg && w->w_arg != ifp->if_index)
continue;
IF_ADDR_LOCK(ifp);
ifa = ifp->if_addr;
info.rti_info[RTAX_IFP] = ifa->ifa_addr;
len = rt_msg2(RTM_IFINFO, &info, NULL, w);
@ -1530,10 +1531,13 @@ sysctl_iflist(int af, struct walkarg *w)
goto done;
}
}
IF_ADDR_UNLOCK(ifp);
info.rti_info[RTAX_IFA] = info.rti_info[RTAX_NETMASK] =
info.rti_info[RTAX_BRD] = NULL;
}
done:
if (ifp != NULL)
IF_ADDR_UNLOCK(ifp);
IFNET_RUNLOCK();
return (error);
}