diff options
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-support/poppler/poppler/CVE-2025-32364.patch | 28 | ||||
| -rw-r--r-- | meta-oe/recipes-support/poppler/poppler_22.04.0.bb | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/poppler/poppler/CVE-2025-32364.patch b/meta-oe/recipes-support/poppler/poppler/CVE-2025-32364.patch new file mode 100644 index 0000000000..fa4310e6af --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/CVE-2025-32364.patch | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | From d87bc726c7cc98f8c26b60ece5f20236e9de1bc3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Albert Astals Cid <aacid@kde.org> | ||
| 3 | Date: Mon, 24 Mar 2025 00:44:54 +0100 | ||
| 4 | Subject: [PATCH] PSStack::roll: Protect against doing int = -INT_MIN | ||
| 5 | |||
| 6 | CVE: CVE-2025-32364 | ||
| 7 | Upstream-Status: Backport [https://gitlab.freedesktop.org/poppler/poppler/-/commit/d87bc726c7cc98f8c26b60ece5f20236e9de1bc3] | ||
| 8 | |||
| 9 | Signed-off-by: Yogita Urade <yogita.urade@windriver.com> | ||
| 10 | --- | ||
| 11 | poppler/Function.cc | 2 +- | ||
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/poppler/Function.cc b/poppler/Function.cc | ||
| 15 | index b97ad71..3ee99d6 100644 | ||
| 16 | --- a/poppler/Function.cc | ||
| 17 | +++ b/poppler/Function.cc | ||
| 18 | @@ -1066,7 +1066,7 @@ void PSStack::roll(int n, int j) | ||
| 19 | PSObject obj; | ||
| 20 | int i, k; | ||
| 21 | |||
| 22 | - if (unlikely(n == 0)) { | ||
| 23 | + if (unlikely(n == 0 || j == INT_MIN)) { | ||
| 24 | return; | ||
| 25 | } | ||
| 26 | if (j >= 0) { | ||
| 27 | -- | ||
| 28 | 2.40.0 | ||
diff --git a/meta-oe/recipes-support/poppler/poppler_22.04.0.bb b/meta-oe/recipes-support/poppler/poppler_22.04.0.bb index af6ee67496..2bbf542eaa 100644 --- a/meta-oe/recipes-support/poppler/poppler_22.04.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_22.04.0.bb | |||
| @@ -11,6 +11,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ | |||
| 11 | file://CVE-2024-6239-0001.patch \ | 11 | file://CVE-2024-6239-0001.patch \ |
| 12 | file://CVE-2024-6239-0002.patch \ | 12 | file://CVE-2024-6239-0002.patch \ |
| 13 | file://CVE-2024-56378.patch \ | 13 | file://CVE-2024-56378.patch \ |
| 14 | file://CVE-2025-32364.patch \ | ||
| 14 | " | 15 | " |
| 15 | SRC_URI[sha256sum] = "813fb4b90e7bda63df53205c548602bae728887a60f4048aae4dbd9b1927deff" | 16 | SRC_URI[sha256sum] = "813fb4b90e7bda63df53205c548602bae728887a60f4048aae4dbd9b1927deff" |
| 16 | 17 | ||
