diff options
| author | Mark Stapp <mjs@voltanet.io> | 2021-08-24 12:12:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-24 12:12:05 -0400 |
| commit | 5809c297fb56e54a0976a88f191caabb47ce7a7f (patch) | |
| tree | 53ff9de78dd8b1fbf66365df70dae6a29c28dc4c | |
| parent | 5dec72e1a082c54034010d89b94092a784b75b68 (diff) | |
| parent | 37692712a531a1810a3cfd04f2a40d4b55c3e237 (diff) | |
Merge pull request #9458 from anlancs/fix-ospf6-null
ospf6d: fix lock leak of using ALL_LSDB in GR helper
| -rw-r--r-- | ospf6d/ospf6_gr_helper.c | 7 | ||||
| -rw-r--r-- | ospf6d/ospf6_lsdb.h | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ospf6d/ospf6_gr_helper.c b/ospf6d/ospf6_gr_helper.c index 07e479efcb..7320ffbf0e 100644 --- a/ospf6d/ospf6_gr_helper.c +++ b/ospf6d/ospf6_gr_helper.c @@ -233,8 +233,13 @@ static bool ospf6_check_chg_in_rxmt_list(struct ospf6_neighbor *nbr) ospf6_lsdb_lookup(lsa->header->type, lsa->header->id, lsa->header->adv_router, lsa->lsdb); - if (lsa_in_db && lsa_in_db->tobe_acknowledged) + if (lsa_in_db && lsa_in_db->tobe_acknowledged) { + ospf6_lsa_unlock(lsa); + if (lsanext) + ospf6_lsa_unlock(lsanext); + return OSPF6_TRUE; + } } return OSPF6_FALSE; diff --git a/ospf6d/ospf6_lsdb.h b/ospf6d/ospf6_lsdb.h index 7a62c46b02..9789e8c4e0 100644 --- a/ospf6d/ospf6_lsdb.h +++ b/ospf6d/ospf6_lsdb.h @@ -68,7 +68,7 @@ extern struct ospf6_lsa *ospf6_lsdb_next(const struct route_node *iterend, /* * Since we are locking the lsa in ospf6_lsdb_head - * and then unlocking it in lspf6_lsa_lock, when + * and then unlocking it in ospf6_lsa_unlock, when * we cache the next pointer we need to increment * the lock for the lsa so we don't accidently free * it really early. @@ -76,7 +76,7 @@ extern struct ospf6_lsa *ospf6_lsdb_next(const struct route_node *iterend, #define ALL_LSDB(lsdb, lsa, lsanext) \ const struct route_node *iterend = \ ospf6_lsdb_head(lsdb, 0, 0, 0, &lsa); \ - (lsa) != NULL &&ospf6_lsa_lock(lsa) \ + (lsa) != NULL && ospf6_lsa_lock(lsa) \ && ((lsanext) = ospf6_lsdb_next(iterend, (lsa)), 1); \ ospf6_lsa_unlock(lsa), (lsa) = (lsanext) |