summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Marko <peter.marko@siemens.com>2025-07-13 11:46:12 +0200
committerArmin Kuster <akuster808@gmail.com>2025-07-13 14:41:28 -0400
commite8682e980316e909067214b5ccb4d6138bc92a34 (patch)
tree4cc009073fe6b4c1df24f2aa160067c807b73f15
parentc982a980e98fb7cfed4ded75e82be31eff0e8bd1 (diff)
downloadmeta-openembedded-e8682e980316e909067214b5ccb4d6138bc92a34.tar.gz
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 <peter.marko@siemens.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-support/poco/poco/CVE-2025-6375.patch34
-rw-r--r--meta-oe/recipes-support/poco/poco_1.11.2.bb1
2 files changed, 35 insertions, 0 deletions
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 @@
1From 6f2f85913c191ab9ddfb8fae781f5d66afccf3bf Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= <guenter.obiltschnig@appinf.com>
3Date: Wed, 16 Apr 2025 09:15:33 +0200
4Subject: [PATCH] fix(Net): A SEGV at Net/src/MultipartReader.cpp:164:1 #4915
5 (move assertion out of ctor)
6
7CVE: CVE-2025-6375
8Upstream-Status: Backport [https://github.com/pocoproject/poco/commit/6f2f85913c191ab9ddfb8fae781f5d66afccf3bf]
9Signed-off-by: Peter Marko <peter.marko@siemens.com>
10---
11 Net/src/MultipartReader.cpp | 3 +--
12 1 file changed, 1 insertion(+), 2 deletions(-)
13
14diff --git a/Net/src/MultipartReader.cpp b/Net/src/MultipartReader.cpp
15index f3a2f2bba..f4aa27dd8 100644
16--- a/Net/src/MultipartReader.cpp
17+++ b/Net/src/MultipartReader.cpp
18@@ -36,7 +36,6 @@ MultipartStreamBuf::MultipartStreamBuf(std::istream& istr, const std::string& bo
19 _boundary(boundary),
20 _lastPart(false)
21 {
22- poco_assert (!boundary.empty() && boundary.length() < STREAM_BUFFER_SIZE - 6);
23 }
24
25
26@@ -47,7 +46,7 @@ MultipartStreamBuf::~MultipartStreamBuf()
27
28 int MultipartStreamBuf::readFromDevice(char* buffer, std::streamsize length)
29 {
30- poco_assert_dbg (length >= _boundary.length() + 6);
31+ poco_assert (!_boundary.empty() && _boundary.length() < length - 6);
32
33 static const int eof = std::char_traits<char>::eof();
34 std::streambuf& buf = *_istr.rdbuf();
diff --git a/meta-oe/recipes-support/poco/poco_1.11.2.bb b/meta-oe/recipes-support/poco/poco_1.11.2.bb
index ae8bbf87e4..075eb72a06 100644
--- a/meta-oe/recipes-support/poco/poco_1.11.2.bb
+++ b/meta-oe/recipes-support/poco/poco_1.11.2.bb
@@ -11,6 +11,7 @@ DEPENDS = "libpcre zlib"
11SRC_URI = " \ 11SRC_URI = " \
12 git://github.com/pocoproject/poco.git;branch=main;protocol=https \ 12 git://github.com/pocoproject/poco.git;branch=main;protocol=https \
13 file://run-ptest \ 13 file://run-ptest \
14 file://CVE-2025-6375.patch \
14 " 15 "
15SRCREV = "9d1c428c861f2e5ccf09149bbe8d2149720c5896" 16SRCREV = "9d1c428c861f2e5ccf09149bbe8d2149720c5896"
16 17