proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 01:37:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1730 from Orange-OpenSource/master

Browse Source 
ospfd: Fix ospfd crash
This commit is contained in:
Russ White 2018-02-20 07:11:58 -05:00 committed by GitHub
commit 4298f5e937
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ospfd/ospf_opaque.c
View File

@ -75,6 +75,7 @@ static void ospf_opaque_funclist_init(void);
static void ospf_opaque_funclist_term(void); static void ospf_opaque_funclist_term(void);
static void free_opaque_info_per_type(void *val); static void free_opaque_info_per_type(void *val);
static void free_opaque_info_per_id(void *val); static void free_opaque_info_per_id(void *val);
static void free_opaque_info_owner(void *val);
static int ospf_opaque_lsa_install_hook(struct ospf_lsa *lsa); static int ospf_opaque_lsa_install_hook(struct ospf_lsa *lsa);
static int ospf_opaque_lsa_delete_hook(struct ospf_lsa *lsa); static int ospf_opaque_lsa_delete_hook(struct ospf_lsa *lsa);
@ -439,9 +440,11 @@ void ospf_delete_opaque_functab(u_char lsa_type, u_char opaque_type)
if (functab->opaque_type == opaque_type) { if (functab->opaque_type == opaque_type) {
/* Cleanup internal control information, if it /* Cleanup internal control information, if it
* still remains. */ * still remains. */
if (functab->oipt != NULL) if (functab->oipt != NULL) {
free_opaque_info_per_type( free_opaque_info_per_type(
functab->oipt); functab->oipt);
free_opaque_info_owner(functab->oipt);
}
/* Dequeue listnode entry from the list. */ /* Dequeue listnode entry from the list. */
listnode_delete(funclist, functab); listnode_delete(funclist, functab);
@ -572,6 +575,7 @@ register_opaque_info_per_type(struct ospf_opaque_functab *functab,
top = ospf_lookup_by_vrf_id(new->vrf_id); top = ospf_lookup_by_vrf_id(new->vrf_id);
if (new->area != NULL && (top = new->area->ospf) == NULL) { if (new->area != NULL && (top = new->area->ospf) == NULL) {
free_opaque_info_per_type((void *)oipt); free_opaque_info_per_type((void *)oipt);
free_opaque_info_owner(oipt);
oipt = NULL; oipt = NULL;
goto out; /* This case may not exist. */ goto out; /* This case may not exist. */
} }
@ -583,6 +587,7 @@ register_opaque_info_per_type(struct ospf_opaque_functab *functab,
"register_opaque_info_per_type: Unexpected LSA-type(%u)", "register_opaque_info_per_type: Unexpected LSA-type(%u)",
new->data->type); new->data->type);
free_opaque_info_per_type((void *)oipt); free_opaque_info_per_type((void *)oipt);
free_opaque_info_owner(oipt);
oipt = NULL; oipt = NULL;
goto out; /* This case may not exist. */ goto out; /* This case may not exist. */
} }
@ -600,6 +605,35 @@ out:
return oipt; return oipt;
} }
/* Remove "oipt" from its owner's self-originated LSA list. */
static void free_opaque_info_owner(void *val)
{
struct opaque_info_per_type *oipt = (struct opaque_info_per_type *)val;
switch (oipt->lsa_type) {
case OSPF_OPAQUE_LINK_LSA: {
struct ospf_interface *oi =
(struct ospf_interface *)(oipt->owner);
listnode_delete(oi->opaque_lsa_self, oipt);
break;
}
case OSPF_OPAQUE_AREA_LSA: {
struct ospf_area *area = (struct ospf_area *)(oipt->owner);
listnode_delete(area->opaque_lsa_self, oipt);
break;
}
case OSPF_OPAQUE_AS_LSA: {
struct ospf *top = (struct ospf *)(oipt->owner);
listnode_delete(top->opaque_lsa_self, oipt);
break;
}
default:
zlog_warn("free_opaque_info_owner: Unexpected LSA-type(%u)",
oipt->lsa_type);
break; /* This case may not exist. */
}
}
static void free_opaque_info_per_type(void *val) static void free_opaque_info_per_type(void *val)
{ {
struct opaque_info_per_type *oipt = (struct opaque_info_per_type *)val; struct opaque_info_per_type *oipt = (struct opaque_info_per_type *)val;

4
ospfd/ospf_packet.c
View File

@ -3897,6 +3897,10 @@ static void ospf_ls_upd_queue_send(struct ospf_interface *oi,
zlog_debug("listcount = %d, [%s]dst %s", listcount(update), zlog_debug("listcount = %d, [%s]dst %s", listcount(update),
IF_NAME(oi), inet_ntoa(addr)); IF_NAME(oi), inet_ntoa(addr));
/* Check that we have really something to process */
if (listcount(update) == 0)
return;
op = ospf_ls_upd_packet_new(update, oi); op = ospf_ls_upd_packet_new(update, oi);
/* Prepare OSPF common header. */ /* Prepare OSPF common header. */