diff options
| author | Paul Jakma <paul.jakma@sun.com> | 2006-07-26 09:37:26 +0000 |
|---|---|---|
| committer | Paul Jakma <paul.jakma@sun.com> | 2006-07-26 09:37:26 +0000 |
| commit | 1fe6ed38cd0136c514aabae01389653beab27fb9 (patch) | |
| tree | 21f10bc3f9c5afffe9f28e5dbf4e6198cfafba5b /ospfd/ospf_ase.c | |
| parent | 3fed4160cd23f1767d8980e8cba10bc3933947d5 (diff) | |
[ospfd] Allow ospf_lsa_unlock to NULL out callers' LSA pointers upon free
2006-07-26 Paul Jakma <paul.jakma@sun.com>
* ospf_lsa.{c,h}: (ospf_lsa_unlock) Change to take a double pointer
to the LSA to be 'unlocked', so that, if the LSA is freed, the
callers pointer to the LSA can be NULLed out, allowing any further
use of that pointer to provoke a crash sooner rather than later.
* ospf_*.c: (general) Adjust callers of ospf_lsa_unlock to match
previous. Try annotate 'locking' somewhat to show which 'locks'
are protecting what LSA reference, if not obvious.
* ospf_opaque.c: (ospf_opaque_lsa_install) Trivial: remove useless
goto, replace with return.
* ospf_packet.c: (ospf_make_ls_ack) Trivial: merge two list loops,
the dual-loop predated the delete-safe list-loop macro.
Diffstat (limited to 'ospfd/ospf_ase.c')
| -rw-r--r-- | ospfd/ospf_ase.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/ospfd/ospf_ase.c b/ospfd/ospf_ase.c index f4b285bb..a4812345 100644 --- a/ospfd/ospf_ase.c +++ b/ospfd/ospf_ase.c @@ -711,7 +711,7 @@ ospf_ase_register_external_lsa (struct ospf_lsa *lsa, struct ospf *top) /* We assume that if LSA is deleted from DB is is also deleted from this RT */ - listnode_add (lst, ospf_lsa_lock (lsa)); + listnode_add (lst, ospf_lsa_lock (lsa)); /* external_lsas lst */ } void @@ -730,18 +730,12 @@ ospf_ase_unregister_external_lsa (struct ospf_lsa *lsa, struct ospf *top) rn = route_node_get (top->external_lsas, (struct prefix *) &p); lst = rn->info; -#ifdef ORIGINAL_CODING - assert (lst); - listnode_delete (lst, lsa); - ospf_lsa_unlock (lsa); -#else /* ORIGINAL_CODING */ /* XXX lst can be NULL */ if (lst) { listnode_delete (lst, lsa); - ospf_lsa_unlock (lsa); + ospf_lsa_unlock (&lsa); /* external_lsas list */ } -#endif /* ORIGINAL_CODING */ } void @@ -756,7 +750,7 @@ ospf_ase_external_lsas_finish (struct route_table *rt) if ((lst = rn->info) != NULL) { for (ALL_LIST_ELEMENTS (lst, node, nnode, lsa)) - ospf_lsa_unlock (lsa); + ospf_lsa_unlock (&lsa); /* external_lsas lst */ list_delete (lst); } |