From: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
Date: Tue, 26 May 2020 13:24:17 +0000 (-0700)
Subject: zebra: stop neigh hold timer when the neigh is deleted
X-Git-Tag: base_7.6~520^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=2b9e207e0e49222cdcdf6eed5d63d6dfee76dc2a;p=mirror%2Ffrr.git

zebra: stop neigh hold timer when the neigh is deleted

The neigh hold timer was firing after the neigh was deleted resulting
in the following crash -
[
    at ./zebra/zebra_evpn_neigh.h:155
    at zebra/zebra_evpn_neigh.c:447
    at lib/thread.c:1578
    at zebra/main.c:488
]

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
---

diff --git a/zebra/zebra_evpn_neigh.c b/zebra/zebra_evpn_neigh.c
index 661d1c7f81..6a76a475e6 100644
--- a/zebra/zebra_evpn_neigh.c
+++ b/zebra/zebra_evpn_neigh.c
@@ -614,6 +614,9 @@ int zebra_evpn_neigh_del(zebra_evpn_t *zevpn, zebra_neigh_t *n)
 	/* Cancel auto recovery */
 	THREAD_OFF(n->dad_ip_auto_recovery_timer);
 
+	/* Cancel proxy hold timer */
+	zebra_evpn_neigh_stop_hold_timer(n);
+
 	/* Free the VNI hash entry and allocated memory. */
 	tmp_n = hash_release(zevpn->neigh_table, n);
 	XFREE(MTYPE_NEIGH, tmp_n);