From af85312e8a6f34ea7c8af77b9841fab6b5559e25 Mon Sep 17 00:00:00 2001 From: "Alexander V. Chernikov" Date: Tue, 23 Mar 2021 22:00:04 +0000 Subject: [PATCH] Fix panic when destroying interface with ECMP routes. Reported by: Zhenlei Huang PR: 254496 (cherry picked from commit a0308e48ec12ae37f525aa3c6d3c1a236fb55dcd) --- sys/net/route/route_ctl.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/sys/net/route/route_ctl.c b/sys/net/route/route_ctl.c index 46e0bcfee6b..58b89c28f94 100644 --- a/sys/net/route/route_ctl.c +++ b/sys/net/route/route_ctl.c @@ -130,16 +130,25 @@ 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); + nhop_free_any(nh); uma_zfree(V_rtzone, rt); -- 2.45.0