From 252d7352d76af078b2e6b9159ad9ddc68ec8d073 Mon Sep 17 00:00:00 2001 From: trkwyk Date: Thu, 22 Jan 2026 23:11:00 +0800 Subject: [PATCH] fix(rrm.c): fix unbounded ssid --- .../022-fix-rrm-snprintf-error.patch | 17 +++++++++++++++++ .../022-fix-rrm-snprintf-error.patch | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 package/mtk/drivers/mt_wifi/patches-7661/022-fix-rrm-snprintf-error.patch create mode 100644 package/mtk/drivers/mt_wifi/patches-7673/022-fix-rrm-snprintf-error.patch diff --git a/package/mtk/drivers/mt_wifi/patches-7661/022-fix-rrm-snprintf-error.patch b/package/mtk/drivers/mt_wifi/patches-7661/022-fix-rrm-snprintf-error.patch new file mode 100644 index 0000000000..7e3b14d3d1 --- /dev/null +++ b/package/mtk/drivers/mt_wifi/patches-7661/022-fix-rrm-snprintf-error.patch @@ -0,0 +1,17 @@ +--- a/mt_wifi/embedded/common/rrm.c 2025-04-08 12:54:09.000000000 +0800 ++++ b/mt_wifi/embedded/common/rrm.c 2026-01-22 21:50:27.508920117 +0800 +@@ -833,13 +833,12 @@ + } else { + if (RRM_PeerNeighborReqSanity(pAd, Elem->Msg, Elem->MsgLen, &DialogToken, &pSsid, &SsidLen)) { + MTWF_DBG(pAd, DBG_CAT_PROTO, CATPROTO_RRM, DBG_LVL_INFO, "DialogToken=%x\n", DialogToken); +- ret = snprintf(ssidbuf, sizeof(ssidbuf), "%s", pSsid); ++ ret = snprintf(ssidbuf, sizeof(ssidbuf), "%.*s", SsidLen, pSsid); + if (os_snprintf_error(sizeof(ssidbuf), ret)) { + MTWF_DBG(pAd, DBG_CAT_ALL, DBG_SUBCAT_ALL, DBG_LVL_ERROR, + "snprintf error!\n"); + return; + } +- ssidbuf[SsidLen] = '\0'; + MTWF_DBG(pAd, DBG_CAT_PROTO, CATPROTO_RRM, DBG_LVL_INFO, "pSsid=%s\n", ssidbuf); + MTWF_DBG(pAd, DBG_CAT_PROTO, CATPROTO_RRM, DBG_LVL_INFO, "SsidLen=%d\n", SsidLen); + RRM_EnqueueNeighborRep(pAd, pEntry, DialogToken, pSsid, SsidLen); diff --git a/package/mtk/drivers/mt_wifi/patches-7673/022-fix-rrm-snprintf-error.patch b/package/mtk/drivers/mt_wifi/patches-7673/022-fix-rrm-snprintf-error.patch new file mode 100644 index 0000000000..7e3b14d3d1 --- /dev/null +++ b/package/mtk/drivers/mt_wifi/patches-7673/022-fix-rrm-snprintf-error.patch @@ -0,0 +1,17 @@ +--- a/mt_wifi/embedded/common/rrm.c 2025-04-08 12:54:09.000000000 +0800 ++++ b/mt_wifi/embedded/common/rrm.c 2026-01-22 21:50:27.508920117 +0800 +@@ -833,13 +833,12 @@ + } else { + if (RRM_PeerNeighborReqSanity(pAd, Elem->Msg, Elem->MsgLen, &DialogToken, &pSsid, &SsidLen)) { + MTWF_DBG(pAd, DBG_CAT_PROTO, CATPROTO_RRM, DBG_LVL_INFO, "DialogToken=%x\n", DialogToken); +- ret = snprintf(ssidbuf, sizeof(ssidbuf), "%s", pSsid); ++ ret = snprintf(ssidbuf, sizeof(ssidbuf), "%.*s", SsidLen, pSsid); + if (os_snprintf_error(sizeof(ssidbuf), ret)) { + MTWF_DBG(pAd, DBG_CAT_ALL, DBG_SUBCAT_ALL, DBG_LVL_ERROR, + "snprintf error!\n"); + return; + } +- ssidbuf[SsidLen] = '\0'; + MTWF_DBG(pAd, DBG_CAT_PROTO, CATPROTO_RRM, DBG_LVL_INFO, "pSsid=%s\n", ssidbuf); + MTWF_DBG(pAd, DBG_CAT_PROTO, CATPROTO_RRM, DBG_LVL_INFO, "SsidLen=%d\n", SsidLen); + RRM_EnqueueNeighborRep(pAd, pEntry, DialogToken, pSsid, SsidLen);