33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
|
From ff6db1027f8f36df657ff2e5ea167773752537ed Mon Sep 17 00:00:00 2001
|
||
|
|
From: Donald Sharp <sharpd@nvidia.com>
|
||
|
|
Date: Thu, 21 Jul 2022 08:11:58 -0400
|
||
|
|
Subject: [PATCH] bgpd: Make sure hdr length is at a minimum of what is
|
||
|
|
expected
|
||
|
|
|
||
|
|
Ensure that if the capability length specified is enough data.
|
||
|
|
|
||
|
|
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
|
||
|
|
---
|
||
|
|
bgpd/bgp_packet.c | 8 ++++++++
|
||
|
|
1 file changed, 8 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
|
||
|
|
index dbf6c0b2e99..45752a8ab6d 100644
|
||
|
|
--- a/bgpd/bgp_packet.c
|
||
|
|
+++ b/bgpd/bgp_packet.c
|
||
|
|
@@ -2620,6 +2620,14 @@ static int bgp_capability_msg_parse(struct peer *peer, uint8_t *pnt,
|
||
|
|
"%s CAPABILITY has action: %d, code: %u, length %u",
|
||
|
|
peer->host, action, hdr->code, hdr->length);
|
||
|
|
|
||
|
|
+ if (hdr->length < sizeof(struct capability_mp_data)) {
|
||
|
|
+ zlog_info(
|
||
|
|
+ "%pBP Capability structure is not properly filled out, expected at least %zu bytes but header length specified is %d",
|
||
|
|
+ peer, sizeof(struct capability_mp_data),
|
||
|
|
+ hdr->length);
|
||
|
|
+ return BGP_Stop;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
/* Capability length check. */
|
||
|
|
if ((pnt + hdr->length + 3) > end) {
|
||
|
|
zlog_info("%s Capability length error", peer->host);
|