From: luoyaozu <luoyaozu@chinatelecom.cn>
Date: Sun, 14 Aug 2022 04:55:48 +0000 (+0800)
Subject: vrrp: fix SIGABRT crash by ASSERT() when deleting vrrp vr(MASTER state)
X-Git-Tag: v23.02-rc0~102
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=b5339c64d1100463058d1719ea23e0af353ce697;p=vpp.git

vrrp: fix SIGABRT crash by ASSERT() when deleting vrrp vr(MASTER state)

we need cancel vrrp_vr_timer when deleting vrrp vr

Type: fix

Signed-off-by: luoyaozu <luoyaozu@chinatelecom.cn>
Change-Id: I8ea01f1943d6e3e60c4990c5be945de613bc8b53
---

diff --git a/src/plugins/vrrp/vrrp.c b/src/plugins/vrrp/vrrp.c
index f1ab1b27185..12f4daee989 100644
--- a/src/plugins/vrrp/vrrp.c
+++ b/src/plugins/vrrp/vrrp.c
@@ -815,6 +815,7 @@ vrrp_vr_del_common (vrrp_vr_t *vr, vrrp_vr_key_t *key)
   vrrp_main_t *vrm = &vrrp_main;
   ip46_address_t *vr_addrs_del_copy;
 
+  vrrp_vr_timer_cancel (vr);
   vrrp_vr_tracking_ifs_add_del (vr, vr->tracking.interfaces, 0);
   vr_addrs_del_copy = vec_dup (vr->config.vr_addrs);
   vrrp_vr_addrs_add_del (vr, 0, vr_addrs_del_copy);