proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-29 17:13:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9458 from anlancs/fix-ospf6-null

Browse Source 
ospf6d: fix lock leak of using ALL_LSDB in GR helper
This commit is contained in:
Mark Stapp 2021-08-24 12:12:05 -04:00 committed by GitHub
commit 5809c297fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ospf6d/ospf6_gr_helper.c
View File

@ -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, ospf6_lsdb_lookup(lsa->header->type, lsa->header->id,
lsa->header->adv_router, lsa->lsdb); 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_TRUE;
}
} }
return OSPF6_FALSE; return OSPF6_FALSE;

4
ospf6d/ospf6_lsdb.h
View File

@ -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 * 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 * we cache the next pointer we need to increment
* the lock for the lsa so we don't accidently free * the lock for the lsa so we don't accidently free
* it really early. * 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) \ #define ALL_LSDB(lsdb, lsa, lsanext) \
const struct route_node *iterend = \ const struct route_node *iterend = \
ospf6_lsdb_head(lsdb, 0, 0, 0, &lsa); \ 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); \ && ((lsanext) = ospf6_lsdb_next(iterend, (lsa)), 1); \
ospf6_lsa_unlock(lsa), (lsa) = (lsanext) ospf6_lsa_unlock(lsa), (lsa) = (lsanext)