zabbix: patch CVE-2025-49643

The actual patch was identified by checking the file that was modified
in the tag 6.0.42, and also by looking at the Jira item referenced by it:
the patch references DEV-4466, the same ID that is referenced in the
Jira ticket[1] referenced by the NVD report (look in the "All Activity" tab).

[1]: https://support.zabbix.com/browse/ZBX-27284

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
This commit is contained in:
Gyorgy Sarvari
2025-12-24 20:34:33 +01:00
parent 68bc6d3bbe
commit 12807d9007
2 changed files with 39 additions and 0 deletions
@@ -0,0 +1,38 @@
From 2fe5c1d761226d73fe49269eac96dcd99860efa6 Mon Sep 17 00:00:00 2001
From: Ginta Berzina <ginta.berzina@zabbix.com>
Date: Mon, 1 Sep 2025 14:10:12 +0300
Subject: [PATCH] ..F....... [DEV-4466] fixed resource usage for image resize
CVE: CVE-2025-49643
Upstream-Status: Backport [https://github.com/zabbix/zabbix/commit/aeada86d3c8231e1e173c6a7ac19ea60bf899b86]
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
---
ui/imgstore.php | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/ui/imgstore.php b/ui/imgstore.php
index 38661f5..6a616df 100644
--- a/ui/imgstore.php
+++ b/ui/imgstore.php
@@ -34,8 +34,8 @@ $fields = [
'css' => [T_ZBX_INT, O_OPT, P_SYS, null, null],
'imageid' => [T_ZBX_STR, O_OPT, P_SYS, null, null],
'iconid' => [T_ZBX_INT, O_OPT, P_SYS, DB_ID, null],
- 'width' => [T_ZBX_INT, O_OPT, P_SYS, BETWEEN(1, 2000), null],
- 'height' => [T_ZBX_INT, O_OPT, P_SYS, BETWEEN(1, 2000), null],
+ 'width' => [T_ZBX_INT, O_OPT, P_SYS, BETWEEN(1, 200), null],
+ 'height' => [T_ZBX_INT, O_OPT, P_SYS, BETWEEN(1, 200), null],
'unavailable' => [T_ZBX_INT, O_OPT, null, IN([0, 1]), null]
];
check_fields($fields);
@@ -58,10 +58,6 @@ if (isset($_REQUEST['css'])) {
foreach ($images as $image) {
$image['image'] = base64_decode($image['image']);
$ico = imagecreatefromstring($image['image']);
-
- if ($resize) {
- $ico = imageThumb($ico, $width, $height);
- }
$w = imagesx($ico);
$h = imagesy($ico);
@@ -34,6 +34,7 @@ SRC_URI = "https://cdn.zabbix.com/zabbix/sources/oldstable/5.4/${BPN}-${PV}.tar.
file://CVE-2023-32726.patch \
file://CVE-2023-32727_0001.patch \
file://CVE-2023-32727_0002.patch \
file://CVE-2025-49643.patch \
"
SRC_URI[md5sum] = "f295fd2df86143d72f6ff26e47d9e39e"