proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-05 13:21:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7394 from donaldsharp/isis_uninited

Browse Source 
isisd: Fix usage of uninited memory
This commit is contained in:
Olivier Dugeon 2020-10-28 09:11:53 +01:00 committed by GitHub
commit 1af7c1af06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
isisd/isis_tlvs.c
View File

@ -4414,11 +4414,19 @@ static void tlvs_area_addresses_to_adj(struct isis_tlvs *tlvs,
bool *changed) bool *changed)
{ {
if (adj->area_address_count != tlvs->area_addresses.count) { if (adj->area_address_count != tlvs->area_addresses.count) {
uint32_t oc = adj->area_address_count;
*changed = true; *changed = true;
adj->area_address_count = tlvs->area_addresses.count; adj->area_address_count = tlvs->area_addresses.count;
adj->area_addresses = XREALLOC( adj->area_addresses = XREALLOC(
MTYPE_ISIS_ADJACENCY_INFO, adj->area_addresses, MTYPE_ISIS_ADJACENCY_INFO, adj->area_addresses,
adj->area_address_count * sizeof(*adj->area_addresses)); adj->area_address_count * sizeof(*adj->area_addresses));
for (; oc < adj->area_address_count; oc++) {
adj->area_addresses[oc].addr_len = 0;
memset(&adj->area_addresses[oc].area_addr, 0,
sizeof(adj->area_addresses[oc].area_addr));
}
} }
struct isis_area_address *addr = NULL; struct isis_area_address *addr = NULL;
@ -4496,11 +4504,18 @@ static void tlvs_ipv4_addresses_to_adj(struct isis_tlvs *tlvs,
hook_call(isis_adj_ip_disabled_hook, adj, AF_INET); hook_call(isis_adj_ip_disabled_hook, adj, AF_INET);
if (adj->ipv4_address_count != tlvs->ipv4_address.count) { if (adj->ipv4_address_count != tlvs->ipv4_address.count) {
uint32_t oc = adj->ipv4_address_count;
*changed = true; *changed = true;
adj->ipv4_address_count = tlvs->ipv4_address.count; adj->ipv4_address_count = tlvs->ipv4_address.count;
adj->ipv4_addresses = XREALLOC( adj->ipv4_addresses = XREALLOC(
MTYPE_ISIS_ADJACENCY_INFO, adj->ipv4_addresses, MTYPE_ISIS_ADJACENCY_INFO, adj->ipv4_addresses,
adj->ipv4_address_count * sizeof(*adj->ipv4_addresses)); adj->ipv4_address_count * sizeof(*adj->ipv4_addresses));
for (; oc < adj->ipv4_address_count; oc++) {
memset(&adj->ipv4_addresses[oc], 0,
sizeof(adj->ipv4_addresses[oc]));
}
} }
struct isis_ipv4_address *addr = NULL; struct isis_ipv4_address *addr = NULL;
@ -4535,11 +4550,18 @@ static void tlvs_ipv6_addresses_to_adj(struct isis_tlvs *tlvs,
hook_call(isis_adj_ip_disabled_hook, adj, AF_INET6); hook_call(isis_adj_ip_disabled_hook, adj, AF_INET6);
if (adj->ipv6_address_count != tlvs->ipv6_address.count) { if (adj->ipv6_address_count != tlvs->ipv6_address.count) {
uint32_t oc = adj->ipv6_address_count;
*changed = true; *changed = true;
adj->ipv6_address_count = tlvs->ipv6_address.count; adj->ipv6_address_count = tlvs->ipv6_address.count;
adj->ipv6_addresses = XREALLOC( adj->ipv6_addresses = XREALLOC(
MTYPE_ISIS_ADJACENCY_INFO, adj->ipv6_addresses, MTYPE_ISIS_ADJACENCY_INFO, adj->ipv6_addresses,
adj->ipv6_address_count * sizeof(*adj->ipv6_addresses)); adj->ipv6_address_count * sizeof(*adj->ipv6_addresses));
for (; oc < adj->ipv6_address_count; oc++) {
memset(&adj->ipv6_addresses[oc], 0,
sizeof(adj->ipv6_addresses[oc]));
}
} }
struct isis_ipv6_address *addr = NULL; struct isis_ipv6_address *addr = NULL;