summaryrefslogtreecommitdiff
path: root/ospf6d
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas@opensourcerouting.org>2025-03-30 20:29:07 +0300
committerGitHub <noreply@github.com>2025-03-30 20:29:07 +0300
commit36b8ed3164050e10635d813dbb4af362d85843ca (patch)
tree32fafdb5ce8a222075e02eee4686a4e5a8244a6b /ospf6d
parent10d922b6316034a63c820e2c0e81c96dafaebff6 (diff)
parent57b0230f88a23d36181b7dc50fe57e1eb124cee1 (diff)
Merge pull request #18509 from FRRouting/mergify/bp/stable/10.3/pr-18503
ospf6d: Fix LSA memory leaks related to graceful restart (backport #18503)
Diffstat (limited to 'ospf6d')
-rw-r--r--ospf6d/ospf6_flood.c1
-rw-r--r--ospf6d/ospf6_gr.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/ospf6d/ospf6_flood.c b/ospf6d/ospf6_flood.c
index 04ff35083f..261eed30ea 100644
--- 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 64eb90d5f2..27b8df0828 100644
--- 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;
}