From: Donald Sharp <sharpd@nvidia.com>
Date: Fri, 13 Aug 2021 21:24:21 +0000 (-0400)
Subject: pimd: Prevent memory leak
X-Git-Tag: base_8.1~194^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=5f1808acab2a5bb79e6e85896be21d61d1e52e02;p=matthieu%2Ffrr.git

pimd: Prevent memory leak

When we decide that we do not need a item on the partial_bsrp_list
don't just drop the memory on the floor, free it up.

This was happening when we decided that a pending item has
a hold time of 0.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
---

diff --git a/pimd/pim_bsm.c b/pimd/pim_bsm.c
index 0181e885fd..f2845ee6e1 100644
--- a/pimd/pim_bsm.c
+++ b/pimd/pim_bsm.c
@@ -419,9 +419,12 @@ static void pim_instate_pend_list(struct bsgrp_node *bsgrp_node)
 	active = bsm_rpinfos_first(bsgrp_node->bsrp_list);
 
 	/* Remove nodes with hold time 0 & check if list still has a head */
-	frr_each_safe (bsm_rpinfos, bsgrp_node->partial_bsrp_list, pend)
-		if (is_hold_time_zero(pend))
+	frr_each_safe (bsm_rpinfos, bsgrp_node->partial_bsrp_list, pend) {
+		if (is_hold_time_zero(pend)) {
 			bsm_rpinfos_del(bsgrp_node->partial_bsrp_list, pend);
+			pim_bsm_rpinfo_free(pend);
+		}
+	}
 
 	pend = bsm_rpinfos_first(bsgrp_node->partial_bsrp_list);