From 205638f9edf8e1aa1fbcf28555625fe56f2701a5 Mon Sep 17 00:00:00 2001 From: Peter Marko Date: Sun, 13 Jul 2025 11:48:12 +0200 Subject: poco: patch CVE-2025-6375 Pick commit mentioned in [1]. [1] https://nvd.nist.gov/vuln/detail/CVE-2025-6375 Signed-off-by: Peter Marko Signed-off-by: Armin Kuster --- .../recipes-support/poco/poco/CVE-2025-6375.patch | 34 ++++++++++++++++++++++ meta-oe/recipes-support/poco/poco_1.12.5p2.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta-oe/recipes-support/poco/poco/CVE-2025-6375.patch diff --git a/meta-oe/recipes-support/poco/poco/CVE-2025-6375.patch b/meta-oe/recipes-support/poco/poco/CVE-2025-6375.patch new file mode 100644 index 0000000000..2ec8f819f9 --- /dev/null +++ b/meta-oe/recipes-support/poco/poco/CVE-2025-6375.patch @@ -0,0 +1,34 @@ +From 6f2f85913c191ab9ddfb8fae781f5d66afccf3bf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= +Date: Wed, 16 Apr 2025 09:15:33 +0200 +Subject: [PATCH] fix(Net): A SEGV at Net/src/MultipartReader.cpp:164:1 #4915 + (move assertion out of ctor) + +CVE: CVE-2025-6375 +Upstream-Status: Backport [https://github.com/pocoproject/poco/commit/6f2f85913c191ab9ddfb8fae781f5d66afccf3bf] +Signed-off-by: Peter Marko +--- + Net/src/MultipartReader.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Net/src/MultipartReader.cpp b/Net/src/MultipartReader.cpp +index f3a2f2bba..f4aa27dd8 100644 +--- a/Net/src/MultipartReader.cpp ++++ b/Net/src/MultipartReader.cpp +@@ -36,7 +36,6 @@ MultipartStreamBuf::MultipartStreamBuf(std::istream& istr, const std::string& bo + _boundary(boundary), + _lastPart(false) + { +- poco_assert (!boundary.empty() && boundary.length() < STREAM_BUFFER_SIZE - 6); + } + + +@@ -47,7 +46,7 @@ MultipartStreamBuf::~MultipartStreamBuf() + + int MultipartStreamBuf::readFromDevice(char* buffer, std::streamsize length) + { +- poco_assert_dbg (length >= _boundary.length() + 6); ++ poco_assert (!_boundary.empty() && _boundary.length() < length - 6); + + static const int eof = std::char_traits::eof(); + std::streambuf& buf = *_istr.rdbuf(); diff --git a/meta-oe/recipes-support/poco/poco_1.12.5p2.bb b/meta-oe/recipes-support/poco/poco_1.12.5p2.bb index dc6e65b994..86e0adf522 100644 --- a/meta-oe/recipes-support/poco/poco_1.12.5p2.bb +++ b/meta-oe/recipes-support/poco/poco_1.12.5p2.bb @@ -13,6 +13,7 @@ SRC_URI = "git://github.com/pocoproject/poco.git;branch=poco-1.12.5;protocol=htt file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \ file://run-ptest \ file://0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch \ + file://CVE-2025-6375.patch \ " SRCREV = "1d6fb3e1383e559cacbada5e3f861c0dafaf5d30" -- cgit v1.2.3-54-g00ecf