From: Renato Westphal Date: Fri, 19 Oct 2018 18:53:46 +0000 (-0300) Subject: bgpd: fix cleanup of dampening configuration X-Git-Tag: frr-7.1-dev~253^2~12 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=2ba315c80192db294786d244d7a31a7f680f0fc4;p=mirror%2Ffrr.git bgpd: fix cleanup of dampening configuration The bgp_damp_config_clean() function was deallocating some arrays without resetting the variables that represent their sizes. This was leading to some crashes because other parts of the code iterate over these arrays by looking at their corresponding sizes, which could be invalid. Fixes the following segfaults (which only happen under certain circumstances): vtysh -c "configure terminal" -c "router bgp 1" -c "bgp dampening" vtysh -c "configure terminal" -c "router bgp 1" -c "no bgp dampening" vtysh -c "configure terminal" -c "router bgp 1" -c "no bgp dampening 45" vtysh -c "" -c "clear ip bgp dampening" Signed-off-by: Renato Westphal --- diff --git a/bgpd/bgp_damp.c b/bgpd/bgp_damp.c index cff5caf52f..86cee39a62 100644 --- a/bgpd/bgp_damp.c +++ b/bgpd/bgp_damp.c @@ -448,12 +448,15 @@ static void bgp_damp_config_clean(struct bgp_damp_config *damp) { /* Free decay array */ XFREE(MTYPE_BGP_DAMP_ARRAY, damp->decay_array); + damp->decay_array_size = 0; /* Free reuse index array */ XFREE(MTYPE_BGP_DAMP_ARRAY, damp->reuse_index); + damp->reuse_index_size = 0; /* Free reuse list array. */ XFREE(MTYPE_BGP_DAMP_ARRAY, damp->reuse_list); + damp->reuse_list_size = 0; } /* Clean all the bgp_damp_info stored in reuse_list. */