Merge pull request #13105 from FRRouting/mergify/bp/stable/8.5/pr-13100

bgpd: Check 7 bytes for Long-lived Graceful-Restart capability (backport #13100)
This commit is contained in:
Donald Sharp 2023-03-26 08:19:20 -04:00 committed by GitHub
commit c9820702be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -612,12 +612,24 @@ static int bgp_capability_restart(struct peer *peer,
static int bgp_capability_llgr(struct peer *peer,
struct capability_header *caphdr)
{
/*
* +--------------------------------------------------+
* | Address Family Identifier (16 bits) |
* +--------------------------------------------------+
* | Subsequent Address Family Identifier (8 bits) |
* +--------------------------------------------------+
* | Flags for Address Family (8 bits) |
* +--------------------------------------------------+
* | Long-lived Stale Time (24 bits) |
* +--------------------------------------------------+
*/
#define BGP_CAP_LLGR_MIN_PACKET_LEN 7
struct stream *s = BGP_INPUT(peer);
size_t end = stream_get_getp(s) + caphdr->length;
SET_FLAG(peer->cap, PEER_CAP_LLGR_RCV);
while (stream_get_getp(s) + 4 <= end) {
while (stream_get_getp(s) + BGP_CAP_LLGR_MIN_PACKET_LEN <= end) {
afi_t afi;
safi_t safi;
iana_afi_t pkt_afi = stream_getw(s);