Skip to contentSkip to conversation

wpa-supplicant: patch CVE-2026-58374

PATCH New [email protected] 1 participant 1 message Sep 5

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 wpa-supplicant: patch CVE-2026-58374

From: Ankur Tyagi <[email protected]>

Apply patches recommended by upstream[1] as mentioned in the NVD[2]

[1] https://w1.fi/security/2026-1/
[2] https://nvd.nist.gov/vuln/detail/cve-2026-58374

---
 .../wpa-supplicant/CVE-2026-58374-1.patch     | 52 ++++++++++++++++++
 .../wpa-supplicant/CVE-2026-58374-2.patch     | 47 ++++++++++++++++
 .../wpa-supplicant/CVE-2026-58374-3.patch     | 55 +++++++++++++++++++
 .../wpa-supplicant/CVE-2026-58374-4.patch     | 46 ++++++++++++++++
 .../wpa-supplicant/CVE-2026-58374-5.patch     | 47 ++++++++++++++++
 .../wpa-supplicant/wpa-supplicant_2.11.bb     |  5 ++
 6 files changed, 252 insertions(+)
 create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2026-58374-1.patch
 create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2026-58374-2.patch
 create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2026-58374-3.patch
 create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2026-58374-4.patch
 create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2026-58374-5.patch
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2026-58374-1.patch new file +52 -0
new file mode 100644
index 00000000000..625371c2b55
@@ -0,0 +1,52 @@
+From 708a4247581c98c0cc46504e4abb874b4c835ffe Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <[email protected]>
+Date: Tue, 31 Mar 2026 23:24:04 +0300
+Subject: [PATCH 1/5] AP MLD: Fix link ID validation in Basic MLE parsing
+
+Link ID 15 can be indicated in the field, but that is not a valid value
+and must be rejected to avoid issues pointing beyond the array of links
+for a non-AP MLD. Without this, an invalid MLE could result in writing
+beyond the end of the buffer and causing process termination or
+unexpected behavior.
+
+Fixes: 5f5db9366cde ("AP: MLO: Process Multi-Link element from (Re)Association Request frame")
+Signed-off-by: Jouni Malinen <[email protected]>
+
+CVE: CVE-2026-58374
+Upstream-Status: Backport [https://git.w1.fi/cgit/hostap/commit/?id=46dd5a4ffc9bcf44cf8fc45120b3e1e5ec922187]
+Signed-off-by: Ankur Tyagi <[email protected]>
+---
+ src/ap/ieee802_11_eht.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/ap/ieee802_11_eht.c b/src/ap/ieee802_11_eht.c
+index b935ee889a89..804808c0dbfd 100644
+--- a/src/ap/ieee802_11_eht.c
++++ b/src/ap/ieee802_11_eht.c
+@@ -1262,6 +1262,7 @@ u16 hostapd_process_ml_assoc_req(struct hostapd_data *hapd,
+ 		size_t sub_elem_len = *(pos + 1);
+ 		size_t sta_info_len;
+ 		u16 control;
++		u8 link_id;
+ 
+ 		wpa_printf(MSG_DEBUG, "MLD: sub element len=%zu",
+ 			   sub_elem_len);
+@@ -1302,8 +1303,13 @@ u16 hostapd_process_ml_assoc_req(struct hostapd_data *hapd,
+ 			goto out;
+ 		}
+ 		control = WPA_GET_LE16(pos);
+-		link_info = &info->links[control &
+-					 EHT_PER_STA_CTRL_LINK_ID_MSK];
++		link_id = control & BASIC_MLE_STA_CTRL_LINK_ID_MASK;
++		if (link_id >= MAX_NUM_MLD_LINKS) {
++			wpa_printf(MSG_DEBUG,
++				   "MLD: Invalid Link ID in Per-STA Profile subelement");
++			goto out;
++		}
++		link_info = &info->links[link_id];
+ 		pos += 2;
+ 		ml_len -= 2;
+ 		sub_elem_len -= 2;
+-- 
+2.43.0
+
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2026-58374-2.patch new file +47 -0

47 lines not on this page · raw message

meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2026-58374-3.patch new file +55 -0

55 lines not on this page · raw message

meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2026-58374-4.patch new file +46 -0

46 lines not on this page · raw message

meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2026-58374-5.patch new file +47 -0

47 lines not on this page · raw message

meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.11.bb +5 -0
index 7c7a8bd9c13..7d1f9ffc6d6 100644
@@ -21,6 +21,11 @@ SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \
            file://0004-defconfig-Uncomment-CONFIG_IEEE80211BE-y.patch \
            file://CVE-2025-24912-01.patch \
            file://CVE-2025-24912-02.patch \
+           file://CVE-2026-58374-1.patch \
+           file://CVE-2026-58374-2.patch \
+           file://CVE-2026-58374-3.patch \
+           file://CVE-2026-58374-4.patch \
+           file://CVE-2026-58374-5.patch \
            "
 SRC_URI[sha256sum] = "912ea06f74e30a8e36fbb68064d6cdff218d8d591db0fc5d75dee6c81ac7fc0a"