0d23942aca
- Clean slate: removing all previous patches. - The following patches were obsoleted: - 0001-disable-zmq-test.patch - harden_frr.service.patch - 0003-tools-Run-as-FRR_USER-install-chown-commands-to-avoi.patch - 0004-tools-remove-backslash-from-declare-check-regex.patch - 0005-root-ok-in-account-frr.pam.patch - 0006-bgpd-Check-7-bytes-for-Long-lived-Graceful-Restart-c.patch - 0007-bgpd-Ensure-stream-received-has-enough-data.patch - 0008-bgpd-Don-t-read-the-first-byte-of-ORF-header-if-we-a.patch - 0009-bgpd-Do-not-process-NLRIs-if-the-attribute-length-is.patch - 0010-bgpd-Use-treat-as-withdraw-for-tunnel-encapsulation-.patch - 0011-babeld-fix-11808-to-avoid-infinite-loops.patch - 0012-bgpd-Limit-flowspec-to-no-attribute-means-a-implicit.patch - 0013-bgpd-Check-mandatory-attributes-more-carefully-for-U.patch - 0014-bgpd-Handle-MP_REACH_NLRI-malformed-packets-with-ses.patch - 0015-bgpd-Treat-EOR-as-withdrawn-to-avoid-unwanted-handli.patch - 0016-bgpd-Ignore-handling-NLRIs-if-we-received-MP_UNREACH.patch - 0017-bgpd-Fix-use-beyond-end-of-stream-of-labeled-unicast.patch - 0018-bgpd-Flowspec-overflow-issue.patch - 0019-bgpd-fix-error-handling-when-receiving-BGP-Prefix-SID-attribute.patch - 0020-ospfd-Solved-crash-in-OSPF-TE-parsing.patch - 0021-ospfd-Solved-crash-in-RI-parsing-with-OSPF-TE.patch - 0022-ospfd-Correct-Opaque-LSA-Extended-parser.patch - 0023-ospfd-protect-call-to-get_edge-in-ospf_te.c.patch OBS-URL: https://build.opensuse.org/package/show/network/frr?expand=0&rev=69
49 lines
1.8 KiB
Diff
49 lines
1.8 KiB
Diff
From d95229c9ba4c8ff99dfc644dd2d1e9e172fe3faf Mon Sep 17 00:00:00 2001
|
|
From: Donatas Abraitis <donatas@opensourcerouting.org>
|
|
Date: Fri, 24 Mar 2023 09:55:23 +0200
|
|
Upstream: yes
|
|
References: bsc#1211248,CVE-2023-31489,https://github.com/FRRouting/frr/pull/13100/commits/b1d33ec293e8e36fbb8766252f3b016d268e31ce
|
|
Subject: [PATCH] bgpd: Check 7 bytes for Long-lived Graceful-Restart
|
|
capability
|
|
|
|
It's not 4 bytes, it was assuming the same as Graceful-Restart tuples.
|
|
|
|
LLGR has more 3 bytes (Long-lived Stale Time).
|
|
|
|
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
|
|
Signed-off-by: Marius Tomaschewski <mt@suse.com>
|
|
|
|
diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
|
|
index d1667fac26..907e75e76b 100644
|
|
--- a/bgpd/bgp_open.c
|
|
+++ b/bgpd/bgp_open.c
|
|
@@ -599,12 +599,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);
|
|
--
|
|
2.35.3
|
|
|