proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-28 10:50:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8010 from ton31337/fix/drop_aggregate_as_attribute_if_malformed

Browse Source 
bgpd: Drop aggregator_as attribute if malformed in case of BGP_AS_ZERO
This commit is contained in:
Mark Stapp 2021-02-04 15:02:42 -05:00 committed by GitHub
commit d5b342eb75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
bgpd/bgp_attr.c
View File

@ -1750,17 +1750,18 @@ static int bgp_attr_aggregator(struct bgp_attr_parser_args *args)
else
aggregator_as = stream_getw(peer->curr);
attr->aggregator_as = aggregator_as;
attr->aggregator_addr.s_addr = stream_get_ipv4(peer->curr);
/* Set atomic aggregate flag. */
attr->flag |= ATTR_FLAG_BIT(BGP_ATTR_AGGREGATOR);
/* Codification of AS 0 Processing */
if (aggregator_as == BGP_AS_ZERO)
if (aggregator_as == BGP_AS_ZERO) {
flog_err(EC_BGP_ATTR_LEN,
"AGGREGATOR AS number is 0 for aspath: %s",
aspath_print(attr->aspath));
"%s: AGGREGATOR AS number is 0 for aspath: %s",
peer->host, aspath_print(attr->aspath));
} else {
attr->aggregator_as = aggregator_as;
attr->aggregator_addr.s_addr = stream_get_ipv4(peer->curr);
/* Set atomic aggregate flag. */
attr->flag |= ATTR_FLAG_BIT(BGP_ATTR_AGGREGATOR);
}
return BGP_ATTR_PARSE_PROCEED;
}
@ -1784,16 +1785,18 @@ bgp_attr_as4_aggregator(struct bgp_attr_parser_args *args,
}
aggregator_as = stream_getl(peer->curr);
*as4_aggregator_as = aggregator_as;
as4_aggregator_addr->s_addr = stream_get_ipv4(peer->curr);
attr->flag |= ATTR_FLAG_BIT(BGP_ATTR_AS4_AGGREGATOR);
/* Codification of AS 0 Processing */
if (aggregator_as == BGP_AS_ZERO)
if (aggregator_as == BGP_AS_ZERO) {
flog_err(EC_BGP_ATTR_LEN,
"AS4_AGGREGATOR AS number is 0 for aspath: %s",
aspath_print(attr->aspath));
"%s: AS4_AGGREGATOR AS number is 0 for aspath: %s",
peer->host, aspath_print(attr->aspath));
} else {
*as4_aggregator_as = aggregator_as;
as4_aggregator_addr->s_addr = stream_get_ipv4(peer->curr);
attr->flag |= ATTR_FLAG_BIT(BGP_ATTR_AS4_AGGREGATOR);
}
return BGP_ATTR_PARSE_PROCEED;
}