Merge pull request #13821 from FRRouting/mergify/bp/stable/8.5/pr-13800

fix crashes in rip and ripng (backport #13800)
FRRouting · Jun 20, 2023 · f08b1c8 · f08b1c8
2 parents 04c9a28 + 6527233
commit f08b1c8
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 15 deletions.
diff --git a/ripd/ripd.c b/ripd/ripd.c
@@ -3551,18 +3551,10 @@ static int rip_vrf_new(struct vrf *vrf)
 
 static int rip_vrf_delete(struct vrf *vrf)
 {
-	struct rip *rip;
-
 	if (IS_RIP_DEBUG_EVENT)
 		zlog_debug("%s: VRF deleted: %s(%u)", __func__, vrf->name,
 			   vrf->vrf_id);
 
-	rip = rip_lookup_by_vrf_name(vrf->name);
-	if (!rip)
-		return 0;
-
-	rip_clean(rip);
-
 	return 0;
 }
 

diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
@@ -2581,17 +2581,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;
 }