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.7 KiB
Diff
49 lines
1.7 KiB
Diff
From 8a8f20d89585aa490e3cae5ad705ce23107fc1fe Mon Sep 17 00:00:00 2001
|
|
From: harryreps <harryreps@gmail.com>
|
|
Date: Fri, 3 Mar 2023 23:17:14 +0000
|
|
Upsteam: yes
|
|
References: CVE-2023-3748,bsc#1213434,gh#FRRouting/frr#11808,https://github.com/FRRouting/frr/pull/12952
|
|
Subject: [PATCH] babeld: fix #11808 to avoid infinite loops
|
|
|
|
Replacing continue in loops to goto done so that index of packet buffer
|
|
increases.
|
|
|
|
Signed-off-by: harryreps <harryreps@gmail.com>
|
|
(cherry picked from commit ae1e0e1fed77716bc06f181ad68c4433fb5523d0)
|
|
Signed-off-by: Marius Tomaschewski <mt@suse.com>
|
|
|
|
diff --git a/babeld/message.c b/babeld/message.c
|
|
index 7d45d91bf7..2bf2337965 100644
|
|
--- a/babeld/message.c
|
|
+++ b/babeld/message.c
|
|
@@ -439,7 +439,7 @@ parse_packet(const unsigned char *from, struct interface *ifp,
|
|
debugf(BABEL_DEBUG_COMMON,
|
|
"Received Hello from %s on %s that does not have all 0's in the unused section of flags, ignoring",
|
|
format_address(from), ifp->name);
|
|
- continue;
|
|
+ goto done;
|
|
}
|
|
|
|
/*
|
|
@@ -451,7 +451,7 @@ parse_packet(const unsigned char *from, struct interface *ifp,
|
|
debugf(BABEL_DEBUG_COMMON,
|
|
"Received Unicast Hello from %s on %s that FRR is not prepared to understand yet",
|
|
format_address(from), ifp->name);
|
|
- continue;
|
|
+ goto done;
|
|
}
|
|
|
|
DO_NTOHS(seqno, message + 4);
|
|
@@ -469,7 +469,7 @@ parse_packet(const unsigned char *from, struct interface *ifp,
|
|
debugf(BABEL_DEBUG_COMMON,
|
|
"Received hello from %s on %s should be ignored as that this version of FRR does not know how to properly handle interval == 0",
|
|
format_address(from), ifp->name);
|
|
- continue;
|
|
+ goto done;
|
|
}
|
|
|
|
changed = update_neighbour(neigh, seqno, interval);
|
|
--
|
|
2.35.3
|
|
|