diff --git a/meta-oe/recipes-support/poppler/poppler/CVE-2025-52885.patch b/meta-oe/recipes-support/poppler/poppler/CVE-2025-52885.patch new file mode 100644 index 0000000000..a48b2c01a6 --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/CVE-2025-52885.patch @@ -0,0 +1,30 @@ +From 4ce27cc826bf90cc8dbbd8a8c87bd913cccd7ec0 Mon Sep 17 00:00:00 2001 +From: Kevin Backhouse +Date: Wed, 3 Sep 2025 14:36:54 +0100 +Subject: [PATCH] Check for duplicate entries + +CVE: CVE-2025-52885 +Upstream-Status: Backport [https://gitlab.freedesktop.org/poppler/poppler/-/commit/4ce27cc826bf90cc8dbbd8a8c87bd913cccd7ec0] + +Signed-off-by: Yogita Urade +--- + poppler/StructTreeRoot.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/poppler/StructTreeRoot.cc b/poppler/StructTreeRoot.cc +index 47adac9..10db9aa 100644 +--- a/poppler/StructTreeRoot.cc ++++ b/poppler/StructTreeRoot.cc +@@ -137,6 +137,10 @@ void StructTreeRoot::parseNumberTreeNode(Dict *node) + } + int keyVal = key.getInt(); + std::vector &vec = parentTree[keyVal]; ++ if (!vec.empty()) { ++ error(errSyntaxError, -1, "Nums item at position {0:d} is a duplicate entry for key {1:d}", i, keyVal); ++ continue; ++ } + + Object valueArray = nums.arrayGet(i + 1); + if (valueArray.isArray()) { +-- +2.40.0 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 c7287f42c5..b56a4cf6b1 100644 --- a/meta-oe/recipes-support/poppler/poppler_23.04.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_23.04.0.bb @@ -20,6 +20,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://CVE-2025-52886-0002.patch \ file://CVE-2025-50420.patch \ file://CVE-2025-43718.patch \ + file://CVE-2025-52885.patch \ " SRC_URI[sha256sum] = "b6d893dc7dcd4138b9e9df59a13c59695e50e80dc5c2cacee0674670693951a1"