From fe8e7d62aac1d33f5b04a3fb4bfafc5ceaa34fe3 Mon Sep 17 00:00:00 2001 From: Vijay Anusuri Date: Fri, 10 Oct 2025 09:56:36 +0530 Subject: [PATCH] poppler: Fix CVE-2025-43718 Upstream patch: https://gitlab.freedesktop.org/poppler/poppler/-/commit/f54b815672117c250420787c8c006de98e8c7408 Reference: https://ubuntu.com/security/CVE-2025-43718 Signed-off-by: Vijay Anusuri Signed-off-by: Anuj Mittal --- .../poppler/poppler/CVE-2025-43718.patch | 31 +++++++++++++++++++ .../poppler/poppler_23.04.0.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta-oe/recipes-support/poppler/poppler/CVE-2025-43718.patch diff --git a/meta-oe/recipes-support/poppler/poppler/CVE-2025-43718.patch b/meta-oe/recipes-support/poppler/poppler/CVE-2025-43718.patch new file mode 100644 index 0000000000..dd3b9c8306 --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/CVE-2025-43718.patch @@ -0,0 +1,31 @@ +From f54b815672117c250420787c8c006de98e8c7408 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Wed, 26 Mar 2025 11:26:32 +0100 +Subject: [PATCH] Make sure regex doesn't stack overflow by limiting it + +Happens with very long pdfsubver strings when compiled with +-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -flto=auto + +Upstream-Status: Backport [https://gitlab.freedesktop.org/poppler/poppler/-/commit/f54b815672117c250420787c8c006de98e8c7408] +CVE: CVE-2025-43718 +Signed-off-by: Vijay Anusuri +--- + poppler/PDFDoc.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc +index a7c2e24..a779def 100644 +--- a/poppler/PDFDoc.cc ++++ b/poppler/PDFDoc.cc +@@ -482,7 +482,7 @@ static PDFSubtypePart pdfPartFromString(PDFSubtype subtype, const std::string &p + + static PDFSubtypeConformance pdfConformanceFromString(const std::string &pdfsubver) + { +- const std::regex regex("PDF/(?:A|X|VT|E|UA)-[[:digit:]]([[:alpha:]]+)"); ++ const std::regex regex("PDF/(?:A|X|VT|E|UA)-[[:digit:]]([[:alpha:]]{1,3})"); + std::smatch match; + PDFSubtypeConformance pdfConf = subtypeConfNone; + +-- +2.25.1 + diff --git a/meta-oe/recipes-support/poppler/poppler_23.04.0.bb b/meta-oe/recipes-support/poppler/poppler_23.04.0.bb index 7a6666936e..c7287f42c5 100644 --- a/meta-oe/recipes-support/poppler/poppler_23.04.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_23.04.0.bb @@ -19,6 +19,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://CVE-2025-52886-0001.patch \ file://CVE-2025-52886-0002.patch \ file://CVE-2025-50420.patch \ + file://CVE-2025-43718.patch \ " SRC_URI[sha256sum] = "b6d893dc7dcd4138b9e9df59a13c59695e50e80dc5c2cacee0674670693951a1"