diff --git a/meta-networking/recipes-connectivity/libiec61850/files/CVE-2026-18583.patch b/meta-networking/recipes-connectivity/libiec61850/files/CVE-2026-18583.patch
new file mode 100644
index 0000000000..8acf7e1465
--- /dev/null
+++ b/meta-networking/recipes-connectivity/libiec61850/files/CVE-2026-18583.patch
@@ -0,0 +1,35 @@
+From c8baade187e1c31ac9e9ca71dced5a46765d97b2 Mon Sep 17 00:00:00 2001
+From: Michael Zillgith <michael.zillgith@mz-automation.de>
+Date: Tue, 16 Jun 2026 18:23:52 +0100
+Subject: [PATCH] - MMS server: fixed - potential crash in access control check
+ handler for association and vmd specific data sets
+ (LIB61850-560)(GHSA-7v2x-39mw-2979)
+
+(cherry picked from commit 062062daf4cb50c7aa76e01d6fb4d58fc9278a7d)
+
+CVE: CVE-2026-18583
+Upstream-Status: Backport [https://github.com/mz-automation/libiec61850/commit/062062daf4cb50c7aa76e01d6fb4d58fc9278a7d]
+
+Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
+---
+ src/iec61850/server/mms_mapping/mms_mapping.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/iec61850/server/mms_mapping/mms_mapping.c b/src/iec61850/server/mms_mapping/mms_mapping.c
+index e5e6b034..5620f63f 100644
+--- a/src/iec61850/server/mms_mapping/mms_mapping.c
++++ b/src/iec61850/server/mms_mapping/mms_mapping.c
+@@ -3807,11 +3807,11 @@ checkDataSetAccess(MmsMapping* self, MmsServerConnection connection, MmsVariable
+         if (listType == MMS_ASSOCIATION_SPECIFIC)
+         {
+             dataSetRef[0] = '@';
+-            StringUtils_copyStringToBuffer(dataSetRef + 1, listName);
++            StringUtils_copyStringMax(dataSetRef + 1, 129, listName);
+         }
+         else if (listType == MMS_VMD_SPECIFIC)
+         {
+-            StringUtils_copyStringToBuffer(dataSetRef, listName);
++            StringUtils_copyStringMax(dataSetRef, 129, listName);
+         }
+         else if (listType == MMS_DOMAIN_SPECIFIC)
+         {
diff --git a/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.6.1.bb b/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.6.1.bb
index b22d8a09c9..408b4d2d11 100644
--- a/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.6.1.bb
+++ b/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.6.1.bb
@@ -18,6 +18,7 @@ SRCREV = "a13961110b8238d2d8ea577c1fb7592ba3017ad8"
 SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.6;protocol=https;tag=v${PV} \
            file://0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch \
            file://CVE-2026-18582.patch \
+           file://CVE-2026-18583.patch \
 "