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

isisd: prevent segfault in isis_circuit_af_set

Browse Source 
before the last commit, it was possible under some
circumstances to call isis_circuit_af_set on a circuit
with a NULL area, e.g. if the circuit was deconfigured
due to a validation error. While this should not happen
now, let's add an explicit check to avoid crashing if
a regression is introduced.

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
This commit is contained in:
Emanuele Di Pascale 2020-06-10 14:29:02 +02:00
parent f6d9207dc9
commit e8cff6d14c
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
isisd/isis_circuit.c
View File

@ -1233,23 +1233,35 @@ void isis_circuit_af_set(struct isis_circuit *circuit, bool ip_router,
bool ipv6_router) bool ipv6_router)
{ {
struct isis_area *area = circuit->area; struct isis_area *area = circuit->area;
bool change = circuit->ip_router != ip_router int old_ipr = circuit->ip_router;
|| circuit->ipv6_router != ipv6_router; int old_ipv6r = circuit->ipv6_router;
area->ip_circuits += ip_router - circuit->ip_router; /* is there something to do? */
area->ipv6_circuits += ipv6_router - circuit->ipv6_router; if (old_ipr == ip_router && old_ipv6r == ipv6_router)
circuit->ip_router = ip_router;
circuit->ipv6_router = ipv6_router;
if (!change)
return; return;
circuit->ip_router = ip_router;
circuit->ipv6_router = ipv6_router;
circuit_update_nlpids(circuit); circuit_update_nlpids(circuit);
/* the area should always be there if we get here, but in the past
* there were corner cases where the area was NULL (e.g. because the
* circuit was deconfigured following a validation error). Do not
* segfault if this happens again.
*/
if (!area) {
zlog_err("%s: NULL area for circuit %u", __func__,
circuit->circuit_id);
return;
}
area->ip_circuits += ip_router - old_ipr;
area->ipv6_circuits += ipv6_router - old_ipv6r;
if (!ip_router && !ipv6_router) if (!ip_router && !ipv6_router)
isis_csm_state_change(ISIS_DISABLE, circuit, area); isis_csm_state_change(ISIS_DISABLE, circuit, area);
else else
lsp_regenerate_schedule(circuit->area, circuit->is_type, 0); lsp_regenerate_schedule(area, circuit->is_type, 0);
} }
ferr_r isis_circuit_passive_set(struct isis_circuit *circuit, bool passive) ferr_r isis_circuit_passive_set(struct isis_circuit *circuit, bool passive)