From: Igor Ryzhov <iryzhov@nfware.com>
Date: Thu, 15 Jun 2023 14:42:05 +0000 (+0300)
Subject: Revert "ripngd: Cleanup memory allocations on shutdown"
X-Git-Tag: base_9.1~342^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F13800%2Fhead;p=mirror%2Ffrr.git

Revert "ripngd: Cleanup memory allocations on shutdown"

This reverts commit b1d29673ca16e558aea5d632da181555c83980cf.

This commit introduced a crash. When the VRF is deleted, the RIPNG
instance should not be freed, because the NB infrastructure still stores
the pointer to it. The instance should be deleted only when it's actually
deleted from the configuration.

To reproduce the crash:
```
frr# conf t
frr(config)# vrf vrf1
frr(config-vrf)# exit
frr(config)# router ripng vrf vrf1
frr(config-router)# exit
frr(config)# no vrf vrf1
frr(config)# no router ripng vrf vrf1
vtysh: error reading from ripngd: Resource temporarily unavailable (11)Warning: closing connection to ripngd because of an I/O error!
frr(config)#
```

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
---

diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
index 7269e76656..d5618b63f2 100644
--- a/ripngd/ripngd.c
+++ b/ripngd/ripngd.c
@@ -2624,17 +2624,10 @@ static int ripng_vrf_new(struct vrf *vrf)
 
 static int ripng_vrf_delete(struct vrf *vrf)
 {
-	struct ripng *ripng;
-
 	if (IS_RIPNG_DEBUG_EVENT)
 		zlog_debug("%s: VRF deleted: %s(%u)", __func__, vrf->name,
 			   vrf->vrf_id);
 
-	ripng = ripng_lookup_by_vrf_name(vrf->name);
-	if (!ripng)
-		return 0;
-
-	ripng_clean(ripng);
 	return 0;
 }