From e67921006fa5b0be862de0d4afe7de4d988f9d28 Mon Sep 17 00:00:00 2001 From: Peter Marko Date: Sat, 12 Jul 2025 14:56:57 +0200 Subject: [PATCH] minifi-cpp: patch spdlog CVE-2025-6140 Same patch as in spdlog recipe. Signed-off-by: Peter Marko Signed-off-by: Armin Kuster --- .../minifi-cpp/files/CVE-2025-6140.patch | 35 +++++++++++++++++++ .../minifi-cpp/minifi-cpp_0.15.0.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta-oe/recipes-extended/minifi-cpp/files/CVE-2025-6140.patch diff --git a/meta-oe/recipes-extended/minifi-cpp/files/CVE-2025-6140.patch b/meta-oe/recipes-extended/minifi-cpp/files/CVE-2025-6140.patch new file mode 100644 index 0000000000..3707d9e9c4 --- /dev/null +++ b/meta-oe/recipes-extended/minifi-cpp/files/CVE-2025-6140.patch @@ -0,0 +1,35 @@ +From 10320184df1eb4638e253a34b1eb44ce78954094 Mon Sep 17 00:00:00 2001 +From: Gabi Melman +Date: Mon, 17 Mar 2025 15:46:31 +0200 +Subject: [PATCH] Fixed issue #3360 (#3361) + +CVE: CVE-2025-6140 +Upstream-Status: Backport [https://github.com/gabime/spdlog/commit/10320184df1eb4638e253a34b1eb44ce78954094] +Signed-off-by: Peter Marko +--- + include/spdlog/pattern_formatter-inl.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/include/spdlog/pattern_formatter-inl.h b/include/spdlog/pattern_formatter-inl.h +index b53d8051..fd408ed5 100644 +--- a/include/spdlog/pattern_formatter-inl.h ++++ b/include/spdlog/pattern_formatter-inl.h +@@ -65,6 +65,9 @@ public: + pad_it(remaining_pad_); + } else if (padinfo_.truncate_) { + long new_size = static_cast(dest_.size()) + remaining_pad_; ++ if (new_size < 0) { ++ new_size = 0; ++ } + dest_.resize(static_cast(new_size)); + } + } +@@ -259,7 +262,7 @@ public: + : flag_formatter(padinfo) {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override { +- const size_t field_size = 10; ++ const size_t field_size = 8; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_mon + 1, dest); diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.15.0.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.15.0.bb index beb247c254..f84f018ea9 100644 --- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.15.0.bb +++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.15.0.bb @@ -29,6 +29,7 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;protocol=https;branch=mai file://0008-libsodium-aarch64_crypto.patch \ file://systemd-volatile.conf \ file://sysvinit-volatile.conf \ + file://CVE-2025-6140.patch;patchdir=${S}/thirdparty/spdlog-src \ " SRCREV = "9b55dc0c0f17a190f3e9ade87070a28faf542c25"