Skip to content

Commit

Permalink
bgpd: Fix error handling when receiving BGP Prefix SID attribute
Browse files Browse the repository at this point in the history
Without this patch, we always set the BGP Prefix SID attribute flag without
checking if it's malformed or not. RFC8669 says that this attribute MUST be discarded.

Also, this fixes the bgpd crash when a malformed Prefix SID attribute is received,
with malformed transitive flags and/or TLVs.

Reported-by: Iggy Frankovic <iggyfran@amazon.com>
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
  • Loading branch information
ton31337 committed Mar 28, 2024
1 parent 67aaa4b commit ba6a8f1
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions bgpd/bgp_attr.c
Original file line number Diff line number Diff line change
Expand Up @@ -1398,6 +1398,7 @@ bgp_attr_malformed(struct bgp_attr_parser_args *args, uint8_t subcode,
case BGP_ATTR_AS4_AGGREGATOR:
case BGP_ATTR_AGGREGATOR:
case BGP_ATTR_ATOMIC_AGGREGATE:
case BGP_ATTR_PREFIX_SID:
return BGP_ATTR_PARSE_PROCEED;

/* Core attributes, particularly ones which may influence route
Expand Down Expand Up @@ -3163,8 +3164,6 @@ enum bgp_attr_parse_ret bgp_attr_prefix_sid(struct bgp_attr_parser_args *args)
struct attr *const attr = args->attr;
enum bgp_attr_parse_ret ret;

attr->flag |= ATTR_FLAG_BIT(BGP_ATTR_PREFIX_SID);

uint8_t type;
uint16_t length;
size_t headersz = sizeof(type) + sizeof(length);
Expand Down Expand Up @@ -3214,6 +3213,8 @@ enum bgp_attr_parse_ret bgp_attr_prefix_sid(struct bgp_attr_parser_args *args)
}
}

SET_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_PREFIX_SID));

return BGP_ATTR_PARSE_PROCEED;
}

Expand Down

0 comments on commit ba6a8f1

Please sign in to comment.