D18338.id51135.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D18338.id51135.diff
View Options

	Index: sys/net/if.c
	===================================================================
	--- sys/net/if.c
	+++ sys/net/if.c
	@@ -1068,6 +1068,8 @@
	CK_STAILQ_FOREACH(iter, &V_ifnet, if_link)
	if (iter == ifp) {
	CK_STAILQ_REMOVE(&V_ifnet, ifp, ifnet, if_link);
	+ if (!vmove)
	+ ifp->if_flags \|= IFF_DYING;
	found = 1;
	break;
	}
	Index: sys/net/rtsock.c
	===================================================================
	--- sys/net/rtsock.c
	+++ sys/net/rtsock.c
	@@ -1554,6 +1554,8 @@
	struct rt_addrinfo info;
	struct sockaddr_storage ss;

	+ IFNET_RLOCK_NOSLEEP_ASSERT();
	+
	if (w->w_op == NET_RT_FLAGS && !(rt->rt_flags & w->w_arg))
	return 0;
	if ((rt->rt_flags & RTF_HOST) == 0
	@@ -1566,7 +1568,7 @@
	info.rti_info[RTAX_NETMASK] = rtsock_fix_netmask(rt_key(rt),
	rt_mask(rt), &ss);
	info.rti_info[RTAX_GENMASK] = 0;
	- if (rt->rt_ifp) {
	+ if (rt->rt_ifp && !(rt->rt_ifp->if_flags & IFF_DYING)) {
	info.rti_info[RTAX_IFP] = rt->rt_ifp->if_addr->ifa_addr;
	info.rti_info[RTAX_IFA] = rt->rt_ifa->ifa_addr;
	if (rt->rt_ifp->if_flags & IFF_POINTOPOINT)
	@@ -1922,8 +1924,10 @@
	rnh = rt_tables_get_rnh(fib, i);
	if (rnh != NULL) {
	RIB_RLOCK(rnh);
	+ IFNET_RLOCK_NOSLEEP();
	error = rnh->rnh_walktree(&rnh->head,
	sysctl_dumpentry, &w);
	+ IFNET_RUNLOCK_NOSLEEP();
	RIB_RUNLOCK(rnh);
	} else if (af != 0)
	error = EAFNOSUPPORT;