Skip to contentSkip to conversation

openfortivpn: upgrade 1.22.0 -> 1.22.1

PATCH New [email protected] 1 participant 2 messages Jan 18

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 openfortivpn: upgrade 1.22.0 -> 1.22.1

From: Wang Mingyu <[email protected]>

Bugfix:
do not advertise we talk compressed HTTP

(cherry picked from commit 7cd1f5a87175c235c349ace5c3b6082ca82950d1)
---
 .../{openfortivpn_1.22.0.bb => openfortivpn_1.22.1.bb}          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-networking/recipes-connectivity/openfortivpn/{openfortivpn_1.22.0.bb => openfortivpn_1.22.1.bb} (93%)
meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.22.1.bb renamed from meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.22.0.bb +1 -1
similarity index 93%
rename from meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.22.0.bb
rename to meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.22.1.bb
index 568593b2d4..b69a7e2355 100644
@@ -3,7 +3,7 @@ LICENSE = "GPL-3.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3d575262a651a6f1a17210ce41bf907d"
 
 SRC_URI = "git://github.com/adrienverge/openfortivpn.git;protocol=https;branch=master"
-SRCREV = "82e4401162fc65efad8267f4cb3287c6ab6fc088"
+SRCREV = "388fa98f639ef91733461de50b06dd57f1ffb099"
 
 DEPENDS = "openssl"
 
#1 lore raw

PATCH 2/2 frr: patch multiple CVEs

From: Ankur Tyagi <[email protected]>

Details:
https://nvd.nist.gov/vuln/detail/CVE-2025-61099
https://nvd.nist.gov/vuln/detail/CVE-2025-61100
https://nvd.nist.gov/vuln/detail/CVE-2025-61101
https://nvd.nist.gov/vuln/detail/CVE-2025-61102
https://nvd.nist.gov/vuln/detail/CVE-2025-61103
https://nvd.nist.gov/vuln/detail/CVE-2025-61104
https://nvd.nist.gov/vuln/detail/CVE-2025-61105
https://nvd.nist.gov/vuln/detail/CVE-2025-61106
https://nvd.nist.gov/vuln/detail/CVE-2025-61107

The PR[1] mentioned in nvd got closed without merge due to unresolved code review comments but another PR[2] fixed them and changes were merged.

[1] https://github.com/FRRouting/frr/pull/19480
[2] https://github.com/FRRouting/frr/pull/19983

---
 ...1102-61103-61104-61105-61106-61107_1.patch |  37 +++
 ...1102-61103-61104-61105-61106-61107_2.patch | 273 ++++++++++++++++++
 ...1102-61103-61104-61105-61106-61107_3.patch |  78 +++++
 ...1102-61103-61104-61105-61106-61107_4.patch | 119 ++++++++
 .../recipes-protocols/frr/frr_9.1.3.bb        |   4 +
 5 files changed, 511 insertions(+)
 create mode 100644 meta-networking/recipes-protocols/frr/frr/CVE-2025-61099-61100-61101-61102-61103-61104-61105-61106-61107_1.patch
 create mode 100644 meta-networking/recipes-protocols/frr/frr/CVE-2025-61099-61100-61101-61102-61103-61104-61105-61106-61107_2.patch
 create mode 100644 meta-networking/recipes-protocols/frr/frr/CVE-2025-61099-61100-61101-61102-61103-61104-61105-61106-61107_3.patch
 create mode 100644 meta-networking/recipes-protocols/frr/frr/CVE-2025-61099-61100-61101-61102-61103-61104-61105-61106-61107_4.patch
meta-networking/recipes-protocols/frr/frr/CVE-2025-61099-61100-61101-61102-61103-61104-61105-61106-61107_1.patch new file +37 -0
new file mode 100644
index 0000000000..c51d29058e
@@ -0,0 +1,37 @@
+From c686fcae29ea1ae9ba4ebfa792db79100948eb79 Mon Sep 17 00:00:00 2001
+From: s1awwhy <[email protected]>
+Date: Sun, 24 Aug 2025 21:17:55 +0800
+Subject: [PATCH] ospfd: Add null check for vty_out in check_tlv_size
+
+Add security check for vty_out. Specifically,  Check NULL for vty. If vty is not available, dump info via zlog.
+
+Signed-off-by: s1awwhy <[email protected]>
+CVE: CVE-2025-61099 CVE-2025-61100 CVE-2025-61101 CVE-2025-61102 CVE-2025-61103 CVE-2025-61104 CVE-2025-61105 CVE-2025-61106 CVE-2025-61107
+Upstream-Status: Backport [https://github.com/FRRouting/frr/commit/b7d9b7aa47627b31e4b50795284408ab6de98660]
+Signed-off-by: Ankur Tyagi <[email protected]>
+---
+ ospfd/ospf_ext.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/ospfd/ospf_ext.c b/ospfd/ospf_ext.c
+index d82c2146c7..456f163ffa 100644
+--- a/ospfd/ospf_ext.c
++++ b/ospfd/ospf_ext.c
+@@ -1704,11 +1704,15 @@ static void ospf_ext_lsa_schedule(struct ext_itf *exti, enum lsa_opcode op)
+  * ------------------------------------
+  */
+ 
++/* Check NULL for vty. If vty is not available, dump info via zlog */
+ #define check_tlv_size(size, msg)                                              \
+ 	do {                                                                   \
+ 		if (ntohs(tlvh->length) != size) {                             \
+-			vty_out(vty, "  Wrong %s TLV size: %d(%d). Abort!\n",  \
+-				msg, ntohs(tlvh->length), size);               \
++			if (vty != NULL)                         \
++				vty_out(vty, "  Wrong %s TLV size: %d(%d). Abort!\n",  \
++					msg, ntohs(tlvh->length), size);               \
++			else                                              \
++				zlog_debug("    Wrong %s TLV size: %d(%d). Abort!", msg, ntohs(tlvh->length), size);    \
+ 			return size + TLV_HDR_SIZE;                            \
+ 		}                                                              \
+ 	} while (0)
meta-networking/recipes-protocols/frr/frr/CVE-2025-61099-61100-61101-61102-61103-61104-61105-61106-61107_2.patch new file +273 -0

273 lines not on this page · raw message

meta-networking/recipes-protocols/frr/frr/CVE-2025-61099-61100-61101-61102-61103-61104-61105-61106-61107_3.patch new file +78 -0

78 lines not on this page · raw message

meta-networking/recipes-protocols/frr/frr/CVE-2025-61099-61100-61101-61102-61103-61104-61105-61106-61107_4.patch new file +119 -0

119 lines not on this page · raw message

meta-networking/recipes-protocols/frr/frr_9.1.3.bb +4 -0
index f75ce20ab3..0287a6fb69 100644
@@ -14,6 +14,10 @@ SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/9.1 \
            file://frr.pam \
            file://0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch \
            file://CVE-2024-55553.patch \
+           file://CVE-2025-61099-61100-61101-61102-61103-61104-61105-61106-61107_1.patch \
+           file://CVE-2025-61099-61100-61101-61102-61103-61104-61105-61106-61107_2.patch \
+           file://CVE-2025-61099-61100-61101-61102-61103-61104-61105-61106-61107_3.patch \
+           file://CVE-2025-61099-61100-61101-61102-61103-61104-61105-61106-61107_4.patch \
            "
 
 SRCREV = "ad1766d17be022587fe05ebe1a7bf10e1b7dce19"