Merge pull request #17 from cisco-sbg/CLAM-2696-ole2-decrypt-overread…

…-1.4 Fix bounds check in OLE2 decryption (1.4.2)
Cisco-Talos · Jan 20, 2025 · 98882f5 · 98882f5
2 parents 0542087 + 1de7092
commit 98882f5
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,7 +22,7 @@ string(TIMESTAMP TODAY "%Y%m%d")
 set(VERSION_SUFFIX "")
 
 project( ClamAV
-         VERSION "1.4.1"
+         VERSION "1.4.2"
          DESCRIPTION "ClamAV open source email, web, and end-point anti-virus toolkit." )
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -10,7 +10,7 @@ properties(
         parameters(
             [
                 string(name: 'VERSION',
-                       defaultValue: '1.4.1',
+                       defaultValue: '1.4.2',
                        description: 'ClamAV version string'),
                 string(name: 'FRAMEWORK_BRANCH',
                        defaultValue: '1.4',

diff --git a/NEWS.md b/NEWS.md
@@ -3,6 +3,21 @@
 Note: This file refers to the official packages. Things described here may
 differ slightly from third-party binary packages.
 
+## 1.4.2
+
+ClamAV 1.4.2 is a patch release with the following fixes:
+
+- [CVE-2025-20128](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2025-20128):
+  Fixed a possible buffer overflow read bug in the OLE2 file parser that could
+  cause a denial-of-service (DoS) condition.
+
+  This issue was introduced in version 1.0.0 and affects all currently
+  supported versions. It will be fixed in:
+  - 1.4.2
+  - 1.0.8
+
+  Thank you to OSS-Fuzz for identifying this issue.
+
 ## 1.4.1
 
 ClamAV 1.4.1 is a critical patch release with the following fixes:

diff --git a/libclamav/bytecode_api.h b/libclamav/bytecode_api.h
@@ -194,6 +194,7 @@ enum FunctionalityLevels {
 
     FUNC_LEVEL_1_4   = 210, /**< LibClamAV release 1.4.0 */
     FUNC_LEVEL_1_4_1 = 211, /**< LibClamAV release 1.4.1 */
+    FUNC_LEVEL_1_4_2 = 212, /**< LibClamAV release 1.4.2 */
 };
 
 /**

diff --git a/libclamav/ole2_extract.c b/libclamav/ole2_extract.c
@@ -1836,7 +1836,7 @@ static cl_error_t handler_otf_encrypted(ole2_header_t *hdr, property_t *prop, co
             }
             bytesRead += blockSize;
 
-            for (; writeIdx <= (leftover + bytesToWrite) - 16; writeIdx += 16, decryptDstIdx += 16) {
+            for (; writeIdx + 16 <= leftover + bytesToWrite; writeIdx += 16, decryptDstIdx += 16) {
                 rijndaelDecrypt(rk, nrounds, &(buff[writeIdx]), &(decryptDst[decryptDstIdx]));
             }
 

diff --git a/libclamav/others.h b/libclamav/others.h
@@ -69,7 +69,7 @@
  * in re-enabling affected modules.
  */
 
-#define CL_FLEVEL 211
+#define CL_FLEVEL 212
 #define CL_FLEVEL_DCONF CL_FLEVEL
 #define CL_FLEVEL_SIGTOOL CL_FLEVEL
-Original file line number
+Diff line change
@@ Expand Up / @@ -194,6 +194,7 @@ enum FunctionalityLevels { @@
         FUNC_LEVEL_1_4   = 210, /**< LibClamAV release 1.4.0 */
         FUNC_LEVEL_1_4_1 = 211, /**< LibClamAV release 1.4.1 */
+        FUNC_LEVEL_1_4_2 = 212, /**< LibClamAV release 1.4.2 */
     };
     /**
@@ Expand Down @@