30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
|
From a6c5ef48cb086b94a5b911af4ee9f675213fb14b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Donatas Abraitis <donatas@opensourcerouting.org>
|
||
|
|
Date: Sun, 20 Aug 2023 22:15:27 +0300
|
||
|
|
Upstream: yes
|
||
|
|
References: CVE-2023-41360,bsc#1214739,https://github.com/FRRouting/frr/pull/14245
|
||
|
|
Subject: [PATCH] bgpd: Don't read the first byte of ORF header if we are ahead
|
||
|
|
of stream
|
||
|
|
|
||
|
|
Reported-by: Iggy Frankovic iggyfran@amazon.com
|
||
|
|
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
|
||
|
|
Signed-off-by: Marius Tomaschewski <mt@suse.com>
|
||
|
|
|
||
|
|
diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
|
||
|
|
index 72d6a92317..4947dbc21d 100644
|
||
|
|
--- a/bgpd/bgp_packet.c
|
||
|
|
+++ b/bgpd/bgp_packet.c
|
||
|
|
@@ -2375,7 +2375,8 @@ static int bgp_route_refresh_receive(struct peer *peer, bgp_size_t size)
|
||
|
|
* and 7 bytes of ORF Address-filter entry from
|
||
|
|
* the stream
|
||
|
|
*/
|
||
|
|
- if (*p_pnt & ORF_COMMON_PART_REMOVE_ALL) {
|
||
|
|
+ if (p_pnt < p_end &&
|
||
|
|
+ *p_pnt & ORF_COMMON_PART_REMOVE_ALL) {
|
||
|
|
if (bgp_debug_neighbor_events(peer))
|
||
|
|
zlog_debug(
|
||
|
|
"%pBP rcvd Remove-All pfxlist ORF request",
|
||
|
|
--
|
||
|
|
2.35.3
|
||
|
|
|