isisd: Fix sadj memory leak

donaldsharp · donaldsharp · commit 63e6e11f9f8a · 2022-12-09T07:44:26.000-05:00
In some cases the sadj was directly dropped.

Signed-off-by: Donald Sharp &lt;sharpd@nvidia.com&gt;
diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c
@@ -1297,6 +1297,7 @@ static void spf_adj_get_reverse_metrics(struct isis_spftree *spftree)
 		if (lsp_adj == NULL || lsp_adj->hdr.rem_lifetime == 0) {
 			/* Delete one-way adjacency. */
 			listnode_delete(spftree->sadj_list, sadj);
+			isis_spf_adj_free(sadj);
 			continue;
 		}
 
@@ -1313,6 +1314,7 @@ static void spf_adj_get_reverse_metrics(struct isis_spftree *spftree)
 		if (args.reverse_metric == UINT32_MAX) {
 			/* Delete one-way adjacency. */
 			listnode_delete(spftree->sadj_list, sadj);
+			isis_spf_adj_free(sadj);
 			continue;
 		}
 		sadj->metric = args.reverse_metric;

Original file line number	Diff line number	Diff line change
`@@ -1297,6 +1297,7 @@ static void spf_adj_get_reverse_metrics(struct isis_spftree *spftree)`
`1297`	`1297`	`if (lsp_adj == NULL \|\| lsp_adj->hdr.rem_lifetime == 0) {`
`1298`	`1298`	`/* Delete one-way adjacency. */`
`1299`	`1299`	`listnode_delete(spftree->sadj_list, sadj);`
	`1300`	`+ isis_spf_adj_free(sadj);`
`1300`	`1301`	`continue;`
`1301`	`1302`	`}`
`1302`	`1303`
`@@ -1313,6 +1314,7 @@ static void spf_adj_get_reverse_metrics(struct isis_spftree *spftree)`
`1313`	`1314`	`if (args.reverse_metric == UINT32_MAX) {`
`1314`	`1315`	`/* Delete one-way adjacency. */`
`1315`	`1316`	`listnode_delete(spftree->sadj_list, sadj);`
	`1317`	`+ isis_spf_adj_free(sadj);`
`1316`	`1318`	`continue;`
`1317`	`1319`	`}`
`1318`	`1320`	`sadj->metric = args.reverse_metric;`