diff options
| author | Alexander V. Chernikov <melifaro@FreeBSD.org> | 2021-03-23 22:00:04 +0000 |
|---|---|---|
| committer | Alexander V. Chernikov <melifaro@FreeBSD.org> | 2021-03-23 22:03:20 +0000 |
| commit | a0308e48ec12ae37f525aa3c6d3c1a236fb55dcd (patch) | |
| tree | 621092d16458314f0f5e5e199426c29e575da347 | |
| parent | 82ee386c2afb42388804c1189751b83048953433 (diff) | |
| download | src-a0308e48ec12ae37f525aa3c6d3c1a236fb55dcd.tar.gz src-a0308e48ec12ae37f525aa3c6d3c1a236fb55dcd.zip | |
Fix panic when destroying interface with ECMP routes.
Reported by: Zhenlei Huang <zlei.huang at gmail.com>
PR: 254496
MFC after: immediately
| -rw-r--r-- | sys/net/route/route_ctl.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sys/net/route/route_ctl.c b/sys/net/route/route_ctl.c index d9fd1aa18c92..d3a35018ae66 100644 --- a/sys/net/route/route_ctl.c +++ b/sys/net/route/route_ctl.c @@ -130,13 +130,22 @@ vnet_rtzone_destroy() static void destroy_rtentry(struct rtentry *rt) { + struct nhop_object *nh = rt->rt_nhop; /* * At this moment rnh, nh_control may be already freed. * nhop interface may have been migrated to a different vnet. * Use vnet stored in the nexthop to delete the entry. */ - CURVNET_SET(nhop_get_vnet(rt->rt_nhop)); +#ifdef ROUTE_MPATH + if (NH_IS_NHGRP(nh)) { + struct weightened_nhop *wn; + uint32_t num_nhops; + wn = nhgrp_get_nhops((struct nhgrp_object *)nh, &num_nhops); + nh = wn[0].nh; + } +#endif + CURVNET_SET(nhop_get_vnet(nh)); /* Unreference nexthop */ nhop_free_any(rt->rt_nhop); |