Skip to contentSkip to conversation

package/libiec61850: fix CVE-2020-15158

PATCH New Fabrice Fontaine 2 participants 2 messages Jan 8, 2021 – Jan 9, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libiec61850: fix CVE-2020-15158

In libIEC61850 before version 1.4.3, when a message with COTP message length field with value < 4 is received an integer underflow will happen leading to heap buffer overflow. This can cause an application crash or on some platforms even the execution of remote code. If your application is used in open networks or there are untrusted nodes in the network it is highly recommend to apply the patch. This was patched with commit 033ab5b. Users of version 1.4.x should upgrade to version 1.4.3 when available. As a workaround changes of commit 033ab5b can be applied to older versions.

---
 ...uffer-overflow-when-handling-message.patch | 27 +++++++++++++++++++
 package/libiec61850/libiec61850.mk            |  3 +++
 2 files changed, 30 insertions(+)
 create mode 100644 package/libiec61850/0003-COTP-fixed-possible-heap-buffer-overflow-when-handling-message.patch
package/libiec61850/0003-COTP-fixed-possible-heap-buffer-overflow-when-handling-message.patch new file +27 -0
new file mode 100644
index 0000000000..88048555b7
@@ -0,0 +1,27 @@
+From 033ab5b6488250c8c3b838f25a7cbc3e099230bb Mon Sep 17 00:00:00 2001
+From: Michael Zillgith <[email protected]>
+Date: Wed, 12 Aug 2020 07:25:37 +0200
+Subject: [PATCH] - COTP: fixed possible heap buffer overflow when handling
+ message with invalid (zero) value in length field (#250)
+
+[Retrieved from:
+https://github.com/mz-automation/libiec61850/commit/033ab5b6488250c8c3b838f25a7cbc3e099230bb]
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ src/mms/iso_cotp/cotp.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/mms/iso_cotp/cotp.c b/src/mms/iso_cotp/cotp.c
+index cbb34b36..8c37d262 100644
+--- a/src/mms/iso_cotp/cotp.c
++++ b/src/mms/iso_cotp/cotp.c
+@@ -720,6 +720,9 @@ CotpConnection_readToTpktBuffer(CotpConnection* self)
+             goto exit_waiting;
+     }
+ 
++    if (self->packetSize <= bufPos)
++        goto exit_error;
++
+     readBytes = readFromSocket(self, buffer + bufPos, self->packetSize - bufPos);
+ 
+     if (readBytes < 0)
package/libiec61850/libiec61850.mk +3 -0
index 9d527f5831..6413073805 100644
@@ -12,4 +12,7 @@ LIBIEC61850_LICENSE_FILES = COPYING
 LIBIEC61850_CONF_OPTS = -DBUILD_EXAMPLES=OFF \
 	-DBUILD_PYTHON_BINDINGS=OFF
 
+# 0003-COTP-fixed-possible-heap-buffer-overflow-when-handling-message.patch
+LIBIEC61850_IGNORE_CVES += CVE-2020-15158
+
 $(eval $(cmake-package))
Signature · 1 line
2.29.2
#1 lore raw

PATCH 1/1 package/libiec61850: fix CVE-2020-15158

Fabrice, All,

On 2021-01-08 19:19 +0100, Fabrice Fontaine spake thusly:

Quoted 11 lines

In libIEC61850 before version 1.4.3, when a message with COTP message length field with value < 4 is received an integer underflow will happen leading to heap buffer overflow. This can cause an application crash or on some platforms even the execution of remote code. If your application is used in open networks or there are untrusted nodes in the network it is highly recommend to apply the patch. This was patched with commit 033ab5b. Users of version 1.4.x should upgrade to version 1.4.3 when available. As a workaround changes of commit 033ab5b can be applied to older versions.

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 58 lines
---
 ...uffer-overflow-when-handling-message.patch | 27 +++++++++++++++++++
 package/libiec61850/libiec61850.mk            |  3 +++
 2 files changed, 30 insertions(+)
 create mode 100644 package/libiec61850/0003-COTP-fixed-possible-heap-buffer-overflow-when-handling-message.patch
package/libiec61850/0003-COTP-fixed-possible-heap-buffer-overflow-when-handling-message.patch new file +27 -0
new file mode 100644
index 0000000000..88048555b7
@@ -0,0 +1,27 @@
+From 033ab5b6488250c8c3b838f25a7cbc3e099230bb Mon Sep 17 00:00:00 2001
+From: Michael Zillgith <[email protected]>
+Date: Wed, 12 Aug 2020 07:25:37 +0200
+Subject: [PATCH] - COTP: fixed possible heap buffer overflow when handling
+ message with invalid (zero) value in length field (#250)
+
+[Retrieved from:
+https://github.com/mz-automation/libiec61850/commit/033ab5b6488250c8c3b838f25a7cbc3e099230bb]
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ src/mms/iso_cotp/cotp.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/mms/iso_cotp/cotp.c b/src/mms/iso_cotp/cotp.c
+index cbb34b36..8c37d262 100644
+--- a/src/mms/iso_cotp/cotp.c
++++ b/src/mms/iso_cotp/cotp.c
+@@ -720,6 +720,9 @@ CotpConnection_readToTpktBuffer(CotpConnection* self)
+             goto exit_waiting;
+     }
+ 
++    if (self->packetSize <= bufPos)
++        goto exit_error;
++
+     readBytes = readFromSocket(self, buffer + bufPos, self->packetSize - bufPos);
+ 
+     if (readBytes < 0)
package/libiec61850/libiec61850.mk +3 -0
index 9d527f5831..6413073805 100644
@@ -12,4 +12,7 @@ LIBIEC61850_LICENSE_FILES = COPYING
 LIBIEC61850_CONF_OPTS = -DBUILD_EXAMPLES=OFF \
 	-DBUILD_PYTHON_BINDINGS=OFF
 
+# 0003-COTP-fixed-possible-heap-buffer-overflow-when-handling-message.patch
+LIBIEC61850_IGNORE_CVES += CVE-2020-15158
+
 $(eval $(cmake-package))
Signature · 6 lines
2.29.2

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'