mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-28 21:13:44 +00:00
libiec61850: patch CVE-2024-26529
Details https://nvd.nist.gov/vuln/detail/CVE-2024-26529 Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com> Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
This commit is contained in:
parent
c5f1156fb0
commit
42a6b0441c
@ -1,4 +1,4 @@
|
|||||||
From d4ddfc7a350011b7944ed8d6bca80f164dfd1387 Mon Sep 17 00:00:00 2001
|
From 21d0a059097dfae1723255e5ff59665d39420be0 Mon Sep 17 00:00:00 2001
|
||||||
From: Romain Naour <romain.naour@smile.fr>
|
From: Romain Naour <romain.naour@smile.fr>
|
||||||
Date: Fri, 10 Jul 2020 17:08:34 +0200
|
Date: Fri, 10 Jul 2020 17:08:34 +0200
|
||||||
Subject: [PATCH] pyiec61850: don't break CMAKE_INSTALL_PATH by trying to find
|
Subject: [PATCH] pyiec61850: don't break CMAKE_INSTALL_PATH by trying to find
|
||||||
@ -14,7 +14,7 @@ Upstream-Status: Pending
|
|||||||
1 file changed, 2 insertions(+), 9 deletions(-)
|
1 file changed, 2 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
diff --git a/pyiec61850/CMakeLists.txt b/pyiec61850/CMakeLists.txt
|
diff --git a/pyiec61850/CMakeLists.txt b/pyiec61850/CMakeLists.txt
|
||||||
index 159ef4b..d1732a1 100644
|
index 159ef4bc..d1732a16 100644
|
||||||
--- a/pyiec61850/CMakeLists.txt
|
--- a/pyiec61850/CMakeLists.txt
|
||||||
+++ b/pyiec61850/CMakeLists.txt
|
+++ b/pyiec61850/CMakeLists.txt
|
||||||
@@ -31,14 +31,7 @@ endif()
|
@@ -31,14 +31,7 @@ endif()
|
||||||
@ -34,6 +34,3 @@ index 159ef4b..d1732a1 100644
|
|||||||
+install(TARGETS _iec61850 LIBRARY DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
|
+install(TARGETS _iec61850 LIBRARY DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
|
||||||
|
|
||||||
add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py)
|
add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py)
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From 16d07a82242c3263ec0038c9b4c97355795d2dd9 Mon Sep 17 00:00:00 2001
|
From aa48ec52d5792c18a3b369a55ed6472a7dfa1ec1 Mon Sep 17 00:00:00 2001
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
Date: Sat, 19 Mar 2022 23:16:51 -0700
|
Date: Sat, 19 Mar 2022 23:16:51 -0700
|
||||||
Subject: [PATCH] pyiec61850: Use CMAKE_INSTALL_LIBDIR from GNUInstallDirs in
|
Subject: [PATCH] pyiec61850: Use CMAKE_INSTALL_LIBDIR from GNUInstallDirs in
|
||||||
@ -13,6 +13,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|||||||
pyiec61850/CMakeLists.txt | 6 ++++--
|
pyiec61850/CMakeLists.txt | 6 ++++--
|
||||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/pyiec61850/CMakeLists.txt b/pyiec61850/CMakeLists.txt
|
||||||
|
index d1732a16..c19f889b 100644
|
||||||
--- a/pyiec61850/CMakeLists.txt
|
--- a/pyiec61850/CMakeLists.txt
|
||||||
+++ b/pyiec61850/CMakeLists.txt
|
+++ b/pyiec61850/CMakeLists.txt
|
||||||
@@ -31,7 +31,9 @@ endif()
|
@@ -31,7 +31,9 @@ endif()
|
||||||
@ -0,0 +1,33 @@
|
|||||||
|
From de14cb2e053c95d9695bb41bbdd580f35f710793 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael Zillgith <michael.zillgith@mz-automation.de>
|
||||||
|
Date: Fri, 2 Feb 2024 06:44:47 +0000
|
||||||
|
Subject: [PATCH] LIB61850-430: fixed null pointer dereference in
|
||||||
|
mmsServer_handleDeleteNamedVariableListRequest when receiving malformed
|
||||||
|
message
|
||||||
|
|
||||||
|
CVE: CVE-2024-26529
|
||||||
|
Upstream-Status: Backport [https://github.com/mz-automation/libiec61850/commit/cf94d64206cf53298edf4799a75b31657bb7cbb3]
|
||||||
|
|
||||||
|
(cherry picked from commit cf94d64206cf53298edf4799a75b31657bb7cbb3)
|
||||||
|
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
|
||||||
|
---
|
||||||
|
src/mms/iso_mms/server/mms_named_variable_list_service.c | 6 ++++++
|
||||||
|
1 file changed, 6 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/mms/iso_mms/server/mms_named_variable_list_service.c b/src/mms/iso_mms/server/mms_named_variable_list_service.c
|
||||||
|
index 3a27061c..3365f771 100644
|
||||||
|
--- a/src/mms/iso_mms/server/mms_named_variable_list_service.c
|
||||||
|
+++ b/src/mms/iso_mms/server/mms_named_variable_list_service.c
|
||||||
|
@@ -140,6 +140,12 @@ mmsServer_handleDeleteNamedVariableListRequest(MmsServerConnection connection,
|
||||||
|
mmsMsg_createMmsRejectPdu(&invokeId, MMS_ERROR_REJECT_INVALID_PDU, response);
|
||||||
|
goto exit_function;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ if (request->listOfVariableListName == NULL)
|
||||||
|
+ {
|
||||||
|
+ mmsMsg_createMmsRejectPdu(&invokeId, MMS_ERROR_REJECT_INVALID_PDU, response);
|
||||||
|
+ goto exit_function;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
long scopeOfDelete = DeleteNamedVariableListRequest__scopeOfDelete_specific;
|
||||||
|
|
||||||
@ -17,7 +17,8 @@ SRCREV = "6f557c490f0b46ab5d7ef1b01bb3bc9fab3f442f"
|
|||||||
|
|
||||||
SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.5;protocol=https \
|
SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.5;protocol=https \
|
||||||
file://0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch \
|
file://0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch \
|
||||||
file://0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch \
|
file://0002-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch \
|
||||||
|
file://0003-LIB61850-430-fixed-null-pointer-dereference-in-mmsSe.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user