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

*: Convert list_delete(struct list *) to ** to allow nulling

Browse Source 
Convert the list_delete(struct list *) function to use
struct list **.  This is to allow the list pointer to be nulled.

I keep running into uses of this list_delete function where we
forget to set the returned pointer to NULL and attempt to use
it and then experience a crash, usually after the developer
has long since left the building.

Let's make the api explicit in it setting the list pointer
to null.

Cynical Prediction:  This code will expose a attempt
to use the NULL'ed list pointer in some obscure bit
of code.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-10-05 10:51:01 -04:00
parent ad183f047c
commit affe9e9983
80 changed files with 231 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bgpd/bgp_evpn.c
View File

@ -2609,10 +2609,8 @@ void bgp_evpn_free(struct bgp *bgp, struct bgpevpn *vpn)
{ {
bgp_table_unlock(vpn->route_table); bgp_table_unlock(vpn->route_table);
bgp_evpn_unmap_vni_from_its_rts(bgp, vpn); bgp_evpn_unmap_vni_from_its_rts(bgp, vpn);
list_delete(vpn->import_rtl); list_delete_and_null(&vpn->import_rtl);
list_delete(vpn->export_rtl); list_delete_and_null(&vpn->export_rtl);
vpn->import_rtl = NULL;
vpn->export_rtl = NULL;
bf_release_index(bgp->rd_idspace, vpn->rd_id); bf_release_index(bgp->rd_idspace, vpn->rd_id);
hash_release(bgp->vnihash, vpn); hash_release(bgp->vnihash, vpn);
QOBJ_UNREG(vpn); QOBJ_UNREG(vpn);

2
bgpd/bgp_main.c
View File

@ -215,7 +215,7 @@ static __attribute__((__noreturn__)) void bgp_exit(int status)
#endif #endif
bgp_zebra_destroy(); bgp_zebra_destroy();
list_delete(bm->bgp); list_delete_and_null(&bm->bgp);
memset(bm, 0, sizeof(*bm)); memset(bm, 0, sizeof(*bm));
frr_fini(); frr_fini();

8
bgpd/bgpd.c
View File

@ -2436,14 +2436,14 @@ int peer_group_delete(struct peer_group *group)
peer_delete(other); peer_delete(other);
} }
} }
list_delete(group->peer); list_delete_and_null(&group->peer);
for (afi = AFI_IP; afi < AFI_MAX; afi++) { for (afi = AFI_IP; afi < AFI_MAX; afi++) {
for (ALL_LIST_ELEMENTS(group->listen_range[afi], node, nnode, for (ALL_LIST_ELEMENTS(group->listen_range[afi], node, nnode,
prefix)) { prefix)) {
prefix_free(prefix); prefix_free(prefix);
} }
list_delete(group->listen_range[afi]); list_delete_and_null(&group->listen_range[afi]);
} }
XFREE(MTYPE_PEER_GROUP_HOST, group->name); XFREE(MTYPE_PEER_GROUP_HOST, group->name);
@ -3193,8 +3193,8 @@ void bgp_free(struct bgp *bgp)
QOBJ_UNREG(bgp); QOBJ_UNREG(bgp);
list_delete(bgp->group); list_delete_and_null(&bgp->group);
list_delete(bgp->peer); list_delete_and_null(&bgp->peer);
if (bgp->peerhash) { if (bgp->peerhash) {
hash_free(bgp->peerhash); hash_free(bgp->peerhash);

15
bgpd/rfapi/bgp_rfapi_cfg.c
View File

@ -2327,8 +2327,7 @@ static void bgp_rfapi_delete_nve_group(struct vty *vty, /* NULL = no output */
listnode_delete(rfg->nves, rfd); listnode_delete(rfg->nves, rfd);
listnode_add(orphaned_nves, rfd); listnode_add(orphaned_nves, rfd);
} }
list_delete(rfg->nves); list_delete_and_null(&rfg->nves);
rfg->nves = NULL;
} }
/* delete it */ /* delete it */
@ -2405,7 +2404,7 @@ static void bgp_rfapi_delete_nve_group(struct vty *vty, /* NULL = no output */
if (vty) if (vty)
vty_out(vty, "\n"); vty_out(vty, "\n");
} }
list_delete(orphaned_nves); list_delete_and_null(&orphaned_nves);
} }
} }
@ -3420,7 +3419,7 @@ static void bgp_rfapi_delete_l2_group(struct vty *vty, /* NULL = no output */
if (rfg->rt_export_list) if (rfg->rt_export_list)
ecommunity_free(&rfg->rt_export_list); ecommunity_free(&rfg->rt_export_list);
if (rfg->labels) if (rfg->labels)
list_delete(rfg->labels); list_delete_and_null(&rfg->labels);
if (rfg->rfp_cfg) if (rfg->rfp_cfg)
XFREE(MTYPE_RFAPI_RFP_GROUP_CFG, rfg->rfp_cfg); XFREE(MTYPE_RFAPI_RFP_GROUP_CFG, rfg->rfp_cfg);
listnode_delete(bgp->rfapi_cfg->l2_groups, rfg); listnode_delete(bgp->rfapi_cfg->l2_groups, rfg);
@ -3825,10 +3824,10 @@ void bgp_rfapi_cfg_destroy(struct bgp *bgp, struct rfapi_cfg *h)
bgp_rfapi_delete_named_nve_group(NULL, bgp, NULL, RFAPI_GROUP_CFG_MAX); bgp_rfapi_delete_named_nve_group(NULL, bgp, NULL, RFAPI_GROUP_CFG_MAX);
bgp_rfapi_delete_named_l2_group(NULL, bgp, NULL); bgp_rfapi_delete_named_l2_group(NULL, bgp, NULL);
if (h->l2_groups != NULL) if (h->l2_groups != NULL)
list_delete(h->l2_groups); list_delete_and_null(&h->l2_groups);
list_delete(h->nve_groups_sequential); list_delete_and_null(&h->nve_groups_sequential);
list_delete(h->rfg_export_direct_bgp_l); list_delete_and_null(&h->rfg_export_direct_bgp_l);
list_delete(h->rfg_export_zebra_l); list_delete_and_null(&h->rfg_export_zebra_l);
if (h->default_rt_export_list) if (h->default_rt_export_list)
ecommunity_free(&h->default_rt_export_list); ecommunity_free(&h->default_rt_export_list);
if (h->default_rt_import_list) if (h->default_rt_import_list)

3
bgpd/rfapi/rfapi.c
View File

@ -490,7 +490,8 @@ void del_vnc_route(struct rfapi_descriptor *rfd,
* Delete local_nexthops list * Delete local_nexthops list
*/ */
if (bi->extra && bi->extra->vnc.export.local_nexthops) { if (bi->extra && bi->extra->vnc.export.local_nexthops) {
list_delete(bi->extra->vnc.export.local_nexthops); list_delete_and_null(
&bi->extra->vnc.export.local_nexthops);
} }
bgp_aggregate_decrement(bgp, p, bi, afi, safi); bgp_aggregate_decrement(bgp, p, bi, afi, safi);

15
bgpd/rfapi/rfapi_rib.c
View File

@ -510,13 +510,12 @@ void rfapiRibClear(struct rfapi_descriptor *rfd)
*/ */
if (pn->info) { if (pn->info) {
if (pn->info != (void *)1) { if (pn->info != (void *)1) {
list_delete( list_delete_and_null(
(struct list (struct list **)(&pn->info));
*)(pn->info));
} }
pn->info = NULL; pn->info = NULL;
route_unlock_node( /* linklist or 1 deleted */
pn); /* linklist or 1 deleted */ route_unlock_node(pn);
} }
} }
} }
@ -1435,7 +1434,7 @@ callback:
} }
delete_list->del = (void (*)(void *))rfapi_info_free; delete_list->del = (void (*)(void *))rfapi_info_free;
list_delete(delete_list); list_delete_and_null(&delete_list);
} }
RFAPI_RIB_CHECK_COUNTS(0, 0); RFAPI_RIB_CHECK_COUNTS(0, 0);
@ -1450,7 +1449,7 @@ callback:
route_unlock_node(pn); route_unlock_node(pn);
} }
if (lPendCost) { if (lPendCost) {
list_delete(lPendCost); list_delete_and_null(&lPendCost);
pn->info = NULL; pn->info = NULL;
route_unlock_node(pn); route_unlock_node(pn);
} }
@ -1634,7 +1633,7 @@ void rfapiRibUpdatePendingNode(
*/ */
if (pn->info) { if (pn->info) {
if (pn->info != (void *)1) { if (pn->info != (void *)1) {
list_delete((struct list *)(pn->info)); list_delete_and_null((struct list **)(&pn->info));
} }
pn->info = NULL; pn->info = NULL;
route_unlock_node(pn); /* linklist or 1 deleted */ route_unlock_node(pn); /* linklist or 1 deleted */

2
bgpd/rfapi/rfapi_vty.c
View File

@ -3274,7 +3274,7 @@ static int rfapiDeleteLocalPrefixesByRFD(struct rfapi_local_reg_delete_arg *cda,
} }
list_delete_all_node(adb_delete_list); list_delete_all_node(adb_delete_list);
} }
list_delete(adb_delete_list); list_delete_and_null(&adb_delete_list);
} }

2
bgpd/rfapi/vnc_import_bgp.c
View File

@ -2426,7 +2426,7 @@ void vnc_import_bgp_exterior_add_route_interior(
skiplist_delete(it->monitor_exterior_orphans, skiplist_delete(it->monitor_exterior_orphans,
bi_exterior, NULL); bi_exterior, NULL);
} }
list_delete(list_adopted); list_delete_and_null(&list_adopted);
} }
} }

4
bgpd/rfapi/vnc_zebra.c
View File

@ -584,7 +584,7 @@ static void vnc_zebra_add_del_prefix(struct bgp *bgp,
nve_list_to_nh_array(rn->p.family, nves, &nexthop_count, nve_list_to_nh_array(rn->p.family, nves, &nexthop_count,
&nh_ary, &nhp_ary); &nh_ary, &nhp_ary);
list_delete(nves); list_delete_and_null(&nves);
if (nexthop_count) if (nexthop_count)
vnc_zebra_route_msg(&rn->p, nexthop_count, nhp_ary, vnc_zebra_route_msg(&rn->p, nexthop_count, nhp_ary,
@ -753,7 +753,7 @@ static void vnc_zebra_add_del_group_afi(struct bgp *bgp,
vnc_zlog_debug_verbose("%s: family: %d, nve count: %d", vnc_zlog_debug_verbose("%s: family: %d, nve count: %d",
__func__, family, nexthop_count); __func__, family, nexthop_count);
list_delete(nves); list_delete_and_null(&nves);
if (nexthop_count) { if (nexthop_count) {
/* /*

2
eigrpd/eigrp_dump.c
View File

@ -301,7 +301,7 @@ void show_ip_eigrp_prefix_entry(struct vty *vty, struct eigrp_prefix_entry *tn)
tn->serno); tn->serno);
if (successors) if (successors)
list_delete(successors); list_delete_and_null(&successors);
} }
void show_ip_eigrp_nexthop_entry(struct vty *vty, struct eigrp *eigrp, void show_ip_eigrp_nexthop_entry(struct vty *vty, struct eigrp *eigrp,

14
eigrpd/eigrp_fsm.c
View File

@ -366,7 +366,7 @@ int eigrp_fsm_event_nq_fcn(struct eigrp_fsm_action_message *msg)
// neighbors left // neighbors left
} }
list_delete(successors); list_delete_and_null(&successors);
return 1; return 1;
} }
@ -393,7 +393,7 @@ int eigrp_fsm_event_q_fcn(struct eigrp_fsm_action_message *msg)
// neighbors left // neighbors left
} }
list_delete(successors); list_delete_and_null(&successors);
return 1; return 1;
} }
@ -445,7 +445,7 @@ int eigrp_fsm_event_lr(struct eigrp_fsm_action_message *msg)
ne = listnode_head(successors); ne = listnode_head(successors);
eigrp_send_reply(ne->adv_router, eigrp_send_reply(ne->adv_router,
prefix); prefix);
list_delete(successors); list_delete_and_null(&successors);
} }
prefix->state = EIGRP_FSM_STATE_PASSIVE; prefix->state = EIGRP_FSM_STATE_PASSIVE;
@ -475,7 +475,7 @@ int eigrp_fsm_event_dinc(struct eigrp_fsm_action_message *msg)
msg); msg);
list_delete(successors); list_delete_and_null(&successors);
return 1; return 1;
} }
@ -500,7 +500,7 @@ int eigrp_fsm_event_lr_fcs(struct eigrp_fsm_action_message *msg)
eigrp_send_reply(ne->adv_router, eigrp_send_reply(ne->adv_router,
prefix); prefix);
list_delete(successors); list_delete_and_null(&successors);
} }
prefix->req_action |= EIGRP_FSM_NEED_UPDATE; prefix->req_action |= EIGRP_FSM_NEED_UPDATE;
listnode_add(eigrp->topology_changes_internalIPV4, prefix); listnode_add(eigrp->topology_changes_internalIPV4, prefix);
@ -536,7 +536,7 @@ int eigrp_fsm_event_lr_fcn(struct eigrp_fsm_action_message *msg)
// neighbors left // neighbors left
} }
list_delete(successors); list_delete_and_null(&successors);
return 1; return 1;
} }
@ -552,6 +552,6 @@ int eigrp_fsm_event_qact(struct eigrp_fsm_action_message *msg)
msg->prefix->state = EIGRP_FSM_STATE_ACTIVE_2; msg->prefix->state = EIGRP_FSM_STATE_ACTIVE_2;
msg->prefix->distance = ne->distance; msg->prefix->distance = ne->distance;
list_delete(successors); list_delete_and_null(&successors);
return 1; return 1;
} }

4
eigrpd/eigrp_interface.c
View File

@ -109,7 +109,7 @@ int eigrp_if_delete_hook(struct interface *ifp)
if (!ei) if (!ei)
return 0; return 0;
list_delete(ei->nbrs); list_delete_and_null(&ei->nbrs);
eigrp = ei->eigrp; eigrp = ei->eigrp;
listnode_delete(eigrp->eiflist, ei); listnode_delete(eigrp->eiflist, ei);
@ -354,7 +354,7 @@ void eigrp_if_free(struct eigrp_interface *ei,
eigrp_if_down(ei); eigrp_if_down(ei);
list_delete(ei->nbrs); list_delete_and_null(&ei->nbrs);
listnode_delete(ei->eigrp->eiflist, ei); listnode_delete(ei->eigrp->eiflist, ei);
} }

6
eigrpd/eigrp_topology.c
View File

@ -199,7 +199,7 @@ void eigrp_nexthop_entry_add(struct eigrp_prefix_entry *node,
eigrp_zebra_route_add(node->destination, l); eigrp_zebra_route_add(node->destination, l);
} }
list_delete(l); list_delete_and_null(&l);
} }
/* /*
@ -296,7 +296,7 @@ struct list *eigrp_topology_get_successor(struct eigrp_prefix_entry *table_node)
* If we have no successors return NULL * If we have no successors return NULL
*/ */
if (!successors->count) { if (!successors->count) {
list_delete(successors); list_delete_and_null(&successors);
successors = NULL; successors = NULL;
} }
@ -475,7 +475,7 @@ void eigrp_update_routing_table(struct eigrp_prefix_entry *prefix)
for (ALL_LIST_ELEMENTS_RO(successors, node, entry)) for (ALL_LIST_ELEMENTS_RO(successors, node, entry))
entry->flags |= EIGRP_NEXTHOP_ENTRY_INTABLE_FLAG; entry->flags |= EIGRP_NEXTHOP_ENTRY_INTABLE_FLAG;
list_delete(successors); list_delete_and_null(&successors);
} else { } else {
eigrp_zebra_route_delete(prefix->destination); eigrp_zebra_route_delete(prefix->destination);
for (ALL_LIST_ELEMENTS_RO(prefix->entries, node, entry)) for (ALL_LIST_ELEMENTS_RO(prefix->entries, node, entry))

2
eigrpd/eigrp_update.c
View File

@ -411,7 +411,7 @@ void eigrp_update_receive(struct eigrp *eigrp, struct ip *iph,
eigrp_update_send_all(eigrp, ei); eigrp_update_send_all(eigrp, ei);
if (nbr_prefixes) if (nbr_prefixes)
list_delete(nbr_prefixes); list_delete_and_null(&nbr_prefixes);
} }
/*send EIGRP Update packet*/ /*send EIGRP Update packet*/

8
eigrpd/eigrpd.c
View File

@ -282,10 +282,10 @@ void eigrp_finish_final(struct eigrp *eigrp)
THREAD_OFF(eigrp->t_read); THREAD_OFF(eigrp->t_read);
close(eigrp->fd); close(eigrp->fd);
list_delete(eigrp->eiflist); list_delete_and_null(&eigrp->eiflist);
list_delete(eigrp->oi_write_q); list_delete_and_null(&eigrp->oi_write_q);
list_delete(eigrp->topology_changes_externalIPV4); list_delete_and_null(&eigrp->topology_changes_externalIPV4);
list_delete(eigrp->topology_changes_internalIPV4); list_delete_and_null(&eigrp->topology_changes_internalIPV4);
eigrp_topology_cleanup(eigrp->topology_table); eigrp_topology_cleanup(eigrp->topology_table);
eigrp_topology_free(eigrp->topology_table); eigrp_topology_free(eigrp->topology_table);

17
isisd/isis_circuit.c
View File

@ -453,19 +453,19 @@ void isis_circuit_if_del(struct isis_circuit *circuit, struct interface *ifp)
if (circuit->ip_addrs) { if (circuit->ip_addrs) {
assert(listcount(circuit->ip_addrs) == 0); assert(listcount(circuit->ip_addrs) == 0);
list_delete(circuit->ip_addrs); list_delete_and_null(&circuit->ip_addrs);
circuit->ip_addrs = NULL; circuit->ip_addrs = NULL;
} }
if (circuit->ipv6_link) { if (circuit->ipv6_link) {
assert(listcount(circuit->ipv6_link) == 0); assert(listcount(circuit->ipv6_link) == 0);
list_delete(circuit->ipv6_link); list_delete_and_null(&circuit->ipv6_link);
circuit->ipv6_link = NULL; circuit->ipv6_link = NULL;
} }
if (circuit->ipv6_non_link) { if (circuit->ipv6_non_link) {
assert(listcount(circuit->ipv6_non_link) == 0); assert(listcount(circuit->ipv6_non_link) == 0);
list_delete(circuit->ipv6_non_link); list_delete_and_null(&circuit->ipv6_non_link);
circuit->ipv6_non_link = NULL; circuit->ipv6_non_link = NULL;
} }
@ -692,22 +692,22 @@ void isis_circuit_down(struct isis_circuit *circuit)
if (circuit->circ_type == CIRCUIT_T_BROADCAST) { if (circuit->circ_type == CIRCUIT_T_BROADCAST) {
/* destroy neighbour lists */ /* destroy neighbour lists */
if (circuit->u.bc.lan_neighs[0]) { if (circuit->u.bc.lan_neighs[0]) {
list_delete(circuit->u.bc.lan_neighs[0]); list_delete_and_null(&circuit->u.bc.lan_neighs[0]);
circuit->u.bc.lan_neighs[0] = NULL; circuit->u.bc.lan_neighs[0] = NULL;
} }
if (circuit->u.bc.lan_neighs[1]) { if (circuit->u.bc.lan_neighs[1]) {
list_delete(circuit->u.bc.lan_neighs[1]); list_delete_and_null(&circuit->u.bc.lan_neighs[1]);
circuit->u.bc.lan_neighs[1] = NULL; circuit->u.bc.lan_neighs[1] = NULL;
} }
/* destroy adjacency databases */ /* destroy adjacency databases */
if (circuit->u.bc.adjdb[0]) { if (circuit->u.bc.adjdb[0]) {
circuit->u.bc.adjdb[0]->del = isis_delete_adj; circuit->u.bc.adjdb[0]->del = isis_delete_adj;
list_delete(circuit->u.bc.adjdb[0]); list_delete_and_null(&circuit->u.bc.adjdb[0]);
circuit->u.bc.adjdb[0] = NULL; circuit->u.bc.adjdb[0] = NULL;
} }
if (circuit->u.bc.adjdb[1]) { if (circuit->u.bc.adjdb[1]) {
circuit->u.bc.adjdb[1]->del = isis_delete_adj; circuit->u.bc.adjdb[1]->del = isis_delete_adj;
list_delete(circuit->u.bc.adjdb[1]); list_delete_and_null(&circuit->u.bc.adjdb[1]);
circuit->u.bc.adjdb[1] = NULL; circuit->u.bc.adjdb[1] = NULL;
} }
if (circuit->u.bc.is_dr[0]) { if (circuit->u.bc.is_dr[0]) {
@ -745,8 +745,7 @@ void isis_circuit_down(struct isis_circuit *circuit)
THREAD_OFF(circuit->t_read); THREAD_OFF(circuit->t_read);
if (circuit->lsp_queue) { if (circuit->lsp_queue) {
list_delete(circuit->lsp_queue); list_delete_and_null(&circuit->lsp_queue);
circuit->lsp_queue = NULL;
} }
if (circuit->lsp_hash) { if (circuit->lsp_hash) {

6
isisd/isis_dr.c
View File

@ -135,7 +135,7 @@ int isis_dr_elect(struct isis_circuit *circuit, int level)
if (!adjdb) { if (!adjdb) {
zlog_warn("isis_dr_elect() adjdb == NULL"); zlog_warn("isis_dr_elect() adjdb == NULL");
list_delete(list); list_delete_and_null(&list);
return ISIS_WARNING; return ISIS_WARNING;
} }
isis_adj_build_up_list(adjdb, list); isis_adj_build_up_list(adjdb, list);
@ -177,7 +177,7 @@ int isis_dr_elect(struct isis_circuit *circuit, int level)
*/ */
if (circuit->u.bc.is_dr[level - 1]) if (circuit->u.bc.is_dr[level - 1])
retval = isis_dr_resign(circuit, level); retval = isis_dr_resign(circuit, level);
list_delete(list); list_delete_and_null(&list);
return retval; return retval;
} }
@ -217,7 +217,7 @@ int isis_dr_elect(struct isis_circuit *circuit, int level)
if (circuit->u.bc.is_dr[level - 1]) if (circuit->u.bc.is_dr[level - 1])
retval = isis_dr_resign(circuit, level); retval = isis_dr_resign(circuit, level);
} }
list_delete(list); list_delete_and_null(&list);
return retval; return retval;
} }

6
isisd/isis_events.c
View File

@ -132,10 +132,8 @@ static void circuit_resign_level(struct isis_circuit *circuit, int level)
THREAD_TIMER_OFF(circuit->u.bc.t_refresh_pseudo_lsp[idx]); THREAD_TIMER_OFF(circuit->u.bc.t_refresh_pseudo_lsp[idx]);
circuit->lsp_regenerate_pending[idx] = 0; circuit->lsp_regenerate_pending[idx] = 0;
circuit->u.bc.run_dr_elect[idx] = 0; circuit->u.bc.run_dr_elect[idx] = 0;
if (circuit->u.bc.lan_neighs[idx] != NULL) { if (circuit->u.bc.lan_neighs[idx] != NULL)
list_delete(circuit->u.bc.lan_neighs[idx]); list_delete_and_null(&circuit->u.bc.lan_neighs[idx]);
circuit->u.bc.lan_neighs[idx] = NULL;
}
} }
return; return;

8
isisd/isis_lsp.c
View File

@ -126,7 +126,7 @@ static void lsp_destroy(struct isis_lsp *lsp)
lsp_clear_data(lsp); lsp_clear_data(lsp);
if (LSP_FRAGMENT(lsp->hdr.lsp_id) == 0 && lsp->lspu.frags) { if (LSP_FRAGMENT(lsp->hdr.lsp_id) == 0 && lsp->lspu.frags) {
list_delete(lsp->lspu.frags); list_delete_and_null(&lsp->lspu.frags);
lsp->lspu.frags = NULL; lsp->lspu.frags = NULL;
} }
@ -1143,7 +1143,7 @@ static void lsp_build(struct isis_lsp *lsp, struct isis_area *area)
frag->tlvs = tlvs; frag->tlvs = tlvs;
} }
list_delete(fragments); list_delete_and_null(&fragments);
lsp_debug("ISIS (%s): LSP construction is complete. Serializing...", lsp_debug("ISIS (%s): LSP construction is complete. Serializing...",
area->area_tag); area->area_tag);
return; return;
@ -1521,7 +1521,7 @@ static void lsp_build_pseudo(struct isis_lsp *lsp, struct isis_circuit *circuit,
LSP_PSEUDO_ID(ne_id)); LSP_PSEUDO_ID(ne_id));
} }
} }
list_delete(adj_list); list_delete_and_null(&adj_list);
return; return;
} }
@ -1905,7 +1905,7 @@ int lsp_tick(struct thread *thread)
} }
} }
list_delete(lsp_list); list_delete_and_null(&lsp_list);
return ISIS_OK; return ISIS_OK;
} }

6
isisd/isis_mt.c
View File

@ -151,8 +151,7 @@ void area_mt_init(struct isis_area *area)
void area_mt_finish(struct isis_area *area) void area_mt_finish(struct isis_area *area)
{ {
list_delete(area->mt_settings); list_delete_and_null(&area->mt_settings);
area->mt_settings = NULL;
} }
struct isis_area_mt_setting *area_get_mt_setting(struct isis_area *area, struct isis_area_mt_setting *area_get_mt_setting(struct isis_area *area,
@ -275,8 +274,7 @@ void circuit_mt_init(struct isis_circuit *circuit)
void circuit_mt_finish(struct isis_circuit *circuit) void circuit_mt_finish(struct isis_circuit *circuit)
{ {
list_delete(circuit->mt_settings); list_delete_and_null(&circuit->mt_settings);
circuit->mt_settings = NULL;
} }
struct isis_circuit_mt_setting * struct isis_circuit_mt_setting *

2
isisd/isis_pdu.c
View File

@ -1292,7 +1292,7 @@ static int process_snp(uint8_t pdu_type, struct isis_circuit *circuit,
for (ALL_LIST_ELEMENTS_RO(lsp_list, node, lsp)) for (ALL_LIST_ELEMENTS_RO(lsp_list, node, lsp))
ISIS_SET_FLAG(lsp->SRMflags, circuit); ISIS_SET_FLAG(lsp->SRMflags, circuit);
/* lets free it */ /* lets free it */
list_delete(lsp_list); list_delete_and_null(&lsp_list);
} }
retval = ISIS_OK; retval = ISIS_OK;

4
isisd/isis_route.c
View File

@ -289,13 +289,13 @@ static void isis_route_info_delete(struct isis_route_info *route_info)
if (route_info->nexthops) { if (route_info->nexthops) {
route_info->nexthops->del = route_info->nexthops->del =
(void (*)(void *))isis_nexthop_delete; (void (*)(void *))isis_nexthop_delete;
list_delete(route_info->nexthops); list_delete_and_null(&route_info->nexthops);
} }
if (route_info->nexthops6) { if (route_info->nexthops6) {
route_info->nexthops6->del = route_info->nexthops6->del =
(void (*)(void *))isis_nexthop6_delete; (void (*)(void *))isis_nexthop6_delete;
list_delete(route_info->nexthops6); list_delete_and_null(&route_info->nexthops6);
} }
XFREE(MTYPE_ISIS_ROUTE_INFO, route_info); XFREE(MTYPE_ISIS_ROUTE_INFO, route_info);

16
isisd/isis_spf.c
View File

@ -205,10 +205,8 @@ static void isis_vertex_queue_free(struct isis_vertex_queue *queue)
if (queue->insert_counter) { if (queue->insert_counter) {
skiplist_free(queue->l.slist); skiplist_free(queue->l.slist);
queue->l.slist = NULL; queue->l.slist = NULL;
} else { } else
list_delete(queue->l.list); list_delete_and_null(&queue->l.list);
queue->l.list = NULL;
}
} }
static unsigned int isis_vertex_queue_count(struct isis_vertex_queue *queue) static unsigned int isis_vertex_queue_count(struct isis_vertex_queue *queue)
@ -437,10 +435,8 @@ static struct isis_vertex *isis_vertex_new(void *id, enum vertextype vtype)
static void isis_vertex_del(struct isis_vertex *vertex) static void isis_vertex_del(struct isis_vertex *vertex)
{ {
list_delete(vertex->Adj_N); list_delete_and_null(&vertex->Adj_N);
vertex->Adj_N = NULL; list_delete_and_null(&vertex->parents);
list_delete(vertex->parents);
vertex->parents = NULL;
memset(vertex, 0, sizeof(struct isis_vertex)); memset(vertex, 0, sizeof(struct isis_vertex));
XFREE(MTYPE_ISIS_VERTEX, vertex); XFREE(MTYPE_ISIS_VERTEX, vertex);
@ -1038,7 +1034,7 @@ static int isis_spf_preload_tent(struct isis_spftree *spftree,
adjdb = circuit->u.bc.adjdb[spftree->level - 1]; adjdb = circuit->u.bc.adjdb[spftree->level - 1];
isis_adj_build_up_list(adjdb, adj_list); isis_adj_build_up_list(adjdb, adj_list);
if (listcount(adj_list) == 0) { if (listcount(adj_list) == 0) {
list_delete(adj_list); list_delete_and_null(&adj_list);
if (isis->debugs & DEBUG_SPF_EVENTS) if (isis->debugs & DEBUG_SPF_EVENTS)
zlog_debug( zlog_debug(
"ISIS-Spf: no L%d adjacencies on circuit %s", "ISIS-Spf: no L%d adjacencies on circuit %s",
@ -1102,7 +1098,7 @@ static int isis_spf_preload_tent(struct isis_spftree *spftree,
"isis_spf_preload_tent unknow adj type"); "isis_spf_preload_tent unknow adj type");
} }
} }
list_delete(adj_list); list_delete_and_null(&adj_list);
/* /*
* Add the pseudonode * Add the pseudonode
*/ */

3
isisd/isis_tlvs.c
View File

@ -2397,8 +2397,7 @@ struct list *isis_fragment_tlvs(struct isis_tlvs *tlvs, size_t size)
struct listnode *node; struct listnode *node;
for (ALL_LIST_ELEMENTS_RO(rv, node, fragment_tlvs)) for (ALL_LIST_ELEMENTS_RO(rv, node, fragment_tlvs))
isis_free_tlvs(fragment_tlvs); isis_free_tlvs(fragment_tlvs);
list_delete(rv); list_delete_and_null(&rv);
rv = NULL;
} }
stream_free(dummy_stream); stream_free(dummy_stream);

3
isisd/isisd.c
View File

@ -220,8 +220,7 @@ int isis_area_destroy(struct vty *vty, const char *area_tag)
circuit->ipv6_router = 0; circuit->ipv6_router = 0;
isis_csm_state_change(ISIS_DISABLE, circuit, area); isis_csm_state_change(ISIS_DISABLE, circuit, area);
} }
list_delete(area->circuit_list); list_delete_and_null(&area->circuit_list);
area->circuit_list = NULL;
} }
if (area->lspdb[0] != NULL) { if (area->lspdb[0] != NULL) {

8
lib/command.c
View File

@ -686,7 +686,7 @@ static vector cmd_complete_command_real(vector vline, struct vty *vty,
} }
vector comps = completions_to_vec(completions); vector comps = completions_to_vec(completions);
list_delete(completions); list_delete_and_null(&completions);
// set status code appropriately // set status code appropriately
switch (vector_active(comps)) { switch (vector_active(comps)) {
@ -1006,7 +1006,7 @@ static int cmd_execute_command_real(vector vline, enum filter_type filter,
// if matcher error, return corresponding CMD_ERR // if matcher error, return corresponding CMD_ERR
if (MATCHER_ERROR(status)) { if (MATCHER_ERROR(status)) {
if (argv_list) if (argv_list)
list_delete(argv_list); list_delete_and_null(&argv_list);
switch (status) { switch (status) {
case MATCHER_INCOMPLETE: case MATCHER_INCOMPLETE:
return CMD_ERR_INCOMPLETE; return CMD_ERR_INCOMPLETE;
@ -1035,7 +1035,7 @@ static int cmd_execute_command_real(vector vline, enum filter_type filter,
ret = matched_element->func(matched_element, vty, argc, argv); ret = matched_element->func(matched_element, vty, argc, argv);
// delete list and cmd_token's in it // delete list and cmd_token's in it
list_delete(argv_list); list_delete_and_null(&argv_list);
XFREE(MTYPE_TMP, argv); XFREE(MTYPE_TMP, argv);
return ret; return ret;
@ -2730,6 +2730,6 @@ void cmd_terminate()
if (host.config) if (host.config)
XFREE(MTYPE_HOST, host.config); XFREE(MTYPE_HOST, host.config);
list_delete(varhandlers); list_delete_and_null(&varhandlers);
qobj_finish(); qobj_finish();
} }

10
lib/command_match.c
View File

@ -333,7 +333,7 @@ static enum matcher_rv command_match_r(struct graph_node *start, vector vline,
status = MATCHER_INCOMPLETE; status = MATCHER_INCOMPLETE;
// cleanup // cleanup
list_delete(next); list_delete_and_null(&next);
return status; return status;
} }
@ -366,7 +366,7 @@ enum matcher_rv command_complete(struct graph *graph, vector vline,
unsigned int idx; unsigned int idx;
for (idx = 0; idx < vector_active(vline) && next->count > 0; idx++) { for (idx = 0; idx < vector_active(vline) && next->count > 0; idx++) {
list_delete(current); list_delete_and_null(&current);
current = next; current = next;
next = list_new(); next = list_new();
next->del = stack_del; next->del = stack_del;
@ -457,8 +457,8 @@ enum matcher_rv command_complete(struct graph *graph, vector vline,
} }
} }
list_delete(current); list_delete_and_null(&current);
list_delete(next); list_delete_and_null(&next);
return mrv; return mrv;
} }
@ -648,7 +648,7 @@ static void del_arglist(struct list *list)
list_delete_node(list, tail); list_delete_node(list, tail);
// delete the rest of the list as usual // delete the rest of the list as usual
list_delete(list); list_delete_and_null(&list);
} }
/*---------- token level matching functions ----------*/ /*---------- token level matching functions ----------*/

6
lib/grammar_sandbox.c
View File

@ -141,7 +141,7 @@ DEFUN (grammar_test_complete,
vty_out(vty, "%% No match\n"); vty_out(vty, "%% No match\n");
// free resources // free resources
list_delete(completions); list_delete_and_null(&completions);
cmd_free_strvec(command); cmd_free_strvec(command);
XFREE(MTYPE_TMP, cmdstr); XFREE(MTYPE_TMP, cmdstr);
@ -185,7 +185,7 @@ DEFUN (grammar_test_match,
vty_out(vty, "func: %p\n", element->func); vty_out(vty, "func: %p\n", element->func);
list_delete(argvv); list_delete_and_null(&argvv);
} else { } else {
assert(MATCHER_ERROR(result)); assert(MATCHER_ERROR(result));
switch (result) { switch (result) {
@ -426,7 +426,7 @@ DEFUN (grammar_findambig,
} }
prev = cur; prev = cur;
} }
list_delete(commands); list_delete_and_null(&commands);
vty_out(vty, "\n"); vty_out(vty, "\n");
} while (scan && scannode < LINK_PARAMS_NODE); } while (scan && scannode < LINK_PARAMS_NODE);

3
lib/hash.c
View File

@ -318,8 +318,7 @@ void hash_free(struct hash *hash)
if (_hashes) { if (_hashes) {
listnode_delete(_hashes, hash); listnode_delete(_hashes, hash);
if (_hashes->count == 0) { if (_hashes->count == 0) {
list_delete(_hashes); list_delete_and_null(&_hashes);
_hashes = NULL;
} }
} }
} }

3
lib/if.c
View File

@ -1095,8 +1095,7 @@ void if_terminate(struct list **intf_list)
if_delete(ifp); if_delete(ifp);
} }
list_delete(*intf_list); list_delete_and_null(intf_list);
*intf_list = NULL;
} }
const char *if_link_type_str(enum zebra_link_type llt) const char *if_link_type_str(enum zebra_link_type llt)

2
lib/keychain.c
View File

@ -119,7 +119,7 @@ static void keychain_delete(struct keychain *keychain)
if (keychain->name) if (keychain->name)
XFREE(MTYPE_KEYCHAIN, keychain->name); XFREE(MTYPE_KEYCHAIN, keychain->name);
list_delete(keychain->key); list_delete_and_null(&keychain->key);
listnode_delete(keychain_list, keychain); listnode_delete(keychain_list, keychain);
keychain_free(keychain); keychain_free(keychain);
} }

16
lib/linklist.c
View File

@ -239,7 +239,7 @@ void list_delete_all_node(struct list *list)
assert(list); assert(list);
for (node = list->head; node; node = next) { for (node = list->head; node; node = next) {
next = node->next; next = node->next;
if (list->del) if (*list->del)
(*list->del)(node->data); (*list->del)(node->data);
listnode_free(node); listnode_free(node);
} }
@ -248,11 +248,17 @@ void list_delete_all_node(struct list *list)
} }
/* Delete all listnode then free list itself. */ /* Delete all listnode then free list itself. */
void list_delete(struct list *list) void list_delete_and_null(struct list **list)
{ {
assert(list); assert(*list);
list_delete_all_node(list); list_delete_all_node(*list);
list_free(list); list_free(*list);
*list = NULL;
}
void list_delete_original(struct list *list)
{
list_delete_and_null(&list);
} }
/* Lookup the node which has given data. */ /* Lookup the node which has given data. */

15
lib/linklist.h
View File

@ -74,7 +74,20 @@ extern void listnode_delete(struct list *, void *);
extern struct listnode *listnode_lookup(struct list *, void *); extern struct listnode *listnode_lookup(struct list *, void *);
extern void *listnode_head(struct list *); extern void *listnode_head(struct list *);
extern void list_delete(struct list *); /*
* The usage of list_delete is being transitioned to pass in
* the double pointer to remove use after free's.
* In Oct of 2018, rename list_delete_and_null to list_delete
* and remove list_delete_original and the list_delete #define
*/
#if CONFDATE > 20181001
CPP_NOTICE("list_delete without double pointer is deprecated, please fixup")
#endif
extern void list_delete_and_null(struct list **);
extern void list_delete_original(struct list *);
#define list_delete(X) list_delete_original((X)) \
CPP_WARN("Please transition to using list_delete_and_null")
extern void list_delete_all_node(struct list *); extern void list_delete_all_node(struct list *);
/* For ospfd and ospf6d. */ /* For ospfd and ospf6d. */

2
lib/thread.c
View File

@ -570,7 +570,7 @@ void thread_master_free(struct thread_master *m)
pthread_cond_destroy(&m->cancel_cond); pthread_cond_destroy(&m->cancel_cond);
close(m->io_pipe[0]); close(m->io_pipe[0]);
close(m->io_pipe[1]); close(m->io_pipe[1]);
list_delete(m->cancel_req); list_delete_and_null(&m->cancel_req);
m->cancel_req = NULL; m->cancel_req = NULL;
hash_clean(m->cpu_record, cpu_record_hash_free); hash_clean(m->cpu_record, cpu_record_hash_free);

2
lib/wheel.c
View File

@ -99,7 +99,7 @@ void wheel_delete(struct timer_wheel *wheel)
int i; int i;
for (i = 0; i < wheel->slots; i++) { for (i = 0; i < wheel->slots; i++) {
list_delete(wheel->wheel_slot_lists[i]); list_delete_and_null(&wheel->wheel_slot_lists[i]);
} }
THREAD_OFF(wheel->timer); THREAD_OFF(wheel->timer);

2
ospf6d/ospf6_area.c
View File

@ -272,7 +272,7 @@ void ospf6_area_delete(struct ospf6_area *oa)
for (ALL_LIST_ELEMENTS_RO(oa->if_list, n, oi)) for (ALL_LIST_ELEMENTS_RO(oa->if_list, n, oi))
oi->area = NULL; oi->area = NULL;
list_delete(oa->if_list); list_delete_and_null(&oa->if_list);
ospf6_lsdb_delete(oa->lsdb); ospf6_lsdb_delete(oa->lsdb);
ospf6_lsdb_delete(oa->lsdb_self); ospf6_lsdb_delete(oa->lsdb_self);

2
ospf6d/ospf6_interface.c
View File

@ -242,7 +242,7 @@ void ospf6_interface_delete(struct ospf6_interface *oi)
for (ALL_LIST_ELEMENTS(oi->neighbor_list, node, nnode, on)) for (ALL_LIST_ELEMENTS(oi->neighbor_list, node, nnode, on))
ospf6_neighbor_delete(on); ospf6_neighbor_delete(on);
list_delete(oi->neighbor_list); list_delete_and_null(&oi->neighbor_list);
THREAD_OFF(oi->thread_send_hello); THREAD_OFF(oi->thread_send_hello);
THREAD_OFF(oi->thread_send_lsupdate); THREAD_OFF(oi->thread_send_lsupdate);

2
ospf6d/ospf6_route.c
View File

@ -353,7 +353,7 @@ void ospf6_route_delete(struct ospf6_route *route)
{ {
if (route) { if (route) {
if (route->nh_list) if (route->nh_list)
list_delete(route->nh_list); list_delete_and_null(&route->nh_list);
XFREE(MTYPE_OSPF6_ROUTE, route); XFREE(MTYPE_OSPF6_ROUTE, route);
} }
} }

4
ospf6d/ospf6_spf.c
View File

@ -152,8 +152,8 @@ static struct ospf6_vertex *ospf6_vertex_create(struct ospf6_lsa *lsa)
static void ospf6_vertex_delete(struct ospf6_vertex *v) static void ospf6_vertex_delete(struct ospf6_vertex *v)
{ {
list_delete(v->nh_list); list_delete_and_null(&v->nh_list);
list_delete(v->child_list); list_delete_and_null(&v->child_list);
XFREE(MTYPE_OSPF6_VERTEX, v); XFREE(MTYPE_OSPF6_VERTEX, v);
} }

2
ospf6d/ospf6_top.c
View File

@ -172,7 +172,7 @@ void ospf6_delete(struct ospf6 *o)
ospf6_area_delete(oa); ospf6_area_delete(oa);
list_delete(o->area_list); list_delete_and_null(&o->area_list);
ospf6_lsdb_delete(o->lsdb); ospf6_lsdb_delete(o->lsdb);
ospf6_lsdb_delete(o->lsdb_self); ospf6_lsdb_delete(o->lsdb_self);

2
ospfd/ospf_apiserver.c
View File

@ -180,7 +180,7 @@ void ospf_apiserver_term(void)
/* Free client list itself */ /* Free client list itself */
if (apiserver_list) if (apiserver_list)
list_delete(apiserver_list); list_delete_and_null(&apiserver_list);
/* Free wildcard list */ /* Free wildcard list */
/* XXX */ /* XXX */

4
ospfd/ospf_ase.c
View File

@ -98,7 +98,7 @@ struct ospf_route *ospf_find_asbr_route(struct ospf *ospf,
} }
if (chosen != rn->info) if (chosen != rn->info)
list_delete(chosen); list_delete_and_null(&chosen);
return best; return best;
} }
@ -761,7 +761,7 @@ void ospf_ase_external_lsas_finish(struct route_table *rt)
if ((lst = rn->info) != NULL) { if ((lst = rn->info) != NULL) {
for (ALL_LIST_ELEMENTS(lst, node, nnode, lsa)) for (ALL_LIST_ELEMENTS(lst, node, nnode, lsa))
ospf_lsa_unlock(&lsa); /* external_lsas lst */ ospf_lsa_unlock(&lsa); /* external_lsas lst */
list_delete(lst); list_delete_and_null(&lst);
} }
route_table_finish(rt); route_table_finish(rt);

2
ospfd/ospf_interface.c
View File

@ -509,7 +509,7 @@ static struct ospf_if_params *ospf_new_if_params(void)
void ospf_del_if_params(struct ospf_if_params *oip) void ospf_del_if_params(struct ospf_if_params *oip)
{ {
list_delete(oip->auth_crypt); list_delete_and_null(&oip->auth_crypt);
bfd_info_free(&(oip->bfd_info)); bfd_info_free(&(oip->bfd_info));
XFREE(MTYPE_OSPF_IF_PARAMS, oip); XFREE(MTYPE_OSPF_IF_PARAMS, oip);
} }

8
ospfd/ospf_ism.c
View File

@ -104,7 +104,7 @@ static struct ospf_neighbor *ospf_elect_dr(struct ospf_interface *oi,
else else
DR(oi).s_addr = 0; DR(oi).s_addr = 0;
list_delete(dr_list); list_delete_and_null(&dr_list);
return dr; return dr;
} }
@ -144,8 +144,8 @@ static struct ospf_neighbor *ospf_elect_bdr(struct ospf_interface *oi,
else else
BDR(oi).s_addr = 0; BDR(oi).s_addr = 0;
list_delete(bdr_list); list_delete_and_null(&bdr_list);
list_delete(no_dr_list); list_delete_and_null(&no_dr_list);
return bdr; return bdr;
} }
@ -232,7 +232,7 @@ static int ospf_dr_election(struct ospf_interface *oi)
zlog_debug("DR-Election[2nd]: DR %s", inet_ntoa(DR(oi))); zlog_debug("DR-Election[2nd]: DR %s", inet_ntoa(DR(oi)));
} }
list_delete(el_list); list_delete_and_null(&el_list);
/* if DR or BDR changes, cause AdjOK? neighbor event. */ /* if DR or BDR changes, cause AdjOK? neighbor event. */
if (!IPV4_ADDR_SAME(&old_dr, &DR(oi)) if (!IPV4_ADDR_SAME(&old_dr, &DR(oi))

2
ospfd/ospf_lsa.c
View File

@ -3707,7 +3707,7 @@ int ospf_lsa_refresh_walker(struct thread *t)
&lsa); /* lsa_refresh_queue & temp for lsa_to_refresh*/ &lsa); /* lsa_refresh_queue & temp for lsa_to_refresh*/
} }
list_delete(lsa_to_refresh); list_delete_and_null(&lsa_to_refresh);
if (IS_DEBUG_OSPF(lsa, LSA_REFRESH)) if (IS_DEBUG_OSPF(lsa, LSA_REFRESH))
zlog_debug("LSA[Refresh]: ospf_lsa_refresh_walker(): end"); zlog_debug("LSA[Refresh]: ospf_lsa_refresh_walker(): end");

24
ospfd/ospf_opaque.c
View File

@ -113,7 +113,7 @@ void ospf_opaque_term(void)
int ospf_opaque_type9_lsa_init(struct ospf_interface *oi) int ospf_opaque_type9_lsa_init(struct ospf_interface *oi)
{ {
if (oi->opaque_lsa_self != NULL) if (oi->opaque_lsa_self != NULL)
list_delete(oi->opaque_lsa_self); list_delete_and_null(&oi->opaque_lsa_self);
oi->opaque_lsa_self = list_new(); oi->opaque_lsa_self = list_new();
oi->opaque_lsa_self->del = free_opaque_info_per_type; oi->opaque_lsa_self->del = free_opaque_info_per_type;
@ -125,7 +125,7 @@ void ospf_opaque_type9_lsa_term(struct ospf_interface *oi)
{ {
OSPF_TIMER_OFF(oi->t_opaque_lsa_self); OSPF_TIMER_OFF(oi->t_opaque_lsa_self);
if (oi->opaque_lsa_self != NULL) if (oi->opaque_lsa_self != NULL)
list_delete(oi->opaque_lsa_self); list_delete_and_null(&oi->opaque_lsa_self);
oi->opaque_lsa_self = NULL; oi->opaque_lsa_self = NULL;
return; return;
} }
@ -133,7 +133,7 @@ void ospf_opaque_type9_lsa_term(struct ospf_interface *oi)
int ospf_opaque_type10_lsa_init(struct ospf_area *area) int ospf_opaque_type10_lsa_init(struct ospf_area *area)
{ {
if (area->opaque_lsa_self != NULL) if (area->opaque_lsa_self != NULL)
list_delete(area->opaque_lsa_self); list_delete_and_null(&area->opaque_lsa_self);
area->opaque_lsa_self = list_new(); area->opaque_lsa_self = list_new();
area->opaque_lsa_self->del = free_opaque_info_per_type; area->opaque_lsa_self->del = free_opaque_info_per_type;
@ -154,15 +154,14 @@ void ospf_opaque_type10_lsa_term(struct ospf_area *area)
OSPF_TIMER_OFF(area->t_opaque_lsa_self); OSPF_TIMER_OFF(area->t_opaque_lsa_self);
if (area->opaque_lsa_self != NULL) if (area->opaque_lsa_self != NULL)
list_delete(area->opaque_lsa_self); list_delete_and_null(&area->opaque_lsa_self);
area->opaque_lsa_self = NULL;
return; return;
} }
int ospf_opaque_type11_lsa_init(struct ospf *top) int ospf_opaque_type11_lsa_init(struct ospf *top)
{ {
if (top->opaque_lsa_self != NULL) if (top->opaque_lsa_self != NULL)
list_delete(top->opaque_lsa_self); list_delete_and_null(&top->opaque_lsa_self);
top->opaque_lsa_self = list_new(); top->opaque_lsa_self = list_new();
top->opaque_lsa_self->del = free_opaque_info_per_type; top->opaque_lsa_self->del = free_opaque_info_per_type;
@ -183,8 +182,7 @@ void ospf_opaque_type11_lsa_term(struct ospf *top)
OSPF_TIMER_OFF(top->t_opaque_lsa_self); OSPF_TIMER_OFF(top->t_opaque_lsa_self);
if (top->opaque_lsa_self != NULL) if (top->opaque_lsa_self != NULL)
list_delete(top->opaque_lsa_self); list_delete_and_null(&top->opaque_lsa_self);
top->opaque_lsa_self = NULL;
return; return;
} }
@ -287,16 +285,16 @@ static void ospf_opaque_funclist_term(void)
struct list *funclist; struct list *funclist;
funclist = ospf_opaque_wildcard_funclist; funclist = ospf_opaque_wildcard_funclist;
list_delete(funclist); list_delete_and_null(&funclist);
funclist = ospf_opaque_type9_funclist; funclist = ospf_opaque_type9_funclist;
list_delete(funclist); list_delete_and_null(&funclist);
funclist = ospf_opaque_type10_funclist; funclist = ospf_opaque_type10_funclist;
list_delete(funclist); list_delete_and_null(&funclist);
funclist = ospf_opaque_type11_funclist; funclist = ospf_opaque_type11_funclist;
list_delete(funclist); list_delete_and_null(&funclist);
return; return;
} }
@ -616,7 +614,7 @@ static void free_opaque_info_per_type(void *val)
} }
OSPF_TIMER_OFF(oipt->t_opaque_lsa_self); OSPF_TIMER_OFF(oipt->t_opaque_lsa_self);
list_delete(oipt->id_list); list_delete_and_null(&oipt->id_list);
XFREE(MTYPE_OPAQUE_INFO_PER_TYPE, oipt); XFREE(MTYPE_OPAQUE_INFO_PER_TYPE, oipt);
return; return;
} }

17
ospfd/ospf_packet.c
View File

@ -519,7 +519,7 @@ int ospf_ls_upd_timer(struct thread *thread)
if (listcount(update) > 0) if (listcount(update) > 0)
ospf_ls_upd_send(nbr, update, OSPF_SEND_PACKET_DIRECT); ospf_ls_upd_send(nbr, update, OSPF_SEND_PACKET_DIRECT);
list_delete(update); list_delete_and_null(&update);
} }
/* Set LS Update retransmission timer. */ /* Set LS Update retransmission timer. */
@ -1572,7 +1572,7 @@ static void ospf_ls_req(struct ip *iph, struct ospf_header *ospfh,
/* Verify LSA type. */ /* Verify LSA type. */
if (ls_type < OSPF_MIN_LSA || ls_type >= OSPF_MAX_LSA) { if (ls_type < OSPF_MIN_LSA || ls_type >= OSPF_MAX_LSA) {
OSPF_NSM_EVENT_SCHEDULE(nbr, NSM_BadLSReq); OSPF_NSM_EVENT_SCHEDULE(nbr, NSM_BadLSReq);
list_delete(ls_upd); list_delete_and_null(&ls_upd);
return; return;
} }
@ -1581,7 +1581,7 @@ static void ospf_ls_req(struct ip *iph, struct ospf_header *ospfh,
adv_router); adv_router);
if (find == NULL) { if (find == NULL) {
OSPF_NSM_EVENT_SCHEDULE(nbr, NSM_BadLSReq); OSPF_NSM_EVENT_SCHEDULE(nbr, NSM_BadLSReq);
list_delete(ls_upd); list_delete_and_null(&ls_upd);
return; return;
} }
@ -1615,7 +1615,7 @@ static void ospf_ls_req(struct ip *iph, struct ospf_header *ospfh,
ospf_ls_upd_send(nbr, ls_upd, ospf_ls_upd_send(nbr, ls_upd,
OSPF_SEND_PACKET_INDIRECT); OSPF_SEND_PACKET_INDIRECT);
list_delete(ls_upd); list_delete_and_null(&ls_upd);
} else } else
list_free(ls_upd); list_free(ls_upd);
} }
@ -1758,7 +1758,7 @@ static void ospf_upd_list_clean(struct list *lsas)
for (ALL_LIST_ELEMENTS(lsas, node, nnode, lsa)) for (ALL_LIST_ELEMENTS(lsas, node, nnode, lsa))
ospf_lsa_discard(lsa); ospf_lsa_discard(lsa);
list_delete(lsas); list_delete_and_null(&lsas);
} }
/* OSPF Link State Update message read -- RFC2328 Section 13. */ /* OSPF Link State Update message read -- RFC2328 Section 13. */
@ -2159,7 +2159,7 @@ static void ospf_ls_upd(struct ospf *ospf, struct ip *iph,
#undef DISCARD_LSA #undef DISCARD_LSA
assert(listcount(lsas) == 0); assert(listcount(lsas) == 0);
list_delete(lsas); list_delete_and_null(&lsas);
} }
/* OSPF Link State Acknowledgment message read -- RFC2328 Section 13.7. */ /* OSPF Link State Acknowledgment message read -- RFC2328 Section 13.7. */
@ -3774,7 +3774,7 @@ void ospf_ls_upd_send_lsa(struct ospf_neighbor *nbr, struct ospf_lsa *lsa,
listnode_add(update, lsa); listnode_add(update, lsa);
ospf_ls_upd_send(nbr, update, flag); ospf_ls_upd_send(nbr, update, flag);
list_delete(update); list_delete_and_null(&update);
} }
/* Determine size for packet. Must be at least big enough to accomodate next /* Determine size for packet. Must be at least big enough to accomodate next
@ -3918,8 +3918,7 @@ static int ospf_ls_upd_send_queue_event(struct thread *thread)
/* list might not be empty. */ /* list might not be empty. */
if (listcount(update) == 0) { if (listcount(update) == 0) {
list_delete(rn->info); list_delete_and_null((struct list **)&rn->info);
rn->info = NULL;
route_unlock_node(rn); route_unlock_node(rn);
} else } else
again = 1; again = 1;

6
ospfd/ospf_ri.c
View File

@ -188,11 +188,9 @@ static int ospf_router_info_unregister()
void ospf_router_info_term(void) void ospf_router_info_term(void)
{ {
list_delete(OspfRI.pce_info.pce_domain); list_delete_and_null(&OspfRI.pce_info.pce_domain);
list_delete(OspfRI.pce_info.pce_neighbor); list_delete_and_null(&OspfRI.pce_info.pce_neighbor);
OspfRI.pce_info.pce_domain = NULL;
OspfRI.pce_info.pce_neighbor = NULL;
OspfRI.enabled = false; OspfRI.enabled = false;
ospf_router_info_unregister(); ospf_router_info_unregister();

4
ospfd/ospf_route.c
View File

@ -54,7 +54,7 @@ struct ospf_route *ospf_route_new()
void ospf_route_free(struct ospf_route * or) void ospf_route_free(struct ospf_route * or)
{ {
if (or->paths) if (or->paths)
list_delete(or->paths); list_delete_and_null(&or->paths);
XFREE(MTYPE_OSPF_ROUTE, or); XFREE(MTYPE_OSPF_ROUTE, or);
} }
@ -902,7 +902,7 @@ void ospf_prune_unreachable_routers(struct route_table *rtrs)
zlog_debug("Pruning router node %s", zlog_debug("Pruning router node %s",
inet_ntoa(rn->p.u.prefix4)); inet_ntoa(rn->p.u.prefix4));
list_delete(paths); list_delete_and_null(&paths);
rn->info = NULL; rn->info = NULL;
route_unlock_node(rn); route_unlock_node(rn);
} }

8
ospfd/ospf_spf.c
View File

@ -210,12 +210,10 @@ static void ospf_vertex_free(void *data)
// assert (listcount (v->parents) == 0); // assert (listcount (v->parents) == 0);
if (v->children) if (v->children)
list_delete(v->children); list_delete_and_null(&v->children);
v->children = NULL;
if (v->parents) if (v->parents)
list_delete(v->parents); list_delete_and_null(&v->parents);
v->parents = NULL;
v->lsa = NULL; v->lsa = NULL;
@ -1089,7 +1087,7 @@ void ospf_rtrs_free(struct route_table *rtrs)
for (ALL_LIST_ELEMENTS(or_list, node, nnode, or)) for (ALL_LIST_ELEMENTS(or_list, node, nnode, or))
ospf_route_free(or); ospf_route_free(or);
list_delete(or_list); list_delete_and_null(&or_list);
/* Unlock the node. */ /* Unlock the node. */
rn->info = NULL; rn->info = NULL;

3
ospfd/ospf_te.c
View File

@ -166,8 +166,7 @@ static int ospf_mpls_te_unregister()
void ospf_mpls_te_term(void) void ospf_mpls_te_term(void)
{ {
list_delete(OspfMplsTE.iflist); list_delete_and_null(&OspfMplsTE.iflist);
OspfMplsTE.iflist = NULL;
ospf_delete_opaque_functab(OSPF_OPAQUE_AREA_LSA, ospf_delete_opaque_functab(OSPF_OPAQUE_AREA_LSA,
OPAQUE_TYPE_TRAFFIC_ENGINEERING_LSA); OPAQUE_TYPE_TRAFFIC_ENGINEERING_LSA);

12
ospfd/ospfd.c
View File

@ -620,7 +620,7 @@ static void ospf_finish_final(struct ospf *ospf)
for (ALL_LIST_ELEMENTS(ospf->vlinks, node, nnode, vl_data)) for (ALL_LIST_ELEMENTS(ospf->vlinks, node, nnode, vl_data))
ospf_vl_delete(ospf, vl_data); ospf_vl_delete(ospf, vl_data);
list_delete(ospf->vlinks); list_delete_and_null(&ospf->vlinks);
/* Remove any ospf interface config params */ /* Remove any ospf interface config params */
for (ALL_LIST_ELEMENTS_RO(vrf_iflist(ospf->vrf_id), node, ifp)) { for (ALL_LIST_ELEMENTS_RO(vrf_iflist(ospf->vrf_id), node, ifp)) {
@ -734,9 +734,9 @@ static void ospf_finish_final(struct ospf *ospf)
ospf_ase_external_lsas_finish(ospf->external_lsas); ospf_ase_external_lsas_finish(ospf->external_lsas);
} }
list_delete(ospf->areas); list_delete_and_null(&ospf->areas);
list_delete(ospf->oi_write_q); list_delete_and_null(&ospf->oi_write_q);
list_delete(ospf->oiflist); list_delete_and_null(&ospf->oiflist);
for (i = ZEBRA_ROUTE_SYSTEM; i <= ZEBRA_ROUTE_MAX; i++) { for (i = ZEBRA_ROUTE_SYSTEM; i <= ZEBRA_ROUTE_MAX; i++) {
struct list *ext_list; struct list *ext_list;
@ -852,7 +852,7 @@ static void ospf_area_free(struct ospf_area *area)
ospf_lsa_unlock(&area->router_lsa_self); ospf_lsa_unlock(&area->router_lsa_self);
route_table_finish(area->ranges); route_table_finish(area->ranges);
list_delete(area->oiflist); list_delete_and_null(&area->oiflist);
if (EXPORT_NAME(area)) if (EXPORT_NAME(area))
free(EXPORT_NAME(area)); free(EXPORT_NAME(area));
@ -1276,7 +1276,7 @@ void ospf_ls_upd_queue_empty(struct ospf_interface *oi)
if ((lst = (struct list *)rn->info)) { if ((lst = (struct list *)rn->info)) {
for (ALL_LIST_ELEMENTS(lst, node, nnode, lsa)) for (ALL_LIST_ELEMENTS(lst, node, nnode, lsa))
ospf_lsa_unlock(&lsa); /* oi->ls_upd_queue */ ospf_lsa_unlock(&lsa); /* oi->ls_upd_queue */
list_delete(lst); list_delete_and_null(&lst);
rn->info = NULL; rn->info = NULL;
} }

6
pimd/pim_hello.c
View File

@ -125,9 +125,9 @@ static void tlv_trace_list(const char *label, const char *tlv_name,
} }
} }
#define FREE_ADDR_LIST \ #define FREE_ADDR_LIST \
if (hello_option_addr_list) { \ if (hello_option_addr_list) { \
list_delete(hello_option_addr_list); \ list_delete_and_null(&hello_option_addr_list); \
} }
#define FREE_ADDR_LIST_THEN_RETURN(code) \ #define FREE_ADDR_LIST_THEN_RETURN(code) \

20
pimd/pim_iface.c
View File

@ -71,19 +71,19 @@ static void *if_list_clean(struct pim_interface *pim_ifp)
struct pim_ifchannel *ch; struct pim_ifchannel *ch;
if (pim_ifp->igmp_join_list) if (pim_ifp->igmp_join_list)
list_delete(pim_ifp->igmp_join_list); list_delete_and_null(&pim_ifp->igmp_join_list);
if (pim_ifp->igmp_socket_list) if (pim_ifp->igmp_socket_list)
list_delete(pim_ifp->igmp_socket_list); list_delete_and_null(&pim_ifp->igmp_socket_list);
if (pim_ifp->pim_neighbor_list) if (pim_ifp->pim_neighbor_list)
list_delete(pim_ifp->pim_neighbor_list); list_delete_and_null(&pim_ifp->pim_neighbor_list);
if (pim_ifp->upstream_switch_list) if (pim_ifp->upstream_switch_list)
list_delete(pim_ifp->upstream_switch_list); list_delete_and_null(&pim_ifp->upstream_switch_list);
if (pim_ifp->sec_addr_list) if (pim_ifp->sec_addr_list)
list_delete(pim_ifp->sec_addr_list); list_delete_and_null(&pim_ifp->sec_addr_list);
while ((ch = RB_ROOT(pim_ifchannel_rb, while ((ch = RB_ROOT(pim_ifchannel_rb,
&pim_ifp->ifchannel_rb)) != NULL) &pim_ifp->ifchannel_rb)) != NULL)
@ -241,10 +241,10 @@ void pim_if_delete(struct interface *ifp)
pim_if_del_vif(ifp); pim_if_del_vif(ifp);
list_delete(pim_ifp->igmp_socket_list); list_delete_and_null(&pim_ifp->igmp_socket_list);
list_delete(pim_ifp->pim_neighbor_list); list_delete_and_null(&pim_ifp->pim_neighbor_list);
list_delete(pim_ifp->upstream_switch_list); list_delete_and_null(&pim_ifp->upstream_switch_list);
list_delete(pim_ifp->sec_addr_list); list_delete_and_null(&pim_ifp->sec_addr_list);
if (pim_ifp->boundary_oil_plist) if (pim_ifp->boundary_oil_plist)
XFREE(MTYPE_PIM_INTERFACE, pim_ifp->boundary_oil_plist); XFREE(MTYPE_PIM_INTERFACE, pim_ifp->boundary_oil_plist);
@ -1373,7 +1373,7 @@ int pim_if_igmp_join_del(struct interface *ifp, struct in_addr group_addr,
listnode_delete(pim_ifp->igmp_join_list, ij); listnode_delete(pim_ifp->igmp_join_list, ij);
igmp_join_free(ij); igmp_join_free(ij);
if (listcount(pim_ifp->igmp_join_list) < 1) { if (listcount(pim_ifp->igmp_join_list) < 1) {
list_delete(pim_ifp->igmp_join_list); list_delete_and_null(&pim_ifp->igmp_join_list);
pim_ifp->igmp_join_list = 0; pim_ifp->igmp_join_list = 0;
} }

4
pimd/pim_ifchannel.c
View File

@ -169,7 +169,7 @@ void pim_ifchannel_delete(struct pim_ifchannel *ch)
pim_ifchannel_remove_children(ch); pim_ifchannel_remove_children(ch);
if (ch->sources) if (ch->sources)
list_delete(ch->sources); list_delete_and_null(&ch->sources);
listnode_delete(ch->upstream->ifchannels, ch); listnode_delete(ch->upstream->ifchannels, ch);
@ -571,7 +571,7 @@ struct pim_ifchannel *pim_ifchannel_add(struct interface *ifp,
pim_ifchannel_remove_children(ch); pim_ifchannel_remove_children(ch);
if (ch->sources) if (ch->sources)
list_delete(ch->sources); list_delete_and_null(&ch->sources);
THREAD_OFF(ch->t_ifjoin_expiry_timer); THREAD_OFF(ch->t_ifjoin_expiry_timer);
THREAD_OFF(ch->t_ifjoin_prune_pending_timer); THREAD_OFF(ch->t_ifjoin_prune_pending_timer);

4
pimd/pim_igmp.c
View File

@ -696,7 +696,7 @@ void igmp_startup_mode_on(struct igmp_sock *igmp)
static void igmp_group_free(struct igmp_group *group) static void igmp_group_free(struct igmp_group *group)
{ {
list_delete(group->group_source_list); list_delete_and_null(&group->group_source_list);
XFREE(MTYPE_PIM_IGMP_GROUP, group); XFREE(MTYPE_PIM_IGMP_GROUP, group);
} }
@ -748,7 +748,7 @@ void igmp_sock_free(struct igmp_sock *igmp)
zassert(igmp->igmp_group_list); zassert(igmp->igmp_group_list);
zassert(!listcount(igmp->igmp_group_list)); zassert(!listcount(igmp->igmp_group_list));
list_delete(igmp->igmp_group_list); list_delete_and_null(&igmp->igmp_group_list);
hash_free(igmp->igmp_group_hash); hash_free(igmp->igmp_group_hash);
XFREE(MTYPE_PIM_IGMP_SOCKET, igmp); XFREE(MTYPE_PIM_IGMP_SOCKET, igmp);

2
pimd/pim_instance.c
View File

@ -48,7 +48,7 @@ static void pim_instance_terminate(struct pim_instance *pim)
} }
if (pim->static_routes) if (pim->static_routes)
list_delete(pim->static_routes); list_delete_and_null(&pim->static_routes);
pim_rp_free(pim); pim_rp_free(pim);

8
pimd/pim_jp_agg.c
View File

@ -32,7 +32,7 @@
void pim_jp_agg_group_list_free(struct pim_jp_agg_group *jag) void pim_jp_agg_group_list_free(struct pim_jp_agg_group *jag)
{ {
list_delete(jag->sources); list_delete_and_null(&jag->sources);
XFREE(MTYPE_PIM_JP_AGG_GROUP, jag); XFREE(MTYPE_PIM_JP_AGG_GROUP, jag);
} }
@ -108,8 +108,7 @@ void pim_jp_agg_clear_group(struct list *group)
js->up = NULL; js->up = NULL;
XFREE(MTYPE_PIM_JP_AGG_SOURCE, js); XFREE(MTYPE_PIM_JP_AGG_SOURCE, js);
} }
list_delete(jag->sources); list_delete_and_null(&jag->sources);
jag->sources = NULL;
listnode_delete(group, jag); listnode_delete(group, jag);
XFREE(MTYPE_PIM_JP_AGG_GROUP, jag); XFREE(MTYPE_PIM_JP_AGG_GROUP, jag);
} }
@ -169,8 +168,7 @@ void pim_jp_agg_remove_group(struct list *group, struct pim_upstream *up)
} }
if (jag->sources->count == 0) { if (jag->sources->count == 0) {
list_delete(jag->sources); list_delete_and_null(&jag->sources);
jag->sources = NULL;
listnode_delete(group, jag); listnode_delete(group, jag);
XFREE(MTYPE_PIM_JP_AGG_GROUP, jag); XFREE(MTYPE_PIM_JP_AGG_GROUP, jag);
} }

8
pimd/pim_msdp.c
View File

@ -1261,7 +1261,7 @@ static void pim_msdp_mg_free(struct pim_instance *pim, struct pim_msdp_mg *mg)
XFREE(MTYPE_PIM_MSDP_MG_NAME, mg->mesh_group_name); XFREE(MTYPE_PIM_MSDP_MG_NAME, mg->mesh_group_name);
if (mg->mbr_list) if (mg->mbr_list)
list_delete(mg->mbr_list); list_delete_and_null(&mg->mbr_list);
XFREE(MTYPE_PIM_MSDP_MG, mg); XFREE(MTYPE_PIM_MSDP_MG, mg);
pim->msdp.mg = NULL; pim->msdp.mg = NULL;
@ -1619,8 +1619,7 @@ void pim_msdp_exit(struct pim_instance *pim)
} }
if (pim->msdp.peer_list) { if (pim->msdp.peer_list) {
list_delete(pim->msdp.peer_list); list_delete_and_null(&pim->msdp.peer_list);
pim->msdp.peer_list = NULL;
} }
if (pim->msdp.sa_hash) { if (pim->msdp.sa_hash) {
@ -1629,7 +1628,6 @@ void pim_msdp_exit(struct pim_instance *pim)
} }
if (pim->msdp.sa_list) { if (pim->msdp.sa_list) {
list_delete(pim->msdp.sa_list); list_delete_and_null(&pim->msdp.sa_list);
pim->msdp.sa_list = NULL;
} }
} }

5
pimd/pim_neighbor.c
View File

@ -401,8 +401,7 @@ static void delete_prefix_list(struct pim_neighbor *neigh)
} }
#endif #endif
list_delete(neigh->prefix_list); list_delete_and_null(&neigh->prefix_list);
neigh->prefix_list = 0;
} }
} }
@ -412,7 +411,7 @@ void pim_neighbor_free(struct pim_neighbor *neigh)
delete_prefix_list(neigh); delete_prefix_list(neigh);
list_delete(neigh->upstream_jp_agg); list_delete_and_null(&neigh->upstream_jp_agg);
THREAD_OFF(neigh->jp_timer); THREAD_OFF(neigh->jp_timer);
XFREE(MTYPE_PIM_NEIGHBOR, neigh); XFREE(MTYPE_PIM_NEIGHBOR, neigh);

2
pimd/pim_nht.c
View File

@ -236,7 +236,7 @@ void pim_delete_tracked_nexthop(struct pim_instance *pim, struct prefix *addr,
pim_sendmsg_zebra_rnh(pim, zclient, pnc, pim_sendmsg_zebra_rnh(pim, zclient, pnc,
ZEBRA_NEXTHOP_UNREGISTER); ZEBRA_NEXTHOP_UNREGISTER);
list_delete(pnc->rp_list); list_delete_and_null(&pnc->rp_list);
hash_free(pnc->upstream_hash); hash_free(pnc->upstream_hash);
hash_release(pim->rpf_hash, pnc); hash_release(pim->rpf_hash, pnc);

3
pimd/pim_oil.c
View File

@ -123,8 +123,7 @@ void pim_oil_init(struct pim_instance *pim)
void pim_oil_terminate(struct pim_instance *pim) void pim_oil_terminate(struct pim_instance *pim)
{ {
if (pim->channel_oil_list) if (pim->channel_oil_list)
list_delete(pim->channel_oil_list); list_delete_and_null(&pim->channel_oil_list);
pim->channel_oil_list = NULL;
if (pim->channel_oil_hash) if (pim->channel_oil_hash)
hash_free(pim->channel_oil_hash); hash_free(pim->channel_oil_hash);

14
pimd/pim_rp.c
View File

@ -51,8 +51,7 @@ void pim_rp_list_hash_clean(void *data)
{ {
struct pim_nexthop_cache *pnc = (struct pim_nexthop_cache *)data; struct pim_nexthop_cache *pnc = (struct pim_nexthop_cache *)data;
list_delete(pnc->rp_list); list_delete_and_null(&pnc->rp_list);
pnc->rp_list = NULL;
hash_clean(pnc->upstream_hash, NULL); hash_clean(pnc->upstream_hash, NULL);
hash_free(pnc->upstream_hash); hash_free(pnc->upstream_hash);
@ -110,7 +109,7 @@ void pim_rp_init(struct pim_instance *pim)
pim->rp_table = route_table_init(); pim->rp_table = route_table_init();
if (!pim->rp_table) { if (!pim->rp_table) {
zlog_err("Unable to alloc rp_table"); zlog_err("Unable to alloc rp_table");
list_delete(pim->rp_list); list_delete_and_null(&pim->rp_list);
return; return;
} }
@ -119,13 +118,13 @@ void pim_rp_init(struct pim_instance *pim)
if (!rp_info) { if (!rp_info) {
zlog_err("Unable to alloc rp_info"); zlog_err("Unable to alloc rp_info");
route_table_finish(pim->rp_table); route_table_finish(pim->rp_table);
list_delete(pim->rp_list); list_delete_and_null(&pim->rp_list);
return; return;
} }
if (!str2prefix("224.0.0.0/4", &rp_info->group)) { if (!str2prefix("224.0.0.0/4", &rp_info->group)) {
zlog_err("Unable to convert 224.0.0.0/4 to prefix"); zlog_err("Unable to convert 224.0.0.0/4 to prefix");
list_delete(pim->rp_list); list_delete_and_null(&pim->rp_list);
route_table_finish(pim->rp_table); route_table_finish(pim->rp_table);
XFREE(MTYPE_PIM_RP, rp_info); XFREE(MTYPE_PIM_RP, rp_info);
return; return;
@ -140,7 +139,7 @@ void pim_rp_init(struct pim_instance *pim)
rn = route_node_get(pim->rp_table, &rp_info->group); rn = route_node_get(pim->rp_table, &rp_info->group);
if (!rn) { if (!rn) {
zlog_err("Failure to get route node for pim->rp_table"); zlog_err("Failure to get route node for pim->rp_table");
list_delete(pim->rp_list); list_delete_and_null(&pim->rp_list);
route_table_finish(pim->rp_table); route_table_finish(pim->rp_table);
XFREE(MTYPE_PIM_RP, rp_info); XFREE(MTYPE_PIM_RP, rp_info);
return; return;
@ -155,8 +154,7 @@ void pim_rp_init(struct pim_instance *pim)
void pim_rp_free(struct pim_instance *pim) void pim_rp_free(struct pim_instance *pim)
{ {
if (pim->rp_list) if (pim->rp_list)
list_delete(pim->rp_list); list_delete_and_null(&pim->rp_list);
pim->rp_list = NULL;
} }
/* /*

6
pimd/pim_ssmpingd.c
View File

@ -50,10 +50,8 @@ void pim_ssmpingd_init(struct pim_instance *pim)
void pim_ssmpingd_destroy(struct pim_instance *pim) void pim_ssmpingd_destroy(struct pim_instance *pim)
{ {
if (pim->ssmpingd_list) { if (pim->ssmpingd_list)
list_delete(pim->ssmpingd_list); list_delete_and_null(&pim->ssmpingd_list);
pim->ssmpingd_list = 0;
}
} }
static struct ssmpingd_sock *ssmpingd_find(struct pim_instance *pim, static struct ssmpingd_sock *ssmpingd_find(struct pim_instance *pim,

12
pimd/pim_tlv.c
View File

@ -654,12 +654,12 @@ int pim_parse_addr_source(struct prefix_sg *sg, uint8_t *flags,
return addr - buf; return addr - buf;
} }
#define FREE_ADDR_LIST(hello_option_addr_list) \ #define FREE_ADDR_LIST(hello_option_addr_list) \
{ \ { \
if (hello_option_addr_list) { \ if (hello_option_addr_list) { \
list_delete(hello_option_addr_list); \ list_delete_and_null(&hello_option_addr_list); \
hello_option_addr_list = 0; \ hello_option_addr_list = 0; \
} \ } \
} }
int pim_tlv_parse_addr_list(const char *ifname, struct in_addr src_addr, int pim_tlv_parse_addr_list(const char *ifname, struct in_addr src_addr,

17
pimd/pim_upstream.c
View File

@ -82,8 +82,7 @@ static void pim_upstream_remove_children(struct pim_instance *pim,
if (child) if (child)
child->parent = NULL; child->parent = NULL;
} }
list_delete(up->sources); list_delete_and_null(&up->sources);
up->sources = NULL;
} }
/* /*
@ -203,13 +202,12 @@ struct pim_upstream *pim_upstream_del(struct pim_instance *pim,
pim_upstream_remove_children(pim, up); pim_upstream_remove_children(pim, up);
if (up->sources) if (up->sources)
list_delete(up->sources); list_delete_and_null(&up->sources);
up->sources = NULL;
pim_mroute_del(up->channel_oil, __PRETTY_FUNCTION__); pim_mroute_del(up->channel_oil, __PRETTY_FUNCTION__);
upstream_channel_oil_detach(up); upstream_channel_oil_detach(up);
list_delete(up->ifchannels); list_delete_and_null(&up->ifchannels);
up->ifchannels = NULL;
/* /*
notice that listnode_delete() can't be moved notice that listnode_delete() can't be moved
@ -696,9 +694,9 @@ static struct pim_upstream *pim_upstream_new(struct pim_instance *pim,
pim_upstream_remove_children(pim, up); pim_upstream_remove_children(pim, up);
if (up->sources) if (up->sources)
list_delete(up->sources); list_delete_and_null(&up->sources);
list_delete(up->ifchannels); list_delete_and_null(&up->ifchannels);
hash_release(pim->upstream_hash, up); hash_release(pim->upstream_hash, up);
XFREE(MTYPE_PIM_UPSTREAM, up); XFREE(MTYPE_PIM_UPSTREAM, up);
@ -1548,8 +1546,7 @@ unsigned int pim_upstream_hash_key(void *arg)
void pim_upstream_terminate(struct pim_instance *pim) void pim_upstream_terminate(struct pim_instance *pim)
{ {
if (pim->upstream_list) if (pim->upstream_list)
list_delete(pim->upstream_list); list_delete_and_null(&pim->upstream_list);
pim->upstream_list = NULL;
if (pim->upstream_hash) if (pim->upstream_hash)
hash_free(pim->upstream_hash); hash_free(pim->upstream_hash);

2
ripd/rip_offset.c
View File

@ -363,7 +363,7 @@ void rip_offset_init()
void rip_offset_clean() void rip_offset_clean()
{ {
list_delete(rip_offset_list_master); list_delete_and_null(&rip_offset_list_master);
rip_offset_list_master = list_new(); rip_offset_list_master = list_new();
rip_offset_list_master->cmp = (int (*)(void *, void *))offset_list_cmp; rip_offset_list_master->cmp = (int (*)(void *, void *))offset_list_cmp;

2
ripd/ripd.c
View File

@ -3809,7 +3809,7 @@ void rip_clean(void)
RIP_TIMER_OFF(rinfo->t_garbage_collect); RIP_TIMER_OFF(rinfo->t_garbage_collect);
rip_info_free(rinfo); rip_info_free(rinfo);
} }
list_delete(list); list_delete_and_null(&list);
rp->info = NULL; rp->info = NULL;
route_unlock_node(rp); route_unlock_node(rp);
} }

2
ripngd/ripng_nexthop.c
View File

@ -72,7 +72,7 @@ struct list *ripng_rte_new(void)
void ripng_rte_free(struct list *ripng_rte_list) void ripng_rte_free(struct list *ripng_rte_list)
{ {
list_delete(ripng_rte_list); list_delete_and_null(&ripng_rte_list);
} }
/* Delete RTE */ /* Delete RTE */

2
ripngd/ripng_offset.c
View File

@ -375,7 +375,7 @@ void ripng_offset_init(void)
void ripng_offset_clean(void) void ripng_offset_clean(void)
{ {
list_delete(ripng_offset_list_master); list_delete_and_null(&ripng_offset_list_master);
ripng_offset_list_master = list_new(); ripng_offset_list_master = list_new();
ripng_offset_list_master->cmp = ripng_offset_list_master->cmp =

2
ripngd/ripngd.c
View File

@ -2829,7 +2829,7 @@ void ripng_clean()
rinfo->t_garbage_collect); rinfo->t_garbage_collect);
ripng_info_free(rinfo); ripng_info_free(rinfo);
} }
list_delete(list); list_delete_and_null(&list);
rp->info = NULL; rp->info = NULL;
route_unlock_node(rp); route_unlock_node(rp);
} }

2
tests/isisd/test_fuzz_isis_tlv.c
View File

@ -166,7 +166,7 @@ static int test(FILE *input, FILE *output)
sbuf_push(&fragment_format, 0, "%s", isis_format_tlvs(tlvs)); sbuf_push(&fragment_format, 0, "%s", isis_format_tlvs(tlvs));
isis_free_tlvs(tlvs); isis_free_tlvs(tlvs);
} }
list_delete(fragments); list_delete_and_null(&fragments);
stream_free(s); stream_free(s);
char *fragment_content = sortlines((char *)sbuf_buf(&fragment_format)); char *fragment_content = sortlines((char *)sbuf_buf(&fragment_format));

4
vtysh/vtysh_config.c
View File

@ -73,7 +73,7 @@ static int config_cmp(struct config *c1, struct config *c2)
static void config_del(struct config *config) static void config_del(struct config *config)
{ {
list_delete(config->line); list_delete_and_null(&config->line);
if (config->name) if (config->name)
XFREE(MTYPE_VTYSH_CONFIG_LINE, config->name); XFREE(MTYPE_VTYSH_CONFIG_LINE, config->name);
XFREE(MTYPE_VTYSH_CONFIG, config); XFREE(MTYPE_VTYSH_CONFIG, config);
@ -365,7 +365,7 @@ void vtysh_config_dump(FILE *fp)
for (i = 0; i < vector_active(configvec); i++) for (i = 0; i < vector_active(configvec); i++)
if ((master = vector_slot(configvec, i)) != NULL) { if ((master = vector_slot(configvec, i)) != NULL) {
list_delete(master); list_delete_and_null(&master);
vector_slot(configvec, i) = NULL; vector_slot(configvec, i) = NULL;
} }
list_delete_all_node(config_top); list_delete_all_node(config_top);

4
zebra/interface.c
View File

@ -64,7 +64,7 @@ static void zebra_if_node_destroy(route_table_delegate_t *delegate,
struct route_node *node) struct route_node *node)
{ {
if (node->info) if (node->info)
list_delete(node->info); list_delete_and_null((struct list **)&node->info);
route_node_destroy(delegate, table, node); route_node_destroy(delegate, table, node);
} }
@ -627,7 +627,7 @@ static void if_delete_connected(struct interface *ifp)
} }
/* Free chain list and respective route node. */ /* Free chain list and respective route node. */
list_delete(addr_list); list_delete_and_null(&addr_list);
rn->info = NULL; rn->info = NULL;
route_unlock_node(rn); route_unlock_node(rn);
} else if (cp.family == AF_INET6) { } else if (cp.family == AF_INET6) {

3
zebra/irdp_interface.c
View File

@ -311,8 +311,7 @@ static void irdp_if_stop(struct interface *ifp)
irdp_advert_off(ifp); irdp_advert_off(ifp);
list_delete(irdp->AdvPrefList); list_delete_and_null(&irdp->AdvPrefList);
irdp->AdvPrefList = NULL;
irdp->flags = 0; irdp->flags = 0;
} }

2
zebra/label_manager.c
View File

@ -375,5 +375,5 @@ int release_daemon_chunks(u_char proto, u_short instance)
void label_manager_close() void label_manager_close()
{ {
list_delete(lbl_mgr.lc_list); list_delete_and_null(&lbl_mgr.lc_list);
} }

2
zebra/main.c
View File

@ -145,7 +145,7 @@ static void sigint(void)
prefix_list_reset(); prefix_list_reset();
route_map_finish(); route_map_finish();
list_delete(zebrad.client_list); list_delete_and_null(&zebrad.client_list);
work_queue_free(zebrad.ribq); work_queue_free(zebrad.ribq);
if (zebrad.lsp_process_q) if (zebrad.lsp_process_q)
work_queue_free(zebrad.lsp_process_q); work_queue_free(zebrad.lsp_process_q);

4
zebra/zebra_mpls.c
View File

@ -2701,7 +2701,7 @@ void zebra_mpls_print_lsp_table(struct vty *vty, struct zebra_vrf *zvrf,
vty_out(vty, "\n"); vty_out(vty, "\n");
} }
list_delete(lsp_list); list_delete_and_null(&lsp_list);
} }
/* /*
@ -2740,7 +2740,7 @@ int zebra_mpls_write_lsp_config(struct vty *vty, struct zebra_vrf *zvrf)
} }
} }
list_delete(slsp_list); list_delete_and_null(&slsp_list);
return (zvrf->slsp_table->count ? 1 : 0); return (zvrf->slsp_table->count ? 1 : 0);
} }

2
zebra/zebra_rib.c
View File

@ -1875,7 +1875,7 @@ void meta_queue_free(struct meta_queue *mq)
unsigned i; unsigned i;
for (i = 0; i < MQ_SIZE; i++) for (i = 0; i < MQ_SIZE; i++)
list_delete(mq->subq[i]); list_delete_and_null(&mq->subq[i]);
XFREE(MTYPE_WORK_QUEUE, mq); XFREE(MTYPE_WORK_QUEUE, mq);
} }

2
zebra/zebra_vxlan.c
View File

@ -1587,7 +1587,7 @@ static int zvni_mac_del(zebra_vni_t *zvni, zebra_mac_t *mac)
{ {
zebra_mac_t *tmp_mac; zebra_mac_t *tmp_mac;
list_delete(mac->neigh_list); list_delete_and_null(&mac->neigh_list);
/* Free the VNI hash entry and allocated memory. */ /* Free the VNI hash entry and allocated memory. */
tmp_mac = hash_release(zvni->mac_table, mac); tmp_mac = hash_release(zvni->mac_table, mac);