ospf6d: Fix LSA memory leaks related to graceful restart

Fixes leaks reported by ospf6_gr_topo1 topotest.

Signed-off-by: Martin Buck <mb-tmp-tvguho.pbz@gromit.dyndns.org>
(cherry picked from commit 0db0e7fbd7c6d6c5ba32c741385bc1b2d1acfa77)

diff --git a/ospf6d/ospf6_flood.c b/ospf6d/ospf6_flood.c
index 04ff35083ffb43a76e44063320ea2244f19ae3ea..261eed30ea4d3c0c4bf756a3d185b7eb4354525a 100644 (file)
--- a/ospf6d/ospf6_flood.c
+++ b/ospf6d/ospf6_flood.c
@@ -1061,6 +1061,7 @@ void ospf6_receive_lsa(struct ospf6_neighbor *from,
                                                zlog_debug(
                                                        "%s, Not moving to HELPER role, So dicarding GraceLSA",
                                                        __func__);
+                                       ospf6_lsa_delete(new);
                                        return;
                                }
                        }

diff --git a/ospf6d/ospf6_gr.c b/ospf6d/ospf6_gr.c
index 64eb90d5f29a82782fc691c68e24fd6e0dcad362..27b8df0828c27784dd90ae3e6a839189c0de0ae6 100644 (file)
--- a/ospf6d/ospf6_gr.c
+++ b/ospf6d/ospf6_gr.c
@@ -371,6 +371,7 @@ void ospf6_gr_check_lsdb_consistency(struct ospf6 *ospf6,
                        snprintfrr(reason, sizeof(reason),
                                   "detected inconsistent LSA %s [area %pI4]",
                                   lsa->name, &area->area_id);
+                       ospf6_lsa_unlock(&lsa);
                        ospf6_gr_restart_exit(ospf6, reason);
                        return;
                }