From patchwork Thu Nov 20 08:49:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Divyanshu Rathore X-Patchwork-Id: 75093 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AEA3BCF8874 for ; Thu, 20 Nov 2025 15:26:36 +0000 (UTC) Received: from PNYPR01CU001.outbound.protection.outlook.com (PNYPR01CU001.outbound.protection.outlook.com [52.101.225.33]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.30430.1763629577623277728 for ; Thu, 20 Nov 2025 01:06:18 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@bmwtechworks.in header.s=selector1 header.b=oVA4cewb; spf=pass (domain: bmwtechworks.in, ip: 52.101.225.33, mailfrom: divyanshu.rathore@bmwtechworks.in) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qQyq0iCHj58SF1Ya/Tl5ny0V03ubINtHZxCnMfZV/Zb1MhVSGJRqPB2ADw/yr67D2NZpynqtpXBNHSpxfoxVblguqjgCUrsApSgztDRdG7bxBmAMtQpfbEWnd9gxEga/KD1pqysk437673oV6+qpnXPeMSchzNba6Hih6D/0M7m4tqibZkFTK1RYblVXuA4/tAGLhqZ/hY5KxJNOzLONK3CrIab6eNVfXGdmadqKvSqQBjp0FAKg4UPpPkjzqo1T8BO7xDWRJAUZ9MyZCIK+nheRvfFlyciuzJ6bweO9xFhwrtwRacZYGS3tQ4yfEhERnjPqMEmUUhbKRKxt1D8GvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=CUA4pkL+ZHcgUuB6UtQ1gPXVGY6Yea0AWs6C+S/uqJ4=; b=PX0XP5tDd8z1zxM0wD3ygoLFaQoX0H5TMmRtI0mh5v4AnW3hBLCGkS7dxhpCDhFhQ2OWSfYTimcfThmaDcwS3QYSIAkMSpVQ0t4C+zBsHHSZlHjk9vm5RiahaBVzXIi0ULgrHwFPKdnKWAw6yPAxpxmXoe6oUqpzk2pJ8/XMle7dlWdU7G+Xwl88HFf5nNapm+o6KlqVGyy2S/P60buAqaOFLEMNiHbLqgrSpw2WzcfRYBbktsvx7YAQo3aaGlWQ7l3oeGovkn5nkBge9XZZ975VEYdCCDMGwwBFnhrLFmiEG74hREvYiu4cX53uXcGv8jxtWY9VWZsbPjVW8ObxeQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bmwtechworks.in; dmarc=pass action=none header.from=bmwtechworks.in; dkim=pass header.d=bmwtechworks.in; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmwtechworks.in; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CUA4pkL+ZHcgUuB6UtQ1gPXVGY6Yea0AWs6C+S/uqJ4=; b=oVA4cewbFY86G01/qY9w1pRrc4ePx1FTKJ/hCeH04o49kf0A3UCZSFXvRJ/sAoTWVzIDZ3uyhwCFRhibKKXv/0bhSGjQSdF4r2in5H+xNGoDl8CFHC4AXFWJyz6nUiQp8oNIAe63pkKNphSG7i7+95h3665ZvGNczck+LbL3UqBXCXD4E3pNA9bq8cL0QCXIc0alv9L0f1hRkeUBfYex3AI/rW3Ju9TyZdnpHUtMrZGtVS1zgcmVar2RTkbyngW9ZhWMwSlwp1Fy84k5v7nZSG8TJIMBVoxWwKCu3/P+tD3AYaAaQAo7XGqjMq4U6SpN+p/ejqkGE+PrFhoQPEvlJg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bmwtechworks.in; Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) by MA0P287MB1011.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:e3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.10; Thu, 20 Nov 2025 08:50:07 +0000 Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483]) by MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483%6]) with mapi id 15.20.9343.009; Thu, 20 Nov 2025 08:50:07 +0000 From: Divyanshu Rathore To: openembedded-devel@lists.openembedded.org CC: Sana.Kazi@bmwtechworks.in, Divyanshu Rathore Subject: [meta-oe][kirkstone][PATCH 01/12] ImageMagick: Fix CVE-2025-53014 Date: Thu, 20 Nov 2025 14:19:48 +0530 Message-ID: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: MA5P287CA0130.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:1d2::12) To MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MA0P287MB3378:EE_|MA0P287MB1011:EE_ X-MS-Office365-Filtering-Correlation-Id: cd0f311b-08a5-4653-bd01-08de2811ce36 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|52116014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: JhP/Yu7Ftqcp5OdpldeX2iNE7pNodr1H419+Qx/KZgU6jk2DKzFNx6BwnZqBv0oEVlZICWJo4fd4MBPjUBzOUhdfFGkEZUxSPDVxMeCHrjrWwcYZP1+XB9B7eQrg7ooamehiLoPt3wnsma1NTklufiJeflEZ1xqWGes3IM1iRO3H+4+frxRX+7+gBq2AeWjYI8AnfM/cljn6Py34P8hU1dOIbIvv1z5ygMP/fMfG0v7hGJErU1LLTUgKh/IfU87D5ZszVuyBFpRpVtS0pPkMt/Wp0dihWpIpttp++GW1/wgTOqgHhzfmf3homiXlit8xK49XBdkzkpyUHoJtGXwDWQ0gk9tys6Y2X0j41LKNMuNQYT/HjWng9+jfMXZ4iuV3Fmz7yMEtYjl1dBAIN7C/Tdftft/Y2IlSjIbWSx6npkxKNAukNSHaxeiyKL/lEwFizTh3rWn/lYzws+pbNKhsq0S6nJsBpusmbo3hz6cWupflXsK4Ih1LwweEIAjvBhBLhnk+km1RBwJszHygyWftXqNVBhtl3RfeaTOFGvLO27TZfkoR/uxW//7EUKXfGN5F9Vix2DhakVbcvU5e2Hgs2hKzLm1+PIZkUIqNX3zqdSHmo/NfiemLmwLAf9rtpBuU8H/BjgWvnnrNSNd60ppU8XvmrwDS9XJZW4NdPO7dVakdtWAqMC8YguRy4TZUFglUq9m530WtSGjnJJlyGu3nFfUxlbsE41sIX9PvwlUWB4XBKUdeGATH7nS+GerJtOb/+9iU/L1dhK2HGWD5bu6FHx/mqPZXvGUhftob25ArG0pc4V4bTgI6fuUpLS6UuYecpIvJT6UBMG4R14fWUsXmbcpzTmC+0KJQRaNZb4q731TvN3x/U1AYb5ySUYBxSubSO+3KlCVdP6cDxgacqknXZe27lVD4kthVuA6dJeciJpmzvJECjD6F8rf4619xnh7OhCy1iQ1zsOSHlhq2+1J0gKVFzJiZDNVrLkUiTEhiFFPUPcN7Vo9YF5+Qqv8Ev8oG9XyMfuqL+XJhdyo0Fv8O6P+SlwqEnK3QsPGL2TaQSyf9iMwCnze5YfiqoiCeqRDcs0G0LN7lWxY2K5LLGl2+IBV7lnU3nfaWIMfQ3EhUGNswmg01cPwd6eZMuzAcZwDZVsymMiy0pbrmYze3aF0AmMm0Z78Zpu+8nnXBuNBhVMTEzEGTAAZHACRgpxlCFVXpYs9/rSUMnw6uFruJCPsLd9A3Lzja62ARZuWSPeGYcWoN3Pkq5iJdTdwRMVmR07LsIvrR/4l4T0rD3DouHwNSYNdmdJHFGqyIrIeg0A2WNNTmlxO6JSicnVe2t25XSUx6gx9JuO0FXK/SMoa8R6C5QevlD0OXdF4BbmxyXbNKEluTHzzgHfGOJFg/lNCD2pTpN6ff37THaj6emgvKemF29QjUud/ZjiKCeH4kfeXLl2MWjW77VLEWvlDD0QQoHdcG X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MA0P287MB3378.INDP287.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(10070799003)(52116014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bRrwQxrbvtXl2Lg12KLPqEIMbFoShgUl4eo/rH0UMaDpderPlMwYgGnThVNHftMLq/dIxbT7VjZEvVqhi2GHoB/5D+elIamUz9lLz7bn94W2EvWIxPpKFF/TXQGOIbULyfE3b57v3hWHuYAqflGlLaCLOngGoZv0YsUdH7KSBLewJ78BdSmwmU8MYzIF0+W0ckhMiDu7Y6GfXgNC2EPF9L/5FZn1IOl61YHF3O3kthgAL3CD5xQiNth0rAze4itogYwuAOtctUw5bToCWQ6NiiFYtCURWgTJI2uAzW+5Klu4pGCSubYDM8Dt+gEhSonZJxg6Gd8f6USPHsos47AorM/wE+vPvQy3OJQSY9Sz9sAWF01NeU1ixzN/1h6n9Ok8nx9QJEPygkxLsqnTt22UFAX2L69leB0gSFpeyLmjeCANzeXERdHq/nSk1E9Pq4okFjfEPOAlxc1MFdOK8Qez8R3lakbrpJLvCit4qUHELubEYUTuZ2Fc71brCRHZ2sZBmps/qyyIzVBAI3xTLJg0zjDfIeacuqOIPLJf9hblukPTjihrZJVdjNpe8uO90bpuKQ4LWkA/Xb1r+r3zqwyzu5MM24+Hn48189lnQF4TKaZp0nM1FqhBoeEMD5uKm/wr5hMUyhw7QTfr8refih4itGonGg0vuBtotdqa/GUskqRDIZUhj53B9+sFTT/ncIm28NxEXjJ7+S3szxV3OabjYFip+8Qdch5Ew3wVp/Ty2zAesUJx4DiUVSPuosnwBb0LY2Rr4JA3fmE59afpryt2q5J2U0Gj2AfmsHhSIN/ZNNs/rX/Ex6y9dTNmN7dXNUEQjnFMixRNE4XXjGVzmoiSxseAVnQnVQrPyoWhXkGm8VsKQlcgCg6CF2xChAwgWUhwNOYQ97q0/7nbAZuGxVTJwlIRzdkWoC/abIMtizA0eiltlzTjLA+xrcmy4otlzdD42nwWrExaHqmuq65Odjfb+Dhi/4iplROELvmpUASW2QyEUb2MC7AVjxEe1xpaQwMIKrjYDPv0RA0izivVr6js6nBP5uMRot5xZqAbEVs0EiLRYUbgLl2M+C06R/bQjGbF1LTF51pZIFpGW5bDkHH+xGfLIfQuErpZB9CIK8lXl/Fmdt2uQeZuE4p7FjsqGdbx0spY7wjmwjJ+/UP+3aE/8MNUFu07sk+42Hy6fyQIZDJVtJ4ARfyfHRiHOc5JSD3dI0p2xJPVJMM8p84Ks8GYHnZ0RuDrDuFMbS+gVbpFEpL22rZN6odcJwgJZiUlbUUmBFC98AfurxxFsd7Pr2KutZBesk6tEpwLUhHYk1jpAoiU200nS47qoZ3IRFvXGEFYyn9X9wnGD14GL8bks4MDrvq14RzslrbbH8kDjTJF4bmpfRjSlJK4jpa91jLOv3vYSvcyikGpSND22FobXl8/jqKLCLVcsMQl7nj6HHLXfqN+eB3AMGpxhB9fQHXIqpX7fR34B6/MlUFG/NPtX9BjPrfx1u57MQ78zPXuhKc3MIysoAMNiLy7M7NkgmbBaK0E0Xmou22Y0DBDlpu6GBTjORKvFnPoOcP9lVAwJ6dK2v1HRxo+PgZxdh2D0XykovyWN/fh6DtK35/FhlzAX3m13I5bHlmX7HhasIJaSNKC0tQamqR4T7+NA9SlOeIewBeJVimovypZuL87DV2EvoAhSKEp04cxVkN7esoQ32yKg9Y= X-OriginatorOrg: bmwtechworks.in X-MS-Exchange-CrossTenant-Network-Message-Id: cd0f311b-08a5-4653-bd01-08de2811ce36 X-MS-Exchange-CrossTenant-AuthSource: MA0P287MB3378.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2025 08:50:07.3619 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 970fa6fd-1031-4cc6-8c56-488f3c61cd05 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xbZ+rS5lCEBTYEpgTtTR0j2hdfpPo0OBQtnNa5/S+yF+bHIHBAiNttwyC4LFCiu0/T0tKkq0x+3u//EonByZbnrHEa1mtcd/wS9oElnw/WAwh1T1RepfzlAzXmJjtagO X-MS-Exchange-Transport-CrossTenantHeadersStamped: MA0P287MB1011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 20 Nov 2025 15:26:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/121948 From: Divyanshu Rathore Backport the fix for CVE-2025-53014 Add below patch to fix CVE-2025-53014 0001-ImageMagick-Fix-CVE-2025-53014.patch Signed-off-by: Divyanshu Rathore --- .../0001-ImageMagick-Fix-CVE-2025-53014.patch | 32 +++++++++++++++++++ .../imagemagick/imagemagick_7.0.10.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta-oe/recipes-support/imagemagick/files/0001-ImageMagick-Fix-CVE-2025-53014.patch diff --git a/meta-oe/recipes-support/imagemagick/files/0001-ImageMagick-Fix-CVE-2025-53014.patch b/meta-oe/recipes-support/imagemagick/files/0001-ImageMagick-Fix-CVE-2025-53014.patch new file mode 100644 index 0000000000..1dcfa9d54e --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/0001-ImageMagick-Fix-CVE-2025-53014.patch @@ -0,0 +1,32 @@ +From 862fc23489af0d1ade9e1b431d057ec82763dc63 Mon Sep 17 00:00:00 2001 +From: Divyanshu Rathore +Date: Mon, 29 Sep 2025 13:56:59 +0530 +Subject: [PATCH 1/6] ImageMagick: Fix CVE-2025-53014 + +Correct out of bounds read of a single byte. +CVE: CVE-2025-53014 +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/29d82726c7ec20c07c49ba263bdcea16c2618e03.patch] + +Comment: Refreshed hunk to match latest kirkstone + +Signed-off-by: Divyanshu Rathore +--- + MagickCore/image.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/MagickCore/image.c b/MagickCore/image.c +index 34804e522..fe2a1cb5f 100644 +--- a/MagickCore/image.c ++++ b/MagickCore/image.c +@@ -1661,7 +1661,7 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, + q=(char *) p+1; + if (*q == '%') + { +- p=q+1; ++ p++; + continue; + } + field_width=0; +-- +2.34.1 + diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb index ce5489bb3e..e0d584f165 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -23,6 +23,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt file://CVE-2023-1289.patch \ file://CVE-2023-34474.patch \ file://CVE-2023-5341.patch \ + file://0001-ImageMagick-Fix-CVE-2025-53014.patch \ " SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" From patchwork Thu Nov 20 08:49:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Divyanshu Rathore X-Patchwork-Id: 75091 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9FD8DCF886A for ; Thu, 20 Nov 2025 15:26:36 +0000 (UTC) Received: from PNZPR01CU001.outbound.protection.outlook.com (PNZPR01CU001.outbound.protection.outlook.com [40.107.51.28]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.30425.1763629556591517449 for ; Thu, 20 Nov 2025 01:05:58 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@bmwtechworks.in header.s=selector1 header.b=zd5/LeVy; spf=pass (domain: bmwtechworks.in, ip: 40.107.51.28, mailfrom: divyanshu.rathore@bmwtechworks.in) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Q0Qv0qc12WelXjum9nl15nj6syk2DMJk0qhUesJS6s4CtbxzorCKf+iEWl/lRWvZcKuh7wfhyQLNCaLY3eJeo6HCc6cCebPILh2GAhvbOi6vb0hkzG3+W7PiU9QyGjraXMGB96XrjO3LXNT7kuU5TtqyDJB3T7Q/GvYpQqGTBoIsg26V6MG869/unsHKZyMxrTN3GYSVtVUYTxxDKK2IzD3tkR4gys4o//jqmTfLF42QHFFEmo+gzMUZkOeN2qvI2N6Hw/VygZAkJzLpVg7XHN/1k7Mn0OzCZfxlZxsY195sxDfQoAM6n+xxYoRAO+1TEkdTjrqmuIDO9hk7/bRiYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tCAcXDxiEXs3Mx+Hm0E3yYZNDswDJeXhRWQIjLTpyL4=; b=pyDKaJ55tidy8uG+80DW5Vm9BZbuIUNH3eEQCLAqrMjER6cqYJRsFY79UREg5F2dzDw2ZODwzx7OqR8mTD1EXuA2a5as/Ec4685sTtimRX0PIOs/MGpNpucsfj6+EhreZozC40VxFlXekPyT6VVIl00BnYqes9ZAKDN5tiMPfExbfpsihI1OamoJuJfjUqDQDisZKOZqO6wQj+qI8oabhHD3j0AF8klTFKCN370F+FIpY8mzAIsUICQtxaQUM7mLkqjX9EIcwuaOnR07i0ql7VaeSXMHwtAxM4y63wruDEXshI13C4pZjFXzdkumApwa+tXfHl5v4olXkuklvnUb4g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bmwtechworks.in; dmarc=pass action=none header.from=bmwtechworks.in; dkim=pass header.d=bmwtechworks.in; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmwtechworks.in; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tCAcXDxiEXs3Mx+Hm0E3yYZNDswDJeXhRWQIjLTpyL4=; b=zd5/LeVygRyLReAvYVM+ECYMgF/SrHYVcsVSqrj2visZRF5OkV41t1ZJblDkmXDmyrvatX1A83aWC3jxWy7g77aNk5Y/Igw+KQFLjx/7xD+j8gwabB+y0Dv2vPOzrwvr8/CTMCwSCQ6NQ4sjbtLTj/i+n7hHhAecg0I/fHm4SiFw4dGdqTJLC44B4Zo4scOg3mqFcXUe6pKPiNPnC+FQiVCasZYhLo8Y042MvU9YvWx1fOLTdlw4Y+JWCY8298tnb2JZjCsk+Pl9Ln0BMAbMEEG31tnPQUzd7Kbp4jUxSHenG8qBk/WAq6JSrzQStVwtBXq37szKMnL6c5qEdu/Xfw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bmwtechworks.in; Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) by MA0P287MB1011.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:e3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.10; Thu, 20 Nov 2025 08:50:09 +0000 Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483]) by MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483%6]) with mapi id 15.20.9343.009; Thu, 20 Nov 2025 08:50:09 +0000 From: Divyanshu Rathore To: openembedded-devel@lists.openembedded.org CC: Sana.Kazi@bmwtechworks.in, Divyanshu Rathore Subject: [meta-oe][kirkstone][PATCH 02/12] ImageMagick: Fix CVE-2025-53101 Date: Thu, 20 Nov 2025 14:19:49 +0530 Message-ID: <20251120084959.51761-2-Divyanshu.Rathore@bmwtechworks.in> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> References: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> X-ClientProxiedBy: MA5P287CA0130.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:1d2::12) To MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MA0P287MB3378:EE_|MA0P287MB1011:EE_ X-MS-Office365-Filtering-Correlation-Id: 83c98aed-bd5e-42a7-cb44-08de2811cf38 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|52116014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: 7iCuQmWtFhHn18nrygQZ8mbCeJswIRUGltTvtEZWPuiuZvc7kJeCO2dutmc2DrcMo4pqwaOztsKkh9IBrtk28uF3OAlPY9DI91XrcElgozL8sE1vLvstZWtzHmATr8igUM4MFDaml+viANfz/AoF1n14I1TrYCxo+7AnntMirX/8l7gE5Vx/7sm7tgI0fy8TbolrSHxh4+9zYK1uBGW3T+WPyQvOabR85mRe5qyUe+tOdT25YbC5xxnJx2hZFHSf8pMDj0XyhyxqgTVib72ZXCvC2PUaFSaXTdkZYiyAaB32CPqJBpYiBQSA2vpVA0MYpALOVzoldQsCDJhS0/Hceqf/2ZIhXIQOkXZat10jqB5FrkyqLM6QpTYwxO/4omX3e468KdBBr81XKwjO7ZBO06XPSG/MRGih/0E4yUkTMUywuIq9m/vDcKI8SxNnydoZpKIa15QArKOwEu9MGl+D4NR+/42NnYUqLcfLcCI1DyDam/auGQRMJH3mBJu0/+krCLO1wuGj8nyxAZWlfbYh4nEZPe8DdhZgzTSEg1z0dPFrhf0cmjAMNM3wh5QMhlcUsY1V+O5b45hHk8eoHs+RU/4NvzUS+BBmhFnTDdG5bNYqO+owsV/H7wUK6sodAEfBAGzMLixSrAy81M8eBaQMWLSso1FO2bhcQ2pCe7keo+Yrqj8drSKeTiDvXDSy+dIO+Jr0j8uAQbV1zfJfRpohNjxnfta6soQjQgOqqc381QgN8bjv2fBzjNq0hqUWztt3s9dbyjkbVAvtKRAc0cnOqoG7uxp6EDC6FNdIahLOnVSflkrmr7tf2QhRCLHXg5iFnkYKwBr0OI/Vvra3lGPjg3OSR83FpHrvGxXCe2mMKfJiAIo//khDKu8Aui/vD/Kf1z9Zan4E0DLiFg0aq27dLWBf3IGX506xBOWGtvxsH56J+e5qtd+D/Wfo+TuWTaU8a0HIsZaLYx9Zv86iDqAUIAi268nkNM/r/YvfRM4BC8iwAiP493MB3IgQg7LURfjvn1RcWxu9X4TwyU5eTDCP1A41P/5tkGuwVoTSuy6YRyHVOTp+XA1CysbRVekfNhIXoGcxli6R169TOQ8bWGz4vIgdlx+/ByFaQ0+djYdCPmOqwp8zkzwyXR24xZLMnGwGNM2JYGAIm32b5Cl0i4/v/Tf5pJP89qwV2fhD+KCYnSr3u26h+UXlGmel5e6tJrheNXUNREKMVRZyJWziHFxzWiRju6R6MCewqEaHzj3ojUzTi3rCngfOY7o9e0LfQUUexe9bXsDZ5UrCltxShiSNEtGmOF8IyA2OtgW0qQVKDm6N/r7rgeqxf8XI+pNq1BI3SsY8t6RAHV/lUkirwnn6U/Nm6lELtXOhC2rcJk9pYBHXWLF7O0V5B7EQWjZetAuWC9rEy3z7raNJs+bxfaJ/RbKWXDSG09PAUOl149TcDeMM5hT3IAofubrHtg8hU+D2 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MA0P287MB3378.INDP287.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(10070799003)(52116014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DD2PM/hoFEBdVl1692eiQZqjiypD3oUIKi+fmuZeMkhSCeS4+XCIoMwSWpdoJY6VaVmuRAWY/36LkvwrOmuSI2qoUGRpnf4QjhYvkXge9dLb4FNr/GVJlU5L8pYLQnIgOTtZLvulG0VROCENt+IWDI72o+XbdIYLZSd8kJUbjTTmCwyceUuENu8pGizRSW3Vs2BTqdr+7oqWWPlqVr5xBaZkSVC0efEI/j/ZfkYAVwqMCx1qAeuxkDYY9bLGf8u4kdUhL+boDZSzvm1mOB3gEbUooBaUxPCiuTcbX2bl4t90TBQ0d5UNYwpzxXwoppYBtPFKEIHG/+TgzpLIccpnTpgnJ3L3oaMV997B+NcXIPyXEyn6RC6Mxtvai9CmKDcdkmpKGfVT5lYMuB9vIx1IEWu3aO7fGMq96wYTfc7kTWvyZpSfwNMHQgoo/Bfm+qOEvaf5dtAtUKhijikAK9SGwps8zJ4LDqryWCxfCdH2Z4uhN3loqpg9T/8Sxyvyrom1EgY778YSLlxMOiD6NhP785EkTIPEAXjznRCQpVItNx+Glg2637OEEyMQCZ+jWGk51SfETj5ilH0AnL0u16opR8DiuiXFNobUsgiEX7pqhmZ0KZDZgjQ5MKwEE2AeVqfrQ1oCgGnkpvcttl9+O2oow6jUXzoHwOKX1eHVPxR0R8PFKOlewgVis375Fs7+Bzp1phQWA2vxSrOoS2takmQCJrcLxcC5iY4mDTAIQSYyq1lytOGIZMY4GhDIt6se5IeidIrnVcQHZmLRotc2O3zGuNxfmw5gI4/fJl8YQcVidiFfmhlGKljf2KmRWlGWeDvenTgCM2KXJNTLpV1J7xMVuKFSHTfqadWNVytuHVE6KpGWwE2pyiB6Rlsx+B+wQI7vqUo0UNneyYMnF0h1jympxZWMTyViESC8zE4h2fx1GsXu/pdgbneiDZet5XbOKqzec7SG140585ZPoSkHSKjoXZjz+gIynqjln78Iu3pEgL4xLQd1oieHfKpcWhntmPTmSk63oJboUwhxWmaLWr6vQzNgFepWAdqQ2XaLS/P7lqy3K/Z83BfFnl4s3BvyHwqP39rIqTT875XLIlwRHkQqKjfqpoIdS/A7vJ+biSJnTGrAT7eVzkjVBSETC7gNAOqESWVh9/eCelt6VrZ6Xo+ykbS31KkqafD21qQYhxpH6RzKy8Am7NmObx0QSt6Xi71aVNiLd9Ya8zUQ4N6BSLDekIrJoP+iCkKWM85ixyV5delRj9eMxoexQ5l4fXokciYuLAKVN96DjPHysUCbTvy41VnDGCZ2XXWsz1pgz56p7jMEEE4hIITZZN/40d1sgAWdR1Qy4tLsxEEI17RzjklB62lYoCQg3J2GyFyzsC4dyVW6bSFOBRLH50MDebCyiOBOn9cp/NXnPD64phFNiu8fZSysn4g4kog2qGjznCX/HdqLKEpJJROLEO9DENXjy9njUvr+5+S3NrPZJn57wnwSjoqcWCHm4Fq4zsVx7txbSTPEvLirwoU/qO+/Q2kpH7l8XRIsTZGXDg/wnybPZFsrl1XqGQMDvf7i3WViFGbDb2U+B23GvL/JbRmT+/Fwgvl7geXEZAh+bl11K0Yhob6nGss/zK0GAjck+nO/eCA4JqNsetntC6NjmOBTGs8Cgk/3ybzXPhH0HUhDK1XExoxfObaLSbtsvkyJz3tHBgulAAs= X-OriginatorOrg: bmwtechworks.in X-MS-Exchange-CrossTenant-Network-Message-Id: 83c98aed-bd5e-42a7-cb44-08de2811cf38 X-MS-Exchange-CrossTenant-AuthSource: MA0P287MB3378.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2025 08:50:09.0242 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 970fa6fd-1031-4cc6-8c56-488f3c61cd05 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: cB5ew62ln5EjY7KGoCTloDNAdtiIL/uv3EmwJoCb7zR59k0X6wfnx46VCFCkDx66j6lamQ681TYLdhPKO4jnFRhSzE4KERAVK2yfs7dxKoyaq8XIoExsoQAgpyKXmaIn X-MS-Exchange-Transport-CrossTenantHeadersStamped: MA0P287MB1011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 20 Nov 2025 15:26:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/121945 From: Divyanshu Rathore Backport the fix for CVE-2025-53101 Add below patch to fix 0002-ImageMagick-Fix-CVE-2025-53101.patch Signed-off-by: Divyanshu Rathore --- .../0002-ImageMagick-Fix-CVE-2025-53101.patch | 60 +++++++++++++++++++ .../imagemagick/imagemagick_7.0.10.bb | 1 + 2 files changed, 61 insertions(+) create mode 100644 meta-oe/recipes-support/imagemagick/files/0002-ImageMagick-Fix-CVE-2025-53101.patch diff --git a/meta-oe/recipes-support/imagemagick/files/0002-ImageMagick-Fix-CVE-2025-53101.patch b/meta-oe/recipes-support/imagemagick/files/0002-ImageMagick-Fix-CVE-2025-53101.patch new file mode 100644 index 0000000000..3b31886ae1 --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/0002-ImageMagick-Fix-CVE-2025-53101.patch @@ -0,0 +1,60 @@ +From cb29701ae86c2a5b46bdf705bf0df7db152eda68 Mon Sep 17 00:00:00 2001 +From: Divyanshu Rathore +Date: Wed, 5 Nov 2025 12:54:53 +0530 +Subject: [PATCH 6/8] ImageMagick: Fix CVE-2025-53101 + +CVE: CVE-2025-53101 +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/66dc8f51c11b0ae1f1cdeacd381c3e9a4de69774] +Reference: https://github.com/ImageMagick/ImageMagick/security/advisories/GHSA-qh3h-j545-h8c9 + +Comment: Refreshed hunk to match latest kirkstone + +Signed-off-by: Divyanshu Rathore +--- + MagickCore/image.c | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/MagickCore/image.c b/MagickCore/image.c +index 34804e522..bf9d53325 100644 +--- a/MagickCore/image.c ++++ b/MagickCore/image.c +@@ -1650,7 +1650,6 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, + *p; + + ssize_t +- field_width, + offset; + + canonical=MagickFalse; +@@ -1664,21 +1663,23 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, + p=q+1; + continue; + } +- field_width=0; +- if (*q == '0') +- field_width=(ssize_t) strtol(q,&q,10); + switch (*q) + { + case 'd': + case 'o': + case 'x': + { ++ ssize_t ++ count; ++ + q++; + c=(*q); + *q='\0'; +- (void) FormatLocaleString(filename+(p-format-offset),(size_t) ++ count=FormatLocaleString(filename+(p-format-offset),(size_t) + (MagickPathExtent-(p-format-offset)),p,value); +- offset+=(4-field_width); ++ if ((count <= 0) || (count > (MagickPathExtent-(p-format-offset)))) ++ return(0); ++ offset+=(ssize_t) ((q-p)-count); + *q=c; + (void) ConcatenateMagickString(filename,q,MagickPathExtent); + canonical=MagickTrue; +-- +2.34.1 + diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb index e0d584f165..9744e1e919 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -24,6 +24,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt file://CVE-2023-34474.patch \ file://CVE-2023-5341.patch \ file://0001-ImageMagick-Fix-CVE-2025-53014.patch \ + file://0002-ImageMagick-Fix-CVE-2025-53101.patch \ " SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" From patchwork Thu Nov 20 08:49:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Divyanshu Rathore X-Patchwork-Id: 75092 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A066DCF886F for ; Thu, 20 Nov 2025 15:26:36 +0000 (UTC) Received: from PNZPR01CU001.outbound.protection.outlook.com (PNZPR01CU001.outbound.protection.outlook.com [40.107.51.28]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.30425.1763629556591517449 for ; Thu, 20 Nov 2025 01:05:57 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@bmwtechworks.in header.s=selector1 header.b=qAIy3abz; spf=pass (domain: bmwtechworks.in, ip: 40.107.51.28, mailfrom: divyanshu.rathore@bmwtechworks.in) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IKUrCPZ5Ka656zuH+fngbKUMBMX6WdfGKfJbx3dzsTuq6axmy5ilmXpUwPMyXMgMdJDSYdC66LssJkS2/lLDWtD5IIft8LnUeAx8N367dYA1HY4zKQxANUQlLLIWaiNn/m6VGFl9BSAbwn5lBTQ+PB78cLFS0b7RdUbLGVzH+hLZ2u4pfjyYaa6M0wDHi7CHtQ4pY4HDZHC5mKSoR+cR2Stf2yTdBeP9xn5T1R1BETfUgpD3MW9q5gdM+kius8/NGR5/+6nPM+5aKVuRvrhmOKZ+Y8uXTVhaKcgyDODLTSki52Zc+F4Md6FKQDQbUdYAzOY9B56dIPIk2Z6lRsjnLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=A/sSxgmg+t7Wru7RSuR3/E/kv8iUA7VnUBGlkcyYHto=; b=tPSS0VmTvkkt6qV1zIB9oK6xt77uWxfdDtd51bDLUPAVzyH30DTBh/ydM+D0Wt2jXMDxfgPd6kViCuK3csAI8HuaVSUQ4PylrV20QC5ZpsMomCCVQIDvb8N59gPMB7Wu0lS3noH6wJkAIPBYYWQ1eQTTLWxQphLSqopoJ3fkrVs2rijSXO23Emg2dfmKaT0vdLVW/kZXwG4SPk4lo540qSHSxYS15HZpf+MpIu+wWg5haEFjmCsi+nzzULfNfR7fQDmInE5MLeVCjP/9ZTwvl4pF5B3uupm21wlTiHdvD2rV77eYVJcKnRIg0Ib726O/OU1Xf+WcaCQcr3J+MTJLQw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bmwtechworks.in; dmarc=pass action=none header.from=bmwtechworks.in; dkim=pass header.d=bmwtechworks.in; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmwtechworks.in; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=A/sSxgmg+t7Wru7RSuR3/E/kv8iUA7VnUBGlkcyYHto=; b=qAIy3abzyi3KlqvYLDIbnARfhxNk8MTn5upwbaqEOUuKKqcdqgK4sPSPl2DKKknCAaq/+gM8kywcAl4kpPHXt/oi7pU5GOtCDQwNnHIRZsnXemdefE3QqGdjnAJYP1mPIBZJT2bFasK29YkWgQp/GDAjPRogw+/yuUqLjCG06p/5AlF1OElkdpSWbOuyvb5YNBzITiaL2CyuMnzmDBRAOkdiv+AapdToIdKymg944IcHRFm68lbm4GEcRzxlsVV4VRlcU+2Z0mOf8Uot7+o4bbb34guZ+2TtygR35xXCKfgpQIwsvcztC8EkMgZmUMK0sTRQmlsZSi6znAyEERbbUw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bmwtechworks.in; Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) by MA0P287MB1011.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:e3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.10; Thu, 20 Nov 2025 08:50:10 +0000 Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483]) by MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483%6]) with mapi id 15.20.9343.009; Thu, 20 Nov 2025 08:50:10 +0000 From: Divyanshu Rathore To: openembedded-devel@lists.openembedded.org CC: Sana.Kazi@bmwtechworks.in, Divyanshu Rathore Subject: [meta-oe][kirkstone][PATCH 03/12] ImageMagick: Fix CVE-2025-55160 Date: Thu, 20 Nov 2025 14:19:50 +0530 Message-ID: <20251120084959.51761-3-Divyanshu.Rathore@bmwtechworks.in> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> References: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> X-ClientProxiedBy: MA5P287CA0130.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:1d2::12) To MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MA0P287MB3378:EE_|MA0P287MB1011:EE_ X-MS-Office365-Filtering-Correlation-Id: addea6d0-8075-4a8b-2dd4-08de2811d002 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|52116014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: 2UY44l/sWzrqTMxGFFaMFwffmecoyLreJti8df7Ljv31qwWUAvxClJmI4Ls/frP4c9GLs5jSIEnAOU2N+atBRVm8+20/opFwvaM036gYp1gTV2Oswe5cMVLAuY3dfu0Z+6Bk9LFcQr0yTJVnI89rbi4XdTfeJD/O5Xu6ch9ruwluQnYTyUocZImg5EAlHFDlD9qLvQ1UK+1JT6jDiXVIMdvbdTIPNr0pVl4OIMNAcIFH1l86TY6U9MGj1HaDcHZLwtZHALvsw2f+96MXUxJ8CLstY1ovjmMqlf6m3urDCrkWVAuq3VPGlRDt5+uxGjB2nHTByXqrl7Mf1JjZtMjGsqdLu9Sui4h0tw5s1G+bu3TF0Ydq/EcGo2Xp9hZZktWX0x/auRpl0ExTs3c9Lv661qPSkV/Ef4GrimgyzZxg/Q/TPcHr+F1/blq+zyXyQir41Cz9HGABeTdH1SoUL0qoVoIT9aEU1Qu1eWnIt8qn+WWjM1u8SLHzBZsf0r5cvPSYIBftesEr1eboKUktJdxCHZZ3Jq/Dp+aSDtnY7p2IaYVNw326/8mvU6/tjTybaBPZSsYBDz+mIfkLQOxnhlrBR/nv4bZeEn/6mBjXdD9wIdZ+WJewOngJGkwYw/1xZ25jND6zZhoxLMd01G/L0mtueTa3usQ83n3HZrXKLXsra58+j4pE0Hu/aEHW7fn4Eavc6jIoGSThkXnevlq4oCe6k0uTxikukn8E6y7cm5m4iAUiXiKlgdUkbXG/1Xl3smLfRAdodcv8FoTLZ85JNlISZs1MkGRcefy3Cx13obmF4gxgSil/YBMVsKfH8xR9WnK2G33zjumqbIv4P++LbQJVyNFICy3fo4gn88C5TvMhU33iWe5mhx0vMun/cJUaQL6FhLuaJ+akXjRZucyA8AN+t0O5DZDlWvpWaH4na8wupsMLwlbCgT+F6zDWH6pPAIdZuHnsebwH1M9VBKN2J57NeF1FdwFNYyR98rh9BWK/+HzA6KLGV8jIddH6q9nW0wnxl43xFqlOiB6jJDNnikJ4KhC/UG5nXUo0QRMq8XEgGVUFKCsRsP75Eg4bZv3vo1vxpVGKV3actb13Tus/tuPawxkC2JlumjYj9547gvpjkJrD+ztoj6g7wA7jJvUB31RO9IWhf51DggQ6sovx7G6SztDir99VInw/5zrrCbME4xKFWTZ67BSvOyAHgWabt3mHIdW9tyOYgMhpd7Kp8kqgdRyJh4g332C9dZcXtXPRWQpELi7fnyk3oh0Kx5aHnYEE+BWBAR7ju9e7ROj+k3JwTACJ1i4g1D0iGp5zyn7Azrch7KPYPyVzTD2F0ggkN2E7pE/mV+IsnDRQbKdCJtGIuLTQvYkG/IGOlmjBYWRi/9162BagzMuQNhNiRphJ5qq/JaRkOcijpF7JJ1U08iCMiNlD3XD9c4SMomVZNnAuU5JOJcNgHrN9zOwE4d7XNLA6dMRXUPNyQy2XaT0DmmCp2w== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MA0P287MB3378.INDP287.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(10070799003)(52116014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bskCnSXhzm+8YUVjg3W5Y7P+KJDAkcoQzvGtbFlFHMmBgyy7UpnuWOJ3E3D3TMNIZKjI0wCuuUFlLn4AkpUen1Pna0gGPuO+5FdIY6N+qdWIAr0rowJGL2YLBDc7G5dE0wqbgQWcqDywmB/4Q5ffP5hjUNCs4T9Hctgb3KaCufiKY4eux1i4+k1JNbv6pm/KJljaot1bKaGXPdB2xJ5X+muY5VBLFHFdvFpNHPHdtHHm7r+sZpMPuavQB+lg1dJubXJeWMkISSwnexRYd8ZfVpIHx+lBGVrEo0l4SvwSYPkDsmcHAc8Uu7AzXClZc+rOin9yySzDrG3KB+EmaXLPtMMHBpuxp2/kZACeNAKiPJ3WyIAYA3HUXP/r+90XQoNah2iBx+zg8oQIokQ+Bq7QQ6bTHwyieiB1Oa5THdpkcRcvb4R7m4LVEh2Q02yDhbbYFn7Yi4es6hvbXKt8ia9e+fjJ5//b5LiDZi7BXFpP9X88vstLvcjfhXC5nKpUbFIbDI1y0odw3DFD8aJc8uyiYf0l6ZtjhORKFit2oaKVE9ChK52d1e/gm1boddXmt3cnGPYjFcgUdnay2a/O9IgD6nDbgsG6JwGoZVaAVKB1T3l5CQULOl0vJNqT9489UEgXVczb85jwqhXnbTtzhHlCPtL6JMHCDSRsiyPiv1BKiQLhO7OyxwTBKK4a69l33gYhXzouSdfDsq3ATygZLOQdtWkvFjTOpSklPjYUWcQWETzqT0Vvi9ZyFZvUR6WhL/b3MDuK07DncOInqpts3eoP08ZbYT0KQG6UNlcsnHtYF4MABAOeiArcqrO5fDPaAi99k0r0bS8gK4foHYVG1WwKodCCaenak+wjvxaKsY9Y/JPTkcfi/HitXfY1WxuSByj9Ol/zvAi1YogoTPUMDi23QUmLzl8iYyjz0SOVfVRQWzaoy01UzL9U1Knd+DP4IG3YZoMHHAy8638uFMkNl/8avRb3lRJB6G12D0EAxvQ7ouU44p8uWiV4iypFtUVlxxkdePbQ0H7Axy5B3QNjUUcnroKB5AxJzmfMQ/pcW/BuFRDg2k3/hrSk6j8xLZBoZ3V8zc6ST6B/V0ZJaBfdUPYbOrrHbI6aYyNIyjtFxAmiRHn70JIB9YohDvktU9ZH1eLNF6rKQpGaiXTqPcSVTYLtf+/amYDSpU0J21LxD6ZSgeJA8O8nrp8ae1DdEuboqZw8XAgcFG/FFaJNa9j3avwNOFcaXLrheNPs3+mbCItrAvreRfzFniTyWSaLza6GazRIaGUsI/rSUd85SRXSlJ1Cas49ZSf3x6wxYitOVaTzpoLFZvnNj706K8SRwyGdG6DO3f82/u7hXS/Xce15zyQgz+vVyyW9nll9tajY4Jnkcd3YkB7iPM/ahorVgVmUkvu1af9FnlHuabR75Drl9GiNSLoDSDbPAc+PceD34pklUXUe2HbPJ9x7Cjr86CqmjwvFiBZ6jaiCJ5aKIrEFCOrBvuGXxi6sLOPe7UYA9NO2NBO6tm8ZZaUhu9UDdNtnErADWsixu8fDnT/NsA4lQ/8TNR3P/oIWnCbe+D1PytqOnnh/yQS+mlBrwShEIujofxNLAp+kJ3s8gsJmowNRW6DthCTMcdGOH9+6rXKzZoWnxRxQ0/uUWI0SXd96IZw89vSxCmkmTmVUmEY4h0pJABmgfV83LYGD/rnn/ahl8YxS7gU= X-OriginatorOrg: bmwtechworks.in X-MS-Exchange-CrossTenant-Network-Message-Id: addea6d0-8075-4a8b-2dd4-08de2811d002 X-MS-Exchange-CrossTenant-AuthSource: MA0P287MB3378.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2025 08:50:10.3444 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 970fa6fd-1031-4cc6-8c56-488f3c61cd05 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: eBLkqK9QGeeffP7q2SJCfFG9WnGdnBPxqZFBz30DRbkYqiTSf4IY3axiKLFs12KXKsIylNaaPh4PbNMeltPaUX9aDRrDZnFnU2hmfKfHuPOSeAbhCQ1yWDBmaTAIt9JZ X-MS-Exchange-Transport-CrossTenantHeadersStamped: MA0P287MB1011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 20 Nov 2025 15:26:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/121944 From: Divyanshu Rathore Backport the fix for CVE-2025-55160 Add below patch to fix 0003-ImageMagick-Fix-CVE-2025-55160.patch Signed-off-by: Divyanshu Rathore --- .../0003-ImageMagick-Fix-CVE-2025-55160.patch | 165 ++++++++++++++++++ .../imagemagick/imagemagick_7.0.10.bb | 1 + 2 files changed, 166 insertions(+) create mode 100644 meta-oe/recipes-support/imagemagick/files/0003-ImageMagick-Fix-CVE-2025-55160.patch diff --git a/meta-oe/recipes-support/imagemagick/files/0003-ImageMagick-Fix-CVE-2025-55160.patch b/meta-oe/recipes-support/imagemagick/files/0003-ImageMagick-Fix-CVE-2025-55160.patch new file mode 100644 index 0000000000..c548d95f54 --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/0003-ImageMagick-Fix-CVE-2025-55160.patch @@ -0,0 +1,165 @@ +From 4335d1fe991e77dd6279e7adfbe5d976dc769c24 Mon Sep 17 00:00:00 2001 +From: Divyanshu Rathore +Date: Fri, 3 Oct 2025 20:36:28 +0530 +Subject: [PATCH 3/6] ImageMagick: Fix CVE-2025-55160 + +CVE: CVE-2025-55160 +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/63d8769dd6a8f32f4096c71be9e08a2c081e47da] +Reference: https://github.com/ImageMagick/ImageMagick/security/advisories/GHSA-6hgw-6x87-578x + +Comment: Refreshed hunk to match latest kirkstone + +Signed-off-by: Divyanshu Rathore +--- + MagickCore/artifact.c | 17 ++++++++++++++++- + MagickCore/option.c | 17 ++++++++++++++++- + MagickCore/profile.c | 19 ++++++++++++++++++- + MagickCore/property.c | 18 ++++++++++++++++-- + 4 files changed, 66 insertions(+), 5 deletions(-) + +diff --git a/MagickCore/artifact.c b/MagickCore/artifact.c +index 0c376ed98..a27ebb8ec 100644 +--- a/MagickCore/artifact.c ++++ b/MagickCore/artifact.c +@@ -99,6 +99,21 @@ + % o clone_image: the source image for artifacts to clone. + % + */ ++ ++typedef char ++ *(*CloneKeyFunc)(const char *), ++ *(*CloneValueFunc)(const char *); ++ ++static inline void *CloneArtifactKey(void *key) ++{ ++ return((void *) ((CloneKeyFunc) ConstantString)((const char *) key)); ++} ++ ++static inline void *CloneArtifactValue(void *value) ++{ ++ return((void *) ((CloneValueFunc) ConstantString)((const char *) value)); ++} ++ + MagickExport MagickBooleanType CloneImageArtifacts(Image *image, + const Image *clone_image) + { +@@ -116,7 +131,7 @@ MagickExport MagickBooleanType CloneImageArtifacts(Image *image, + if (image->artifacts != (void *) NULL) + DestroyImageArtifacts(image); + image->artifacts=CloneSplayTree((SplayTreeInfo *) clone_image->artifacts, +- (void *(*)(void *)) ConstantString,(void *(*)(void *)) ConstantString); ++ CloneArtifactKey,CloneArtifactValue); + } + return(MagickTrue); + } +diff --git a/MagickCore/option.c b/MagickCore/option.c +index 99b43ac93..7047cf207 100644 +--- a/MagickCore/option.c ++++ b/MagickCore/option.c +@@ -2187,6 +2187,21 @@ static const OptionInfo + % o clone_info: the source image info for options to clone. + % + */ ++ ++typedef char ++ *(*CloneKeyFunc)(const char *), ++ *(*CloneValueFunc)(const char *); ++ ++static inline void *CloneOptionKey(void *key) ++{ ++ return((void *) ((CloneKeyFunc) ConstantString)((const char *) key)); ++} ++ ++static inline void *CloneOptionValue(void *value) ++{ ++ return((void *) ((CloneValueFunc) ConstantString)((const char *) value)); ++} ++ + MagickExport MagickBooleanType CloneImageOptions(ImageInfo *image_info, + const ImageInfo *clone_info) + { +@@ -2202,7 +2217,7 @@ MagickExport MagickBooleanType CloneImageOptions(ImageInfo *image_info, + if (image_info->options != (void *) NULL) + DestroyImageOptions(image_info); + image_info->options=CloneSplayTree((SplayTreeInfo *) clone_info->options, +- (void *(*)(void *)) ConstantString,(void *(*)(void *)) ConstantString); ++ CloneOptionKey,CloneOptionValue); + } + return(MagickTrue); + } +diff --git a/MagickCore/profile.c b/MagickCore/profile.c +index d8924f7e2..254a11b77 100644 +--- a/MagickCore/profile.c ++++ b/MagickCore/profile.c +@@ -149,6 +149,23 @@ typedef struct _CMSExceptionInfo + % o clone_image: the clone image. + % + */ ++ ++typedef char ++ *(*CloneKeyFunc)(const char *); ++ ++typedef StringInfo ++ *(*CloneValueFunc)(const StringInfo *); ++ ++static inline void *CloneProfileKey(void *key) ++{ ++ return((void *) ((CloneKeyFunc) ConstantString)((const char *) key)); ++} ++ ++static inline void *CloneProfileValue(void *value) ++{ ++ return((void *) ((CloneValueFunc) CloneStringInfo)((const StringInfo *) value)); ++} ++ + MagickExport MagickBooleanType CloneImageProfiles(Image *image, + const Image *clone_image) + { +@@ -163,7 +180,7 @@ MagickExport MagickBooleanType CloneImageProfiles(Image *image, + if (image->profiles != (void *) NULL) + DestroyImageProfiles(image); + image->profiles=CloneSplayTree((SplayTreeInfo *) clone_image->profiles, +- (void *(*)(void *)) ConstantString,(void *(*)(void *)) CloneStringInfo); ++ CloneProfileKey,CloneProfileValue); + } + return(MagickTrue); + } +diff --git a/MagickCore/property.c b/MagickCore/property.c +index 9626d079e..1b42adaee 100644 +--- a/MagickCore/property.c ++++ b/MagickCore/property.c +@@ -131,6 +131,21 @@ + % o clone_image: the clone image. + % + */ ++ ++typedef char ++ *(*CloneKeyFunc)(const char *), ++ *(*CloneValueFunc)(const char *); ++ ++static inline void *ClonePropertyKey(void *key) ++{ ++ return((void *) ((CloneKeyFunc) ConstantString)((const char *) key)); ++} ++ ++static inline void *ClonePropertyValue(void *value) ++{ ++ return((void *) ((CloneValueFunc) ConstantString)((const char *) value)); ++} ++ + MagickExport MagickBooleanType CloneImageProperties(Image *image, + const Image *clone_image) + { +@@ -194,8 +209,7 @@ MagickExport MagickBooleanType CloneImageProperties(Image *image, + if (image->properties != (void *) NULL) + DestroyImageProperties(image); + image->properties=CloneSplayTree((SplayTreeInfo *) +- clone_image->properties,(void *(*)(void *)) ConstantString, +- (void *(*)(void *)) ConstantString); ++ clone_image->properties,ClonePropertyKey,ClonePropertyValue); + } + return(MagickTrue); + } +-- +2.34.1 + diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb index 9744e1e919..f41e471f0e 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -25,6 +25,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt file://CVE-2023-5341.patch \ file://0001-ImageMagick-Fix-CVE-2025-53014.patch \ file://0002-ImageMagick-Fix-CVE-2025-53101.patch \ + file://0003-ImageMagick-Fix-CVE-2025-55160.patch \ " SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" From patchwork Thu Nov 20 08:49:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Divyanshu Rathore X-Patchwork-Id: 75098 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA56CCF887D for ; Thu, 20 Nov 2025 15:26:36 +0000 (UTC) Received: from MA0PR01CU009.outbound.protection.outlook.com (MA0PR01CU009.outbound.protection.outlook.com [52.101.227.41]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.30081.1763628751698612110 for ; Thu, 20 Nov 2025 00:52:34 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@bmwtechworks.in header.s=selector1 header.b=WNb9WH92; spf=pass (domain: bmwtechworks.in, ip: 52.101.227.41, mailfrom: divyanshu.rathore@bmwtechworks.in) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=C2OMBf/wJTEqr+bMeA1zSqSdBZ6UABcJjjf1JVvmiinxwTNSPFPKNdJSXDZTEOxssF1kNmfDIq63zMFwEGSzsXCq1YfrmDaJ/ZQ/2CW7T429H2zkzPm3EqJZC4RWb7Xw3ODywUm/+sfzXvzNMPWY3OsFfpdmtdYg6H2H4wszPYx8DD59Vg3RMvlKECsfpClePBq+u3jcQ1vGVtaay+8MEHOE57dIJ95RGO6tBVY/EfepAeubDe8ET2z5AnFSMYOumSMt3/hEmoW9mvyKCq3OvA/SY0ysEAv/XTwEUB9hd0OM1/+K/0dYHw/dvkZc7UgGyTmEJhByjY0uEHh+6//0rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=RtabBPxa3cK+YZNewMul1837ya0UaCRbh5LAmCnin0k=; b=nVz+pn0AOPVgA7O6+k/h/Rf1PwACPzGvkPm60ESl4FVD1TIOWoL/c+kPYFkaWy40+VC1VCLenu/h1qbIIVd3WHKHAIGy819t/CLCs3aAWQc58diF3Aex0D3nRDy/aMEP8YkvGZMHqk/Qf+NmsnBuPeTZLcf3ALny2tH+H9mebFTdnd420JUkQCJQVHr+1ZOknETOQIPcFE10YVCgMZfcQGhjMnMoto+sX2C/1LV51dSApilOzgRK/MePhzn30EmI3UqLW/lhbfSiQj8Rfd+weFVdBAM9b4QV8+NwcCaw4PG+AIFhPSl82rDdKbXyD8eQSvpUEIF5Fq7Ubrp3BnPQMw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bmwtechworks.in; dmarc=pass action=none header.from=bmwtechworks.in; dkim=pass header.d=bmwtechworks.in; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmwtechworks.in; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RtabBPxa3cK+YZNewMul1837ya0UaCRbh5LAmCnin0k=; b=WNb9WH92zbNKZnCmOpwWZbhj3x88sidyBo5oyYtnA+Fa0Eeamw7dY5Tqkl6x4jKNeRiArVWq0d9oRvKmot+8+5MHTKmPyZNx90QJbGEk7pQY1EHy3BH+CYqA+MKgT5cA2mE7wlnreump5rx/INhQsKJBb3pUFd/4s9LAlIm+hCQhuZuQDd5hsNDBdtJGHAwMFeA6AlRDGwrZzhgOH4jtub8dG3Xr+byaFyWVhALrMBjchDiaSKoNwN0Aa5yceQuLHAM+nySVgzRKCFT9so0SaYD58OK7nZlDParRIrI2iuGJJJmiLXBJXk3ykkEkoh6SCM/XhXWmwEaXWgyAkgWd9w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bmwtechworks.in; Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) by MA0P287MB1011.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:e3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.10; Thu, 20 Nov 2025 08:50:11 +0000 Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483]) by MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483%6]) with mapi id 15.20.9343.009; Thu, 20 Nov 2025 08:50:11 +0000 From: Divyanshu Rathore To: openembedded-devel@lists.openembedded.org CC: Sana.Kazi@bmwtechworks.in, Divyanshu Rathore Subject: [meta-oe][kirkstone][PATCH 04/12] ImageMagick: Fix CVE-2025-55005 Date: Thu, 20 Nov 2025 14:19:51 +0530 Message-ID: <20251120084959.51761-4-Divyanshu.Rathore@bmwtechworks.in> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> References: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> X-ClientProxiedBy: MA5P287CA0130.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:1d2::12) To MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MA0P287MB3378:EE_|MA0P287MB1011:EE_ X-MS-Office365-Filtering-Correlation-Id: e2af79cd-c4b5-4304-119a-08de2811d0cd X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|52116014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: bDDx3qTAGrpehbOGfNtegOQBTFcHrdQXq/65fT7O6IZwRSXhea7f715CUga5BC4R+3E+cUh1ZsbuR1uNWZ5qjmvvhVqEPl1QsLLrCldujr1sXucZ+of4akurToPKIIW4r/iCpIaR+/31C/23+4KXsUc66TucZ/JvSeIJQ1oxVOnPWwhvjdPobaaa4FJtgx5OnZ+FFBVz2QF4FyDeG9Ban+fNoohHYGN7fcSRUhTh/f/lHoJMXuAjVB6VDOChQXVcuXAeQKEopA6lRhfGoswOtsF0Qbmgs8jeQLoRgjSiiWbZwsv/YY35xW0u9535/xlI622CJh/ra0839WUQMYiZrZ4sfPvOAAhS/xejOU0WQc+iXiAc5LL+vYVKMVRn2bXw16NC0LfANjx8RhVU1wx1Pp06BGT5hkpDlb40mIKyItyHXA2re1ZXTLE02/2keEHh2tfPV9YGaUUqCRX7UpdoqxcG3MqH1h0XzE3o1/PQ3OVNgzTXQgUHqgcvEPDwS0f/5EM95VkZgC5wDI3Tg+hM+QsgYOpbh0K0KUJgpIwXiQ7Ukuk3OSzN2Zj2pzyNRBOuQRcwOL8iLTlL1cEcQo58oZSWgVSOm4VI5BcRMmnWhAwJ+ruuLJ92Bw5BR1JZDlVKIs4DfGmz1ytq8cnXTsjHIie4OyhHsp+xp0vMbSbcQpqTcoWykyaASYgNRuYupTPus3ximZLi3g+dANgyzysKQpDD6Fvd+E0sp65aCXAOpfmyFSFKiLmZMhCY18cYrwLANT8QZol1KaUsvdKP6fBtdn7A7Hcr/XpiAhGBCOmyhp0NrE0VB4RZfbz2ZK2ye0br+qROKK2Me2mf4roGhrOMMRc9ZrSOCeYLxOZlJ3EjEQ2wM77kiIbRTK7rEx6WNS6jPCcxH45XbMpmyR7uuBrahGBfUZceSTyIlP2yuiSFIIcWRt6kewmJ1Rs5BUwym4rZZ4hedY4pAFc613LSi3EnB6/cmv44BVIgIScmYpd5NDyWFMDvlOdxb8cw6e5e7C9WzVQVS6JAVvpkmcO9jxlLCS4mfo+39TFupGPCVuMYpjws9alwHObZR4YrVLoQzOeKIEHg8LTaxhBUiC1+kii/WEyX7XY9WZrQSaY8zuexTHiVsQrpkcGEY+KFax8uFh96TZNYFKaH9ZfQyNz1VK6PzHhAFa5h1m+Kr3L80GObsO10/BaxgtaH6SlQfPqcV8EWa0+woRRKbSPn++yPUiMpuVuMfY3OWum+sbWczQcy6OLNad4UZX6nvLgzPA8ACoEPTadVqJA1Zl7Dva3f6q4ooV7ZLuEDIL401mvoce31dHBtsRghwQTpFw0JKewzUSxv9AwxRleyA344GTL6znQn41aMJFCR/sAQnJzMo+JC3PsDpvYThEzt5Aj9snaT7cxPHPHmI++QqqbrkyTjYF5v4qXoDPoFlox/baOiXIQvUydbzB0TyLGb9nrcIOa0Zi9p X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MA0P287MB3378.INDP287.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(10070799003)(52116014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 29WHAc78OBkZiV0uLfUVkdJDxLcq2xPAMcSMAwE2tjMskv5g1140dVWKX22vsHgBs9Aqmy719u7MNt5J5/NC+elB8McbzEH6ZQxEyTFJ0cnfakcSWY2/F7xY+QxFMngW8XtWt0djXHfK63Jo5YQY2/tv667raz44UPo+CzlI40/27jEbpGMbiq16+KPlJCtKJotEMvqTXTvHp9rilf8sCEnY/Kws6x77SjqfWOdWKM67gKKcSYXKgOXcb+lHQ5FMMbnYNreGa1b9/eBlmmF6x/yv3g+jO93799h6rcsWdVbN2mDQFNvoOyWV+GpiofolxWGxh5n7KvsLdwUyAQ/NvignXkvYQt+RbLQcazCK/nkXJ/jKVc5lemVoARx2HwwcFrr/2TMHO0yHVna7dZ4UKbFIuD5g9HqpTSE+VLn7jiarlPYbbqRGKNjMziu/FLy2AdPXXBh3YC+QOk/aIhAet+elFFuORpPfNc3HrZ1UUO/Sp9HV5jtHcEOHnItF7Jxm5Qb16lRVxYFp9Ul1HIXR0gWJ5B0XRyksw5htyzqJY+BzaWff4mWX3WXq0Us62Wm8RFIqd0tXjNWnQDOWYHDtRWz/i1I6QlL6/IWucgwHSRUJHnLd5quxgAUFRoTomx4GL9TBgJKEGaImTPh8tAhFk6QrXqTA0CEakumvru1KQxjErN9n2r9vsIdJlk4rds2pOYLnArOw576JA+2uysTaRnxCupj69mjLSZy06haL/RqIQYHiSojdRsSLfdERrsXIc/ck2hvlQusvJkQ/jsTAmPGpLftDoiqewat7VO7jS401eGvx/s73OsP7XyfHIxGKeSsFg/XY3S1csN307KiNFS6RvtDtZbEgmdL1/4tNsEPVdwgH5x1+6qg8KiO1CL1BxC4eTyu+fxSo5tzNhJznnP7Ljzg/5ZeMnet+Fah3ILzETE/42gVPVXygBe4EDCjUr3QUHFj+i3DAitKEvg6L6QucaBYb+hb52hGF4PIss6HpF27QvSn1Ijbfz+agER5SK+jCN0s7Ge4LEBnoBleacc0wNsRuXLlylUncFMpTdQOK6BPKSodb+lKFZwxQ1QxtYdeSVDTV61GnMhz/AEtBjGYLQs+oihjumx+FNLLm/Xa7DDTZpqtu3RbYOfl2R9yf1O99poU3dsNzXz1UYVCCjKi36YtqCPzhs7mftrlGz3+VeHOlg42UeWoki3aQJ/iGeOJghNnzHszSdWoiPzBjuyK9YHvb9ZIdMjrFWKHCxxw788awSPH0rsl3vJ5aNuQpF/rcmhuI89jqFOocR/DcYe/NB1ptXRbiDn++XYHt1S+MevJKxymNYGDx71wrYK3MWw0tfl0Z5PaKszX3J5ly1ghxrBXusqVJGfMSAt6DL+V+zlba9ejGlHk0rtJ/efdE+xMxw2Wsm2Bi7adoeNBc4TcYUxrM6nz7NiTVqFqPa6rImqACED739eXou/1++BqjI8LijtC7dJ/1orr8KxGSogqBgRVlAOaXiFq5+B47zoSlOd6h8y5QXAMJ4UsTg6NwPI8lV52PmNppZw4SiAEQw9zXa1dnpMtxZXfb6TShwchYmAZBJ9R3iYrgE2kHdAHuqPggvdgQ9zj56FcMisKNt0jIH7r1Csw7MuYH+2OXP7jy1cJCRk287KKOHEDWLhCm8NfGf2J1JhyzSoTbWkv8NLMLUqS8cGOeKuEMAAEttUg= X-OriginatorOrg: bmwtechworks.in X-MS-Exchange-CrossTenant-Network-Message-Id: e2af79cd-c4b5-4304-119a-08de2811d0cd X-MS-Exchange-CrossTenant-AuthSource: MA0P287MB3378.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2025 08:50:11.6897 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 970fa6fd-1031-4cc6-8c56-488f3c61cd05 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: S54MUOmVJxxyQSS5IqWV/s4ZbeDx+UcifZqv/jER7ZrWOpO2ehG5R69Nddv9DhWHLOcT7GDleAxRlwTAjvwIIhDMiain3IXsrtJcAlgbSIlE3PtKaUCoI4/8Tm8CIiA9 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MA0P287MB1011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 20 Nov 2025 15:26:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/121940 From: Divyanshu Rathore Backport the fix for CVE-2025-55005 Add below patch to fix 0004-ImageMagick-Fix-CVE-2025-55005.patch Signed-off-by: Divyanshu Rathore --- .../0004-ImageMagick-Fix-CVE-2025-55005.patch | 40 +++++++++++++++++++ .../imagemagick/imagemagick_7.0.10.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta-oe/recipes-support/imagemagick/files/0004-ImageMagick-Fix-CVE-2025-55005.patch diff --git a/meta-oe/recipes-support/imagemagick/files/0004-ImageMagick-Fix-CVE-2025-55005.patch b/meta-oe/recipes-support/imagemagick/files/0004-ImageMagick-Fix-CVE-2025-55005.patch new file mode 100644 index 0000000000..dba99452ae --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/0004-ImageMagick-Fix-CVE-2025-55005.patch @@ -0,0 +1,40 @@ +From 5e055e54cd9707e965fc9e7f4d87f47faa6c0074 Mon Sep 17 00:00:00 2001 +From: Divyanshu Rathore +Date: Fri, 3 Oct 2025 17:40:59 +0530 +Subject: [PATCH 4/6] ImageMagick: Fix CVE-2025-55005 + +CVE: CVE-2025-55005 +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/b68bb6d3cfe472d5bd9329b4172e2e4f63d90a57] +Reference: https://github.com/ImageMagick/ImageMagick/security/advisories/GHSA-v393-38qx-v8fp + +Comment: Refreshed hunk to match latest kirkstone + +Signed-off-by: Divyanshu Rathore +--- + MagickCore/colorspace.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c +index 2ffc72f88..0aeba03f8 100644 +--- a/MagickCore/colorspace.c ++++ b/MagickCore/colorspace.c +@@ -2493,10 +2493,16 @@ static MagickBooleanType TransformsRGBImage(Image *image, + value=GetImageProperty(image,"reference-black",exception); + if (value != (const char *) NULL) + reference_black=StringToDouble(value,(char **) NULL); ++ if (reference_black > 1024.0) ++ reference_black=1024.0; + reference_white=ReferenceWhite; + value=GetImageProperty(image,"reference-white",exception); + if (value != (const char *) NULL) + reference_white=StringToDouble(value,(char **) NULL); ++ if (reference_white > 1024.0) ++ reference_white=1024.0; ++ if (reference_black > reference_white) ++ reference_black=reference_white; + logmap=(Quantum *) AcquireQuantumMemory((size_t) MaxMap+1UL, + sizeof(*logmap)); + if (logmap == (Quantum *) NULL) +-- +2.34.1 + diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb index f41e471f0e..224f55d03b 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -26,6 +26,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt file://0001-ImageMagick-Fix-CVE-2025-53014.patch \ file://0002-ImageMagick-Fix-CVE-2025-53101.patch \ file://0003-ImageMagick-Fix-CVE-2025-55160.patch \ + file://0004-ImageMagick-Fix-CVE-2025-55005.patch \ " SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" From patchwork Thu Nov 20 08:49:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Divyanshu Rathore X-Patchwork-Id: 75100 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD217CF887C for ; Thu, 20 Nov 2025 15:26:36 +0000 (UTC) Received: from MA0PR01CU009.outbound.protection.outlook.com (MA0PR01CU009.outbound.protection.outlook.com [52.101.227.41]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.30081.1763628751698612110 for ; Thu, 20 Nov 2025 00:52:35 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@bmwtechworks.in header.s=selector1 header.b=QtLabqXM; spf=pass (domain: bmwtechworks.in, ip: 52.101.227.41, mailfrom: divyanshu.rathore@bmwtechworks.in) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GB5xa2YcJerSXij7ozTbE+9OXZ0+rR0hjkvegzqeP5mRuPTN94HEBWhGKTkiBO+WyKCEfsZlCx8GVA+HrZEQ6FswwqZvwGu4tdhMKjyXyf3GyfZ/FiPVyS8TzawUfJ+a7NNhKBOUHDr16FwKG5qehaIMBc0gu1R5Vy8MsV2bIJHbkUMKmtknn/3byHaT9pkeUe/QZQm9Xr/AIfQr841GMLdIZ1gIBkM/LJY/Hkt41hvNdi+VkXFFROJtY7NwPYutlsn5TaRHzQfqvWawdwu922iEz1QuwRR6HPespTy2Zd2fAN4UzQDDQ/8MJO1t9x7iVHo59T/1vbgwNSdzcXO0Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/k9XTxF/6c9ESM7TF6YFRZ5yTJJJqIioVGReL2xbjz4=; b=KbWiRc3ySFbGOgLX/YmUIaZrcUsI/TvytVZQxp7n+Z0x4U1wc1ZORG9Fbnd8pRJfL3y2o09Yd9gP9DCo67jT5vSZSzlA0tu163cXa4m4XJZ9ECXgV7uvtOknEIoKEO0OyaLDdpamRseZykwD/UhD0OzgSjmCzGwRSGu2FYi8aLFQHTGwDubkcXKkjdnZNzkJTb3iBhMBuDLIlw8u8xpJgNGwcmMS8O9n03KMibR4nho8vfs6qrHvytn3x6tBV0bCOukitR2kqAf+0UQbDcGs+X3mwRya8xvyHM5bu0S+GUsjpC6twyzsOwvU2c/4nzKk6GCgK6vjsOoctx+HTjJtEw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bmwtechworks.in; dmarc=pass action=none header.from=bmwtechworks.in; dkim=pass header.d=bmwtechworks.in; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmwtechworks.in; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/k9XTxF/6c9ESM7TF6YFRZ5yTJJJqIioVGReL2xbjz4=; b=QtLabqXMB4OUy2hcfjXG8wOoOupKg7lcu6TPo1jHhxCLnRkAnRSGnHXGi+WgUY+ufD5vdZk2jf5jZSHZnj8VQABTARFOT67gHM4r4my22d6uc3p6jD06XIyAbcAJU5cM4pMwxD5n7kf6a3bjwoYnRzk4qEFGSZsJNvK8Ch4YBtG8VBciFUILi2upq2FLs9Zn+FqtG4fw5co66dMz2Q0HwVqgr6S6gKC4U02LlAJbkh5PO0tvzDJH+i/TiQDo/dX1xDmgvyPRGFO/+E8GOZHzIA7h4aATD+w7LYqhIxr6oR9LgLxVCRxyJacpvSMUrJ/Sq7vzpJvIYS5ZIEloe+GFrg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bmwtechworks.in; Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) by MA0P287MB1011.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:e3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.10; Thu, 20 Nov 2025 08:50:13 +0000 Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483]) by MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483%6]) with mapi id 15.20.9343.009; Thu, 20 Nov 2025 08:50:13 +0000 From: Divyanshu Rathore To: openembedded-devel@lists.openembedded.org CC: Sana.Kazi@bmwtechworks.in, Divyanshu Rathore Subject: [meta-oe][kirkstone][PATCH 05/12] ImageMagick: Fix CVE-2025-53019 Date: Thu, 20 Nov 2025 14:19:52 +0530 Message-ID: <20251120084959.51761-5-Divyanshu.Rathore@bmwtechworks.in> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> References: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> X-ClientProxiedBy: MA5P287CA0130.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:1d2::12) To MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MA0P287MB3378:EE_|MA0P287MB1011:EE_ X-MS-Office365-Filtering-Correlation-Id: c7a0de35-44e6-4c11-da5c-08de2811d1af X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|52116014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: 4tkWGOqqPEDB+sJLGT1mbhyqhW2NaTEkSw10M0lBgnecbm1/gpolU0Gn5eKXabF4Dz1NjUrePp5X37/g4dCaTiZ6ZQeWoM6pry2tb90X9lW7WVM5SLpo4dT2dW3pPoO+P3Es3GfXOifcn9MXaChBtsmBkuWubT+nEFX0Un8C9oKGdD7IWG2DhmSdCzu/p4PfTj7wQN/pXVxC9W2gxVy9jqpYxu4tJfeFCpj9NB9I0pKfrjkcw7QwaEOLKY1V279inCHrLfsJZ6h49ACjBbR6yDPFTQbvl69JTX6IxlRZGjVObzRNM6dtV8HAkCCfvV/CaKYFu6nQxv7a+svKujFwQ9MHzKVnsxd3ei3YYiH77kvE/Lf+boeGQzUHXUQxHKFvm3yJEQzLQAZFqoMJehWRhOUC04Mvu8ijgnLwDCyZJBLSTFCWe5wJQEYzxZ2w40hfYHZKOfME5Y4/NLeUDJMXrRep5Gy1M1JsDIkd3f2/whZ0h5zWM1FzO6DEWx7phFvjJSZ4bmlcAD6gw9qX+MRIDVTsFOBUd8fwiBfvjxzuQaDyWFRo4aVoYdls7RpN6fvr2l+Jxlcy+fADb46mMqmhVY8hX5V2/Iz5RFwJKvEBiavyBY2A5+3BaIYgDdrjTId5r9ReEZhNbDVn2CxvEQktA62/5agw2p5Z/2oL1L/iVDnFXmK+qfBPb3nxGt2H2Bm5f1H5KK9LIn90ySy5p4gmNCxa7EW+gNOe5Q6YtlYLO/CkH7xkwFSanKIH1GEMKXtcmeJLa0OUMz7wt0zZT5RF250sPLxqEsCZAnN1IN7R1bOQKQvXmo7SmyqutMuWVRIjYBNyvVexcH1CV2RDEXuRq6nwFbUc9LaifiP7oKhGSiVQduvRs05iew6E26AM3BuJLtPSmphjm32VJ5WSXw5YoeHdete7IzleRpXAxJmXAzi617ANPk/JlQLW2bRqZzxiy8geeleQyf1joJNlKxbzF+aJco5z72Szl432EUiGaWKoSW42ZCSqLggubpej8kltsWDUH4OQD/aSTpSeWy3QhPU9cUbhz7o9Xu+65ZvudORC5VG1XL0NnHwyHwd7s4E+2qdnz9Yk2fKrKEeP56W/r6IBEP+bcPmPG6yDceu8U+lZUd170Hbt9b98MvCSfeF3HAUtnHv2Uo8DSimu5/B66lWdiVrkbfqm87477x1r437IkeMo0xb7pYekMRx8+i45N3zeEKX/cm3tl6BMY2jXwCyMHcFwNZ8xgBDbsgZmaoJgtbxzpTfhfBNN2QF65HDanQByZ6PDCwDajzZax6saSpKeryurXEBARl6PYCwIQ9d8Z5WCn603ZNS0JFGs2Ps09X/M9P601pGzKtHKYGpYXW7e09OkKhBu1LLm/uNjr+quI6rCgP+vjd/BeGy2BftNHyw0ia3zVkt48IHtfxeT4RPZ3wmVehjTJXUrp8xFfimhNh4c0HMFUqkVFwqirT/d X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MA0P287MB3378.INDP287.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(10070799003)(52116014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EOizpbPKKvAwpLBlEyZeXTgWOx3wTvBY2oixXCDrqfGImLe/L2PRQeLz8vtVsBDBxU/geVADhp/nkATOiWCqt12K72lOJ7rH9yNV6PhvARBtzpsOWf4ptWSedf2iJ+n8P1dM+IgVeR/U3iathR63YibpHQzfgE7tmSxG6aY5mSgHeWIsy0VpE5rCFhTT8IdL75Bg/MInAIYz0XiGXMnOWiWW/XXNnDeg7HmqkcTulDRub5wNijw1BzmpElnY06wM0DvcAwS2lbhGCPznNICbf3qkJyPlWDzXmP6j6mth4BV5JBqMVk+142JU5ykpvxRqw7PsSv+jD+mT/xaPQD9aekbq+CBRpfOmrObdCw5rzHFHe8O8dqCdTvpLeD1zw4dGFJ6tsoiJdOrQK/Eg7ZgbnNLU/wrn01d1yGbZHRw6wImYcqG2BFEpZmSkzGECtcbn0js72F9rTENUb76cN/Y1Jo3c/GJVNWM6S9pzwD0t7vnycybPDn86XOSKCNH3s44wVhr3/PP/0BbUBOgWfErV9HPq4YbKbEyzd5YrI1tOG8JagUCCl512+cRygbr+gINBCMFA3MWvKh0OcfP9nVhDBdxE3A5Csf4VVR0ujQcoYGBQ3SDa7Ll6SP24aAhTo33dt53il1k7QOn7G7P6n3JdpzR+/+ko4eXBhWs/JbaGjOiy1H+SoBJIAlSMLE8oZhUu288mE0wtkBiZ967j+1neL9YSz1k/Wf4hMlzvBg38pWR78ulK2ScoVrnK6kdOx2j1kShtKVCSRokjhJ09DDC7idsENbsv7OkaqURCe8OUWzYDIEgLE7MTQrIHScBtLhzDWO/gAEFVBi45LsZZnhp1j790OpdCEUch8uYKcOac7Qn7L7UQ2FoWXv1ULMlrDqRGUaOKerO7vh71/HRx0mQ8LEISm8ELiIdJvvOZw7PyhiwuVbxpgMo2sGLyb3ZrNMlREo9bCxAYw6M8iBUpfjBYbBWELaItXF7KpORn/OlZoKun4qI8lFMzzeIgZJaHHiJzfOtbDsOTSU+7fQqYbgvHCJ2/OSQFd69DZsEQAdFRZZHTEuV+MQBrIMxkDBXaD1zB5B67qRsJKBWxF+dScRkDalUc0PsauIlGRXJ3KkTyQbGJpLfdG2//qV3PDA9t1Ng7uuvCyQ+j/AHHGcsgy6STHE4HmOEGMYaO0r5c4duORWtT8RLBDhGMgpNtDx2NbX6U2rcVrI4URxfalR0JdiVe5SSL0jJAL+G1g8vWQSiIKXsaBRrR9Z5+kvGiFY9TlP5C9YAmEXq2m/MWSSwJn79stzk18mFTjT+o96SvM5E8vbla7sLPEeDOP4iKVwMuoOcObY0h1lvCn4+Q66jpTQwHDjGs3mOclHAf6D6WF3VGEpIjCi1GIx9m5Bpw+/WFBwcwuj77Cy/I0Vj38oIHMTnpidQ0l7GUWxEIJbNgLSXIdPOdr9Ah07bwJfVKBZeyd6hNcwdNBfIbvsJoMFGHImtnBZmI/iTPmo/O/mSvJSfG5ql2EikcWKqJSfltgkiE35+yx+dwCxwVRuwHdJYZo6UChrjuVLJa4kH/WIf9IhRcgRGkU24DKH2jXkeW7hL7RKLarMpIPTRsGJa52fmeDtthdhnkz1mvvvuTGe1mvngTnKV4poqpcDqBURnYBzK53vgycBCFbeiep7nd3v296LMrWIEYDSMnms0LHlQyrMqgvr0= X-OriginatorOrg: bmwtechworks.in X-MS-Exchange-CrossTenant-Network-Message-Id: c7a0de35-44e6-4c11-da5c-08de2811d1af X-MS-Exchange-CrossTenant-AuthSource: MA0P287MB3378.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2025 08:50:13.1511 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 970fa6fd-1031-4cc6-8c56-488f3c61cd05 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Xhlc30gIt+t+41nyGE22HxijdJ2llD2e+feCz3ri/j/tZhA51jMOqhtcLhFNsf655btyVz2pz5H/5PxlWDubjsTjbQdmU+PZ6r316rJMibng9CIe7OovfJBA5vyS4O0G X-MS-Exchange-Transport-CrossTenantHeadersStamped: MA0P287MB1011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 20 Nov 2025 15:26:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/121941 From: Divyanshu Rathore Backport the fix for CVE-2025-53019 Add below patch to fix CVE-2025-53019 0005-ImageMagick-Fix-CVE-2025-53019.patch Signed-off-by: Divyanshu Rathore --- .../0005-ImageMagick-Fix-CVE-2025-53019.patch | 33 +++++++++++++++++++ .../imagemagick/imagemagick_7.0.10.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta-oe/recipes-support/imagemagick/files/0005-ImageMagick-Fix-CVE-2025-53019.patch diff --git a/meta-oe/recipes-support/imagemagick/files/0005-ImageMagick-Fix-CVE-2025-53019.patch b/meta-oe/recipes-support/imagemagick/files/0005-ImageMagick-Fix-CVE-2025-53019.patch new file mode 100644 index 0000000000..fd2a604916 --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/0005-ImageMagick-Fix-CVE-2025-53019.patch @@ -0,0 +1,33 @@ +From 5e3a3f3656b04d964330efb33827ecab5589ec26 Mon Sep 17 00:00:00 2001 +From: Divyanshu Rathore +Date: Mon, 29 Sep 2025 15:38:57 +0530 +Subject: [PATCH 5/6] ImageMagick: Fix CVE-2025-53019 + +Fixed memory leak when entering StreamImage multiple times. +CVE: CVE-2025-53019 +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/fc3ab0812edef903bbb2473c0ee652ddfd04fe5c.patch] + +Comment: Refreshed hunk to match latest kirkstone + +Signed-off-by: Divyanshu Rathore +--- + MagickCore/stream.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/MagickCore/stream.c b/MagickCore/stream.c +index 28fa0f25b..bfa29f25e 100644 +--- a/MagickCore/stream.c ++++ b/MagickCore/stream.c +@@ -1350,7 +1350,8 @@ MagickExport Image *StreamImage(const ImageInfo *image_info, + assert(exception != (ExceptionInfo *) NULL); + read_info=CloneImageInfo(image_info); + stream_info->image_info=image_info; +- stream_info->quantum_info=AcquireQuantumInfo(image_info,(Image *) NULL); ++ if (stream_info->quantum_info == (QuantumInfo *) NULL) ++ stream_info->quantum_info=AcquireQuantumInfo(image_info,(Image *) NULL); + if (stream_info->quantum_info == (QuantumInfo *) NULL) + { + read_info=DestroyImageInfo(read_info); +-- +2.34.1 + diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb index 224f55d03b..829ab2e525 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -27,6 +27,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt file://0002-ImageMagick-Fix-CVE-2025-53101.patch \ file://0003-ImageMagick-Fix-CVE-2025-55160.patch \ file://0004-ImageMagick-Fix-CVE-2025-55005.patch \ + file://0005-ImageMagick-Fix-CVE-2025-53019.patch \ " SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" From patchwork Thu Nov 20 08:49:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Divyanshu Rathore X-Patchwork-Id: 75090 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 925EACF8869 for ; Thu, 20 Nov 2025 15:26:36 +0000 (UTC) Received: from MA0PR01CU009.outbound.protection.outlook.com (MA0PR01CU009.outbound.protection.outlook.com [52.101.227.25]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.30423.1763629551121970004 for ; Thu, 20 Nov 2025 01:05:51 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@bmwtechworks.in header.s=selector1 header.b=gcf/bAFo; spf=pass (domain: bmwtechworks.in, ip: 52.101.227.25, mailfrom: divyanshu.rathore@bmwtechworks.in) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xQOsBeuXCVYV9MxCJt6znI8uJvxpBpzhErNYDlZMqpETK1bXcpkFd1i2p4qZaLvcNkGWy8fNWhXEeqBDRJ9DKasIn/7CC+olKk+AvHEQ8QNJcSudoodGMCdueVvoA4v5Crcwg6+N6wosKtAZhaU6nXq9QWMN5QZESQjnXsc4vpAan+Ynk3n56/CYXMvwkOLy96cDUJhSH0+Aufe9qfaVzbeH3WCMemBnvAENLz+MmK8HD2cK49mrrR0PRXh6NFB0eGIOgLkTKkRQn2rWojRcZu5V4kVcy/vPHHrZKqGDLV8m5MHgP1x0szz0SPFAdSgVEK6xyUfzJ+UX3zvjvEW3Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PfxW7OHXA9jp5LV5jKjGJLp2iblPuPby+7A+S2nLH8U=; b=EgDzjD335XGf6n3yZ6suSfsqBah/i4hqOlQwfbf6NVL7XJOkKJiEhMAQmD1Z9D6b5Ezna/GGCP/Bjr5CsMMzQDK6VKvcbi2LhEMm7SD0nkcnU7WNvXgwrrwBUWguByUppURUFnPAuIbp1yy7yM1DC0DjVZjICQSjnvfNgIik4SwmmsQLa8XHkPSimc19VeNZXJi5DTuJYoF+ih3yja5EnXWozpSRDDF4AMGP7E8vZFqB8IRp2LHfIUUy7Fb+UfVYFwf/bG/+BT5UOF6yBrO/6KOFDfXfxYbMt/J22LVVIqZlxjn8WtXCRQ93KUSCyTXRm1oyCFVmUue3zbSXcs1VFw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bmwtechworks.in; dmarc=pass action=none header.from=bmwtechworks.in; dkim=pass header.d=bmwtechworks.in; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmwtechworks.in; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PfxW7OHXA9jp5LV5jKjGJLp2iblPuPby+7A+S2nLH8U=; b=gcf/bAFo9FjAHvFtx1czj1tdllYi/j9kcqTDy4NaJR0/5VUd9msDcSLXa/KBm0xq6jjzsmcj0Tz0KUEMJWa+LNRdAsVaq/H7f4953U9Ak4DR/HiORtsytJazG8cCpTutlhZZx9zN2lNni0YHHEHXQ1aJJys2Rt6nw+kEFKqA8Pgv9pamxDYbpYpPWy34zGWjvLT+FA0nufpAVIs6ACCOg2qsCeMw0Ud84sj6eY1xaTCKGNEZN8zYtFmItCfpoNvIq/gf4fEEuU3Qlxb0nbfasujRx9gxH94R33kYhxZkZOq0AO2+tcKH5Fysof0WAQTvdUuvw0orvEdlLtSKqNuOTA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bmwtechworks.in; Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) by MA0P287MB1011.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:e3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.10; Thu, 20 Nov 2025 08:50:14 +0000 Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483]) by MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483%6]) with mapi id 15.20.9343.009; Thu, 20 Nov 2025 08:50:14 +0000 From: Divyanshu Rathore To: openembedded-devel@lists.openembedded.org CC: Sana.Kazi@bmwtechworks.in, Divyanshu Rathore Subject: [meta-oe][kirkstone][PATCH 06/12] ImageMagick: Fix CVE-2025-55004 Date: Thu, 20 Nov 2025 14:19:53 +0530 Message-ID: <20251120084959.51761-6-Divyanshu.Rathore@bmwtechworks.in> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> References: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> X-ClientProxiedBy: MA5P287CA0130.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:1d2::12) To MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MA0P287MB3378:EE_|MA0P287MB1011:EE_ X-MS-Office365-Filtering-Correlation-Id: 9c6efe43-db3b-4fda-3ec0-08de2811d27f X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|52116014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: 9ZtPm1cGqZImeVsEwV4ElXRguUzz5XMbBSaudmJv+W+WHevfdxD6b+lw0k7mpKTDokhr0hI1JXIA8BphLXcW4qLvrxnhv6YIvRGAhG/v8MaduapY1aqICZqct89N6UN40SF8PzQPLHXS4//YedSiS5Yun8F9Ej/I7QdsWOaBlK5e/EjGDenRvKB1dS/fwji5E+M8BXbMf0qTg/Fi48A0tNIdQ1Qce5TX9u8LF3zYGvjJoHMyQUbL1I420flywTUduuJ7hDQN1g1IHPOG/W8v8mkV8CvcnY3W+aItoS4D09XvUNXf5ETj7gF9CExZNueYtXzgt3lEQ/3jVDmYQJp60k5bT3q8m6hdZDdjg9hojRVM2FiKBeJDPZfeA4hkFKi1L4yQ3IgKl4NZfl873x0MhlEMtC018i0NIIWCd+DspkMhWNvLx1jP03sfYct4aRcekU55abIW5KeBns2zu5Wmj5g4hwprEovwgldOz1rscXWhH3Ji7psyB17hQfRbE47bDq4dwg9g3glhgl5MQDQEJaktZENta+vhgXZJseZQVvfSKE6Ym3xghlfBDjRUslLXoFlDXbN3UI3bk8PESHFmDAZckGZt8nR+Y45m2f3cZEgETAgC5uT3hImo1kzkCNc+SgpTUNbubztqMYe90ohUBiMEdVb1zMlvduDxm2vE5hnNifaKDA7uKQXlKIcsHfS3ac+D1N4qLaXbXMdJKw8YHOs9FL1WezgCnZ6FuR1D7yFkMGtk3b8xQnEpJ2F++tvb7uRL/r1Sfo5QOumF+7+1nmCDEpQL/yf6zdrA+0xhwY4qkpJSrto7f8mAkJGiPOAziecnnr0FT1Iv1WkGRSaGt/jerYNxNXL5ACJQfTmcw3rZrn8waihXlmr12U3gbigmvPn0ehDeefxEt2d+m+P77IhKTEmv1C80OufeIh6eP6Hbc6IU74uhJX/wado/FNrj3l/sLfCOXuAw/CHfhadQ5ShUOJ3QTzzzsPY4GOO3sg8fmHha3a0mxlzasQoqZ5HZJ+hzK1o5TUmgETs4ZebahCk2PpPdf4/mlpUVoP6dGPo12WawXHklhHMSYlQqKqmep4NMn2CkV7uYOt0ciJwGrA6vzYjL35DW10UoDxM+NuNX9keN6lglSW8WmnnzrV0vVf1tB9xlPuxBFjaLj61QYmK7A4I2kdOutiZ1Y4upfjxuifnVg+9uuTpBPoJVwZhz5C1YwkezrbZ4AaSEc9xQTAEt2UJi0B7SAxIP2RWYPkU7uC/tO5/3I8YpfYc/Z2JA/+rEsTCm65NiLSa3viYxkcP2Sp0g1gSYlxNGxreraPILpugE4WOU1u4jrv1U3J5wdyuZMFQLRHUlt8pjw+/repUFMPeKPBVSY91mCeNOPGgnvgoBMavUMF1rtG9KOLymQUQ0zrVKYF5SlZvMpTrrr5vzCCNVn0F6FHqUIewf0c/SojFG3hiPbi6uD0YuTi8n X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MA0P287MB3378.INDP287.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(10070799003)(52116014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VRSZtpf8iaM3swhAxeGciuPc7R5VMkDfnc0BVmVAW96yRgneII5rKIak1fiPlgoYeBLX7TfgFUj5N5zZAKfy1t0tJXJdl9rcbsCIBJijBEzLTi0MuAKfn+8x+9bi8Tcc/mAPic3G0QMFU17dw4dvPgPEleiPZCv7hfBwIRjjfvJdt9IsRc64g/GUCtMhb0PL6aZwz3pyRwjCOJBJ3or9vEFmBMrA7+QvQmNZCGr7Ex/bqTgQ76oFSRI0ek/TEHgWRCVz50Q5cT2p7XiBHtRsWThma7k5tpzi0HbQYdD7a5Z9di4v6qgdV77CK5JfWH44T2SoA2DkQSuUoVGiRwleOvQqsuTTLMrrpPLN20k77lLNJWLvJbcYQhX9kvr6BiNJJo7qtlTqHzyzP9PCIJ9n/6CilolCyRN70K1yVPkpbkl+lhM1HTZSiAFWPTJOeh4Qxd6KvadB8ltCkhkt4AndC5lApgu8H+hS1Day7O2qNqOpJSf1AQ+Mmga8PoG7WJrQDj1pYjdaWNJS7ddeg3LLJO8jZXKPcVJ/R3ubZC6q1RQzI7VYDGsHRZ0ZivP/SbrT8LPrUeCFdne6U/ye3sLF5yLGf16AwgqeHFFG6k2dwznKJpUC+HI/TjlrcFmMIFzKrlT7biX/Xxb91bSEPuyY8Z6KiBfzDuEf+h0NpyPkO1CR5i50DEPQZ/B9ugHehDVtMPrVrAWTHLjWcO2DqCvMK4Zvwc7itaTIxuOc4XqCqHiptewdqc6lZ+B+cdRiySDNgWkuDqTazmC7c+NvubrPSJjY0ow0IW18OORoGUvTktaQMEpNKJWXho+ZPmRg/9hTE13D01VC8e3G9Lt6I/6gPP0HRet2TCZzPxTlNBEUGoJM6u9R2dQR2v9zYFBgEYcbPTsV9riE/Yo4GhiTNufbi7ZHxU0F2KKOjvA8b4YJKVr47JeH4dcmkO+LNsdxnDeoAOcCCOdPRk3kT1XYH62hAEQFoqPWlj7B/XEVwZfJ3N1xo62WeUFtMCyk/kZB68YkTC5WGO9/SJ5wtVl9CQ51LdswKZZkvmEfbGwoCsBMlo7JoQTQfJI/taTwoBInZ9SC7EmlURZ4t+LrfwkvqYeUjVoWaYDrBL73P5DjOZ//O6vrc+qmZRENQnbApB+fuQ66FOGiAvEqDYUJFVCPk/Hn8uPte9bBrGo/z3wnaGiQaOTUU6UKyLachZj1XKAwtryGnl5gCPLRw7AbLL/J8eb0BwvTJH9wduz+XXpJNscs4tSJSNGGhZ+G/Y/6j8ZLEBKTjO+Z0AwqBevLTV940SCytwlRDMkBSDVSpxeNdPugEDqxFymI3pYGOMPE+rriy+7bjoM5V5OYnhln27aiFeItmSGZqZ0u3vVLc/mz39aL819i7NQiNalc74qDzcdTWYY5Xojrcl66bxf3ET8uG7Rl/CFjZnB+SBel/LblUekBj0YckvFIuaImgqzPzRuPYuJ117o68/4srKTAH4hkEslABnKvcP0wlm0zq5Y2GZEOVyg5e/ao8xfDz3P09fzlXvdmJ93kFV181XgwK+5D1MHTCdm1Ra+8IYmJgCY1xLu4njGp1NUUvUCjhtRmLDghg65cP9m5ftcsDZE8cooa6HyjLhqoHiUBd0WkZHdh/6cWPUwaw9u77lUbNRM+E57M7aUwIEEi8Funa1gwJjkVTj3eaomjttbxkbtSUqBXBIP91ZY= X-OriginatorOrg: bmwtechworks.in X-MS-Exchange-CrossTenant-Network-Message-Id: 9c6efe43-db3b-4fda-3ec0-08de2811d27f X-MS-Exchange-CrossTenant-AuthSource: MA0P287MB3378.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2025 08:50:14.5174 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 970fa6fd-1031-4cc6-8c56-488f3c61cd05 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ndKb/WKEqxneN9uFZKftS9eSXFsUZNGPVL9gSCAkYtGO+4Ba51LFYb01A3gCXKpyik0ttsHv7dJpQ/p+01q7VzubH/r4W69WyuQLgTOUzOtNshdGrRAVdZdKt6G6qKqR X-MS-Exchange-Transport-CrossTenantHeadersStamped: MA0P287MB1011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 20 Nov 2025 15:26:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/121943 From: Divyanshu Rathore Backport the fix for CVE-2025-55004 Add below patch to fix 0006-ImageMagick-Fix-CVE-2025-55004.patch Signed-off-by: Divyanshu Rathore --- .../0006-ImageMagick-Fix-CVE-2025-55004.patch | 67 +++++++++++++++++++ .../imagemagick/imagemagick_7.0.10.bb | 1 + 2 files changed, 68 insertions(+) create mode 100644 meta-oe/recipes-support/imagemagick/files/0006-ImageMagick-Fix-CVE-2025-55004.patch diff --git a/meta-oe/recipes-support/imagemagick/files/0006-ImageMagick-Fix-CVE-2025-55004.patch b/meta-oe/recipes-support/imagemagick/files/0006-ImageMagick-Fix-CVE-2025-55004.patch new file mode 100644 index 0000000000..34765ed194 --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/0006-ImageMagick-Fix-CVE-2025-55004.patch @@ -0,0 +1,67 @@ +From 1d8878f2010eec5aa1feb22640af37ce66a1199b Mon Sep 17 00:00:00 2001 +From: Divyanshu Rathore +Date: Tue, 28 Oct 2025 13:55:50 +0530 +Subject: [PATCH 4/8] ImageMagick: Fix CVE-2025-55004 + +CVE: CVE-2025-55004 +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/55d97055e00a7bc7ae2776c99824002fbb4a72aa] +Reference: https://github.com/ImageMagick/ImageMagick/security/advisories/GHSA-cjc8-g9w8-chfw + +Comment: Refreshed hunk to match latest kirkstone + +Signed-off-by: Divyanshu Rathore +--- + coders/png.c | 29 ++++++++++------------------- + 1 file changed, 10 insertions(+), 19 deletions(-) + +diff --git a/coders/png.c b/coders/png.c +index dbab45e60..343934ce8 100644 +--- a/coders/png.c ++++ b/coders/png.c +@@ -5113,33 +5113,24 @@ static Image *ReadOneJNGImage(MngInfo *m + jng_image=ReadImage(alpha_image_info,exception); + + if (jng_image != (Image *) NULL) +- for (y=0; y < (ssize_t) image->rows; y++) + { +- s=GetVirtualPixels(jng_image,0,y,image->columns,1,exception); +- q=GetAuthenticPixels(image,0,y,image->columns,1,exception); +- if ((s == (const Quantum *) NULL) || (q == (Quantum *) NULL)) +- break; ++ image->alpha_trait=BlendPixelTrait; ++ for (y=0; y < (ssize_t) image->rows; y++) ++ { ++ s=GetVirtualPixels(jng_image,0,y,image->columns,1,exception); ++ q=GetAuthenticPixels(image,0,y,image->columns,1,exception); ++ if ((s == (const Quantum *) NULL) || (q == (Quantum *) NULL)) ++ break; + +- if (image->alpha_trait != UndefinedPixelTrait) + for (x=(ssize_t) image->columns; x != 0; x--) + { + SetPixelAlpha(image,GetPixelRed(jng_image,s),q); + q+=GetPixelChannels(image); + s+=GetPixelChannels(jng_image); + } +- +- else +- for (x=(ssize_t) image->columns; x != 0; x--) +- { +- SetPixelAlpha(image,GetPixelRed(jng_image,s),q); +- if (GetPixelAlpha(image,q) != OpaqueAlpha) +- image->alpha_trait=BlendPixelTrait; +- q+=GetPixelChannels(image); +- s+=GetPixelChannels(jng_image); +- } +- +- if (SyncAuthenticPixels(image,exception) == MagickFalse) +- break; ++ if (SyncAuthenticPixels(image,exception) == MagickFalse) ++ break; ++ } + } + (void) RelinquishUniqueFileResource(alpha_image->filename); + alpha_image=DestroyImageList(alpha_image); +-- +2.34.1 + diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb index 829ab2e525..e9b125e71f 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -28,6 +28,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt file://0003-ImageMagick-Fix-CVE-2025-55160.patch \ file://0004-ImageMagick-Fix-CVE-2025-55005.patch \ file://0005-ImageMagick-Fix-CVE-2025-53019.patch \ + file://0006-ImageMagick-Fix-CVE-2025-55004.patch \ " SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" From patchwork Thu Nov 20 08:49:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Divyanshu Rathore X-Patchwork-Id: 75094 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94D83CF8865 for ; Thu, 20 Nov 2025 15:26:36 +0000 (UTC) Received: from MA0PR01CU009.outbound.protection.outlook.com (MA0PR01CU009.outbound.protection.outlook.com [52.101.227.41]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.30081.1763628751698612110 for ; Thu, 20 Nov 2025 00:52:32 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@bmwtechworks.in header.s=selector1 header.b=n/r0D/Aj; spf=pass (domain: bmwtechworks.in, ip: 52.101.227.41, mailfrom: divyanshu.rathore@bmwtechworks.in) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oHC5cPvYfsOzraqfnrHmAxGp1vpmIZenwyIxyG3bceQ/zO3WMHraAdayMlrHwFu4w5lm200lD6m7U30XkBdcpjl6bD4fdBjRjc6FLeUryfhmmeSWTnsrwibxyTMFKk6d6WwdVgdki4Jpx/YznVkIiU+sdCF4Xq5bug/99FLBZnpodT+uX2lk2uCimDrgGxlUZfhk8CPtjehA4vfXgT2knyMF92UQTp7/45BTZXRQinwgXUPtPsjJBfnlDa5WeCyoDuyTzsSOIzMOP7ijeD8kemSMBxfWAqJs9MsoRhWLcpxHILMJtmGd4M8E4sAf76hdoDCh1JNJfpBbfkcXjEfPKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2qM6FPLuXwm0vdWFq4ICsPi7C3yCRSXTuSpYi37WNrM=; b=HUB6rWhKykeHWjQFrZgfBTtmBxaAifAik71br+Q55bdFC/mIf1oAa5+xv7SWRgvkO7u3bjRf70wprQ57/dr/CjWlM/AgspT+Jrp6LjaW6oUm3T+JWHITMHlO/eAImqqsRrSk2RW7NyzD/JAhL+chjCpHSQtOcmz/oZKogiF5FBGNf2/crpT+UX8TyFf8rJ+woRAUZ8p/wB5JFIGEFLRN/lsU0SSsNy+fgMf7UQlLL9ZSY2ZvXVhqHNeHu1pMyiQCj8ir065XO16uHO9Av2YS+3NZOabhICF1E01Jxk0VfVm6SRSoaR0RnGkUMzGsFauiTtLcPLL43XWWA8iIFVolZQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bmwtechworks.in; dmarc=pass action=none header.from=bmwtechworks.in; dkim=pass header.d=bmwtechworks.in; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmwtechworks.in; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2qM6FPLuXwm0vdWFq4ICsPi7C3yCRSXTuSpYi37WNrM=; b=n/r0D/AjHcY/uHP497GQ/XEH+o1XbnqlXWl2YFRno8J3bG+8aeLkrnz3uiI4fwIkybDN2xwEuemIZ7trD3EeMXeHpvo+p2wblktgC0qHIkQskJpo2c4iApMuP8Mn9QfAfVkjsXwK9wOT7MafPrdo7RNS8BgN7tBr/SrthiQrKtmwd2g5AvdAJpmBAn1CUNL7WgjJVasUIzdUS0df8j6rhwEuJyxu1lqFoqKcH6lr1jJMpT//Fiw3KYkFU4HBX30wBkKHsZkoV6BpGxXdvBwDzC3EhKQsGITIh5GB/qQeNyWtiKSf3y7IbDsZxZZAe5F/nc46cPsWlzU/7RQkVsRv9w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bmwtechworks.in; Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) by MA0P287MB1011.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:e3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.10; Thu, 20 Nov 2025 08:50:15 +0000 Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483]) by MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483%6]) with mapi id 15.20.9343.009; Thu, 20 Nov 2025 08:50:15 +0000 From: Divyanshu Rathore To: openembedded-devel@lists.openembedded.org CC: Sana.Kazi@bmwtechworks.in Subject: [meta-oe][kirkstone][PATCH 07/12] ImageMagick: Fix CVE-2025-57803 Date: Thu, 20 Nov 2025 14:19:54 +0530 Message-ID: <20251120084959.51761-7-Divyanshu.Rathore@bmwtechworks.in> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> References: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> X-ClientProxiedBy: MA5P287CA0130.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:1d2::12) To MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MA0P287MB3378:EE_|MA0P287MB1011:EE_ X-MS-Office365-Filtering-Correlation-Id: 18c87933-3756-4256-a93f-08de2811d340 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|52116014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: mUZ4bshjFHLAKx8XAm5FalSEC4yHTdurkeRDeWvEFsM/eqNR+CAg4Os/xV1/Mk82mLq5504eqkJZ4TcpCplVvS6KZjNifi0MxeOwg7RRIcga98s5gvZkX8XRhvooFhATvZCWJcYc6jQtVTCIoz1L1DEuQYPn3pQnPCYbsbqp40AwXBPSllaxuJx+Ld106LG5GMeGDAI0rnZhpja/gdRCGN4HD+xMkAFOZbihq24CU3E/Jk2mSHYs6kYK7KOOwDV1lufDH1oaz7gdh+U1rbjuHjEGYomM7tIi55toyKaHI6szd6bLdpgnO5ZrCWpkdskwbx+abci3fFAhOnlH1bYbjxCUqI3wtTQFK5QwyetkXD4b6VcfNyxL08GOvj6mdaM2UPJ5gI5e7lOgWyZ395QbKcuopaGPe5nXxC+mnuqZh4NsksazS4CG7gwV9ry/+QTq+aWjII2RLa3lqwUULX1L8b7+KaAeDPLiyoX2pZQcbbfRi+vGcCXwTdfCFFtkDMx+s2zbllDUxpmzUl1AvMYin7L8bWbpJOy+O8pb3lFlTYntg7sND9SYfo9o130USxRG3BTupwMhfe72zWjIt2IlM6KSKPpeyEn0eho0G/2AibucI7wCxlCF2HuAzSzmPWTAcmyZF6qidAXofC95Y6/AFynrN09TZVBPDRj5MIA2ESEIhmxdXuGQcNDJ6a/EPhBVoYp2l3ebZdstW3cWUg2K/A7+09fv3nb50KDp/EoIm/L/qCpUbJCmDDdt+R5NNDCwbC002GGH/qVs5nbgLbu88Y/kUyW3Xl18f5gBboXOwUr4swtRjjz7AldwYjQ4NvpYmoioyWXxBI511V6ZphdKxGGKrn5cScV9FjlGuVeC+Jbdh6HSNsFCGM+kZApotFG4BbAeI/XQ/jFc6vZCkflZyj/A3Wfc4XfYisWzbfIfmTH+Tj7NG61FymOBLJLpQ71kG9rR2Yx9vyfxiUCZ3wURKZkEmDfQHFDFz4HOXMxN584AHL7xduaxGWixRichMzqT+Bw5VoDnIp240Ws48Uhb6j/2jorCU74d1KyABLyigZ1YEJDYgbGhBqzML6ZYfpF6npXqWZ5wVdma26Y267RftDDDv1+8USpylJGOMrzz9+lRe/R0ARDcE5Sr0+3311mE+7OQTulVdCOBAvn5Ragwgpvoe71JoEdSTiGueU5GqqnWQ1TPioIfG5Yjpw7R5eAWFmkGxO8tb3ONquiN/vVJZfPBBVs6GYhEd3OC2xahpYN81MSHCl6dhGxZ0m+C7F3AvutIsnVP3N5N/hWhpAoOKQFJZvHEwwD+dC90lN4JSHrvOJkRm0sQkTNwjyIA/HEwhKEsXsn8rIXMatw2SowlHQiJvDlNdJ16Nat7UvZ6ZvFqp6wi7FjGyWTXInCZSSQor/JfW+sBaReFdU5JQSCXjyb5okdVw1i1c0PRk0IsTwPyF8/xF8QScI8FHcr2SL05 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MA0P287MB3378.INDP287.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(10070799003)(52116014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: N9zHwIxwNoyEtQTfksKXM0lAmpDzt5k7O88SAUlXI5Qz+rU6FCxYfNyqtD0dcWdWjWRNE+LnsUL8AnFTvwcM999WLQK7jC3+E94XcGLhRB+ec0/U1yB8LoTDg+2VhocMwiwebEmnmTnyMbfhQN59ub+/wu3gaDKeFRqivc/NEwJWnYrVTW56iLMrN+txaKY5fSf590hAjBWTPyvmpPaReu2EfshdGaE/WTz+/Qi1c2CrMUAT6CLuzpmssLwg+dh9GDvFHtC5jyB0LMEuJegPCFHAX0R/CMDGVFhnJxm3CsS373oIhVPMu5wC7b0szF7Dbc1YqNDvTCMlGwos0QtssbHiL6Tye3jlJ4C4eTxizqxiD7do1Y0BaqeqedOyGSX23aXJFGu9bmrbHKCaXlzCPVoM8TWLxgfYkrfnV4YJQlLx4Rx1Bynf75lZaHlaFjY41J6D8GkaW7pl4q/9hlL65pU4T5dvhHBPkWxe09KCAhuaashtg3us4qxx27Ks/u6kHePTylYK5uoTvbH3j+jGKBPKKhh+DuPSkELRKzGDd0d83D1qhp1vQUJ9EaTPFXSuosAtaHvblnNo2XsRGi0w52vFSP4A04r3aMAVIETgdWq/fU+72iTImI8LlPrVS2PFxXXNB7KPGkmxh4yLcdxHnN5xFk8F7nd0GxN8tZq9u+aYpIDtqPZ/8X4E+0G8jgBn2JTl33MyxbsA9/poh+KNYLSv8icyChtr3eRzZw6uLoZNulFjla3XiBM0l7DweoTPwIJDb/tukR4D04Tvr7sKE+lznLS5EwrynzuYhUQHQE/puAW3mq3T5ARxGiwqzFukIZjXOvfE3Jjn3R1Jr7M/pwVIROTmzY0IYwnd76EsY4H9GE6xfEZDCaKdytfJtbOdJNWxbeCH8qV76YUS0LNU4T4EbYHfeYkSNmPhKRxxj5BFPlsPgCAWI+YPswQmoAt0lz260j3+IYXD/FJD4+qUEdRyPPtlBlSUMMhW7EmtY63JlaNNb544ocmjxzp6lDnkian4cWzFG90ZU7U0D1NXNykt4rtrSuwSPnA7fvvZkXP47+6zW1sYQ4Qpmz7XppnpwE80I25l0HlbON+Sm4fZ29p3rQnTMYIN7gLQ/dbsz8aH/BrZ5sWWKVB1g8VbhqA6rnB377nbCxPnymS+yDMI2S0LgrNaULUBCi5+uREtMNxb76PvfQQ2wVBsxonoYv1gtbQ9/WkTc2K+t8Iy7umB4tyZXqey9itjoLuP0dmtWbim2hVEnoRqa4cqpF5/OKA1ZD9TA9zih+bk2JrImU6gXe6lDd7qTSYiYQNbWnctZGPh6pkJdCerckGV9m3aS2aj57sbZAER48TvAZkX3MV1ek5h4n/llBy1Bhe00SkGlwaxenn3516ropu/Wi4d88WVgHAS6+1mt/dKgqyFP/65Ly95Yvb/0YijjejWXo1gcyGXDX3syHjLNccgwryEVCzpbvDEZEJM+ibYWfJaBMgbYTjGI1EBQeGkvfvtcLwwzq4TVrYMd8ijLuQKgD32DvYW216JYg4KLSoP2MaCqG/LbhH9h+uRFtHnQa/lx4RsXnTi5jkG0Lid2k2zPmjPShh8TRuESPqsRtyZMft2EAPPaC9UKVXjopVEA124zlRKLl+2ZNf9Oj/y9WiF/DfbR7FLJjegzh0sgXE52uEAfmySOvryX0+1OrF8zh42nyOqWeY= X-OriginatorOrg: bmwtechworks.in X-MS-Exchange-CrossTenant-Network-Message-Id: 18c87933-3756-4256-a93f-08de2811d340 X-MS-Exchange-CrossTenant-AuthSource: MA0P287MB3378.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2025 08:50:15.8044 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 970fa6fd-1031-4cc6-8c56-488f3c61cd05 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Hl8uztdgE3BQSdX2uQ3MQ2DEGD5vcbsxxNWna5QiuvXWLeilIpq0/KU0EEzhyk+kWTGJ12zyf3+0z+EwB8VaVbpa53OT56Wny2IHZMX9y6nQ4HYZdmiOG+VeahCCx332 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MA0P287MB1011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 20 Nov 2025 15:26:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/121938 Backport the fix for CVE-2025-57803 Add below patch to fix 0007-ImageMagick-Fix-CVE-2025-57803.patch Signed-off-by: Divyanshu Rathore --- .../0007-ImageMagick-Fix-CVE-2025-57803.patch | 87 +++++++++++++++++++ .../imagemagick/imagemagick_7.0.10.bb | 1 + 2 files changed, 88 insertions(+) create mode 100644 meta-oe/recipes-support/imagemagick/files/0007-ImageMagick-Fix-CVE-2025-57803.patch diff --git a/meta-oe/recipes-support/imagemagick/files/0007-ImageMagick-Fix-CVE-2025-57803.patch b/meta-oe/recipes-support/imagemagick/files/0007-ImageMagick-Fix-CVE-2025-57803.patch new file mode 100644 index 0000000000..77660e998c --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/0007-ImageMagick-Fix-CVE-2025-57803.patch @@ -0,0 +1,87 @@ +From 13bce1a21fff8cd8eb1dcde5f3571945b0b6d447 Mon Sep 17 00:00:00 2001 +From: Divyanshu Rathore +Date: Thu, 23 Oct 2025 23:41:32 +0530 +Subject: [PATCH 1/8] ImageMagick: Fix CVE-2025-57803 + +CVE: CVE-2025-57803 + +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/2c55221f4d38193adcb51056c14cf238fbcc35d7.patch] + +Comment: Refreshed hunk to match latest kirkstone + +Signed-off-by: Divyanshu Rathore +--- + coders/bmp.c | 31 +++++++++++++++++++------------ + 1 file changed, 19 insertions(+), 12 deletions(-) + +diff --git a/coders/bmp.c b/coders/bmp.c +index a46448a95..beff10bb5 100644 +--- a/coders/bmp.c ++++ b/coders/bmp.c +@@ -507,6 +507,11 @@ static MagickBooleanType IsBMP(const unsigned char *magick,const size_t length) + % + */ + ++static inline MagickBooleanType BMPOverflowCheck(size_t x,size_t y) ++{ ++ return((y != 0) && (x > 4294967295UL/y) ? MagickTrue : MagickFalse); ++} ++ + static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) + { + BMPInfo +@@ -546,6 +551,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) + size_t + bit, + bytes_per_line, ++ extent, + length; + + ssize_t +@@ -968,18 +974,24 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) + ThrowReaderException(CorruptImageError,"ImproperImageHeader"); + if (bmp_info.compression == BI_RLE4) + bmp_info.bits_per_pixel<<=1; +- bytes_per_line=4*((image->columns*bmp_info.bits_per_pixel+31)/32); +- length=(size_t) bytes_per_line*image->rows; ++ extent=image->columns*bmp_info.bits_per_pixel; ++ bytes_per_line=4*((extent+31)/32); ++ if (BMPOverflowCheck(bytes_per_line,image->rows) != MagickFalse) ++ ThrowReaderException(CorruptImageError,"InsufficientImageDataInFile"); ++ length=bytes_per_line*image->rows; + if ((MagickSizeType) (length/256) > blob_size) + ThrowReaderException(CorruptImageError,"InsufficientImageDataInFile"); ++ extent=MagickMax(bytes_per_line,image->columns+1UL); ++ if ((BMPOverflowCheck(image->rows,extent) != MagickFalse) || ++ (BMPOverflowCheck(extent,sizeof(*pixels)) != MagickFalse)) ++ ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); ++ pixel_info=AcquireVirtualMemory(image->rows,extent*sizeof(*pixels)); ++ if (pixel_info == (MemoryInfo *) NULL) ++ ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); ++ pixels=(unsigned char *) GetVirtualMemoryBlob(pixel_info); + if ((bmp_info.compression == BI_RGB) || + (bmp_info.compression == BI_BITFIELDS)) + { +- pixel_info=AcquireVirtualMemory(image->rows, +- MagickMax(bytes_per_line,image->columns+256UL)*sizeof(*pixels)); +- if (pixel_info == (MemoryInfo *) NULL) +- ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); +- pixels=(unsigned char *) GetVirtualMemoryBlob(pixel_info); + if (image->debug != MagickFalse) + (void) LogMagickEvent(CoderEvent,GetMagickModule(), + " Reading pixels (%.20g bytes)",(double) length); +@@ -996,11 +1008,6 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) + /* + Convert run-length encoded raster pixels. + */ +- pixel_info=AcquireVirtualMemory(image->rows, +- MagickMax(bytes_per_line,image->columns+256UL)*sizeof(*pixels)); +- if (pixel_info == (MemoryInfo *) NULL) +- ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); +- pixels=(unsigned char *) GetVirtualMemoryBlob(pixel_info); + status=DecodeImage(image,bmp_info.compression,pixels, + image->columns*image->rows); + if (status == MagickFalse) +-- +2.34.1 + diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb index e9b125e71f..e1519b13fa 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -29,6 +29,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt file://0004-ImageMagick-Fix-CVE-2025-55005.patch \ file://0005-ImageMagick-Fix-CVE-2025-53019.patch \ file://0006-ImageMagick-Fix-CVE-2025-55004.patch \ + file://0007-ImageMagick-Fix-CVE-2025-57803.patch \ " SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" From patchwork Thu Nov 20 08:49:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Divyanshu Rathore X-Patchwork-Id: 75096 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B102ECF8871 for ; Thu, 20 Nov 2025 15:26:36 +0000 (UTC) Received: from PNZPR01CU001.outbound.protection.outlook.com (PNZPR01CU001.outbound.protection.outlook.com [40.107.51.29]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.30438.1763629637392236504 for ; Thu, 20 Nov 2025 01:07:18 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@bmwtechworks.in header.s=selector1 header.b=uYflnOLz; spf=pass (domain: bmwtechworks.in, ip: 40.107.51.29, mailfrom: divyanshu.rathore@bmwtechworks.in) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xhhe1q3K0K7fy4vNCUnGYWpv1LVdAZ7odajHBGajYrNAwSce9cd63D7JylMyTcWR+q20PlBVsRTOAePcRg81x8V7tm5yYs/zdnWD04VD91owOdc9wU4ZlO4m47NmEV619r+Mzp2okrp+ikfXLodFDy1DV3iTaiG4TL7GF86F3vxQdAg/kbA/9lEKZhY4frxSQ5jYyKJteaIiCaIzQmeY5L8vG2twAy8ahBhuR50vWiR0L505vGLz2i7hbXKS/4/lBgUv3Pa2CYuYVfTaOtavyaGrgm4jqZh5sS1k/4mp7EcF6yhKpvF2Eis3GIOEOW80zl0wcdC2nA1j6XxZH3s0lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QbfrGUX8BAj5k6cc7JklEYcYq4M7CwXhj8dvezuMSV8=; b=oSrwvTs9VWdFtXVJPjijFRxMZlIWILPYSm8KmLP/keZ77kcjw8+8XdVkaZiESsMTrtK0eDPHLOfQ2mZG7sfCF/j5WjvJTJWzlm7OMUpI1AzHXWIYrfT34dlGLsKIeVwr1Hf/4HPi/dQnhf5jj1tm5kHTH0S7N2YzJxGDjaBhqyXFnA5gjxTu19EndiJoN54k2axYeXak1zPv7f2soaoCwhXrs/r56CJuiWk+9+KytF0eA5zJhdSoiuqp0QLGHsZPQXg3ntT/mHNP/XUh7XKheFCaZwk+APVeycIO16OIZeuITczBcs1PkJrWRjqDDHz+G1QJ1rwp8kFRgd5Ew2Tyxg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bmwtechworks.in; dmarc=pass action=none header.from=bmwtechworks.in; dkim=pass header.d=bmwtechworks.in; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmwtechworks.in; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QbfrGUX8BAj5k6cc7JklEYcYq4M7CwXhj8dvezuMSV8=; b=uYflnOLzmH0xzdTXMeGV/Q1WWZt3bAsihUVujGF7/J6W2zPf5z00o8gWvPftPcPpMXM75FWjOc7AYGYr5SJ+DlmGlI6gzFCHYB/76s5cYOsOoJUtKOnE7T9suHnFLU3BIyvJH4UQv0aGG2ztuSSFfceI8Eq99NJiA3LTS8Q+T2QoDbN3grro8mCA6UJ/LkMV/W7Te3y2WOm3yqKWZGIBilkD9sXbL+QhLs6nrnu0cdxjUYxJcROMjsdnL70CvZVKHEEvuzixh71GroHhI3LbuGEYzAaNMYJSnq5l9dflMDMjU2DibnkhObmr0DSwcpYrF6+bQ929y7Rx3qZBsCfyZA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bmwtechworks.in; Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) by MA0P287MB1011.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:e3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.10; Thu, 20 Nov 2025 08:50:17 +0000 Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483]) by MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483%6]) with mapi id 15.20.9343.009; Thu, 20 Nov 2025 08:50:17 +0000 From: Divyanshu Rathore To: openembedded-devel@lists.openembedded.org CC: Sana.Kazi@bmwtechworks.in Subject: [meta-oe][kirkstone][PATCH 08/12] ImageMagick: Fix CVE-2025-57807 Date: Thu, 20 Nov 2025 14:19:55 +0530 Message-ID: <20251120084959.51761-8-Divyanshu.Rathore@bmwtechworks.in> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> References: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> X-ClientProxiedBy: MA5P287CA0130.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:1d2::12) To MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MA0P287MB3378:EE_|MA0P287MB1011:EE_ X-MS-Office365-Filtering-Correlation-Id: 3c6a4bfc-6b7e-4b8a-243e-08de2811d40d X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|52116014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: ai1ScqJtEvig0xCn4VwXoOBq6F5XWxi9bwKYqFZwUDaRYnJ8JCcZKbGF0xRznPKo2R83IhXzeDLiqDqahuPrefdsLnQj11NDTLrA/ZiKaozF92HTyT6WsZpXeZ5HHk6+spVRLezsQur7lyetmzVbkouKz+ZSbrqrxE8Oye4WdkXKjOXh2J8xF8FuCFbfbqGOhZ6rMnLb02j3UzE50LPNCiKk8WyQHPbc7iX4+zaTlbcs2FR5KwjVzKBD8rNBCtNyYD2GKvwxvIN/j7Y4mPymUky7S3MAweb69WQpBCadhf+A256YQujq2KKBzn7MhgkVHbHQl1jrf0WCxuOQANFmek+61tOqwt7rs0zst85NYYrg+WGd+sACmQ22zum+EqB3wisfAm+wmeXXjIEoeafZO06JetL2udfEJPewh5UD7OI2JzdloGNuj1j7fbPrHP/KdSTGO8fBKS1XK8nHm6NTR4jx2Yxi4mkeVYf9Y32MTEKnQgkb4nmzL8cmVGYih2LJjNGNfV98q0H2iPe1o9ECoc15ac+/qdK8DyyymN1g2NEUSNr8ltBkHwtqURR+ux526kuEN1amO6QmLf9mffGBVgb+veiujBreVxbp3df9iNKs65tzPDPQbaGtWlTeCQR2ziC5RzpEBvXmKlaNSatpDxVEs2A8t5eI5j4z7DzMpueiSb+2au8LAgMlvTrPWfAc4IFXMRtsnZY7px0nD88MY2Oq5KMmvit0LvyP8ZoEhTJi7JhY2XCNpdJrL4GuN+yFYmfh4BVpQUY4/UHRca7KG0SH4T5CL06OZxjmIh6cgaZK0PQlSz3zYnOUwgOHCzg8zwCVeMB766grlv4k6D+ewxLf7vRnuM+Y6mcXAITzaNTia/58s8qJn4oCCUTqrZHRzpuFMAm+/giR2nOseGWc8gl4iuM6uw0mk63pO0q7+Y/+ts75u9HxySYpBOspPp7t/kRv64uENA9pDwbAdGDD6dHQ4F0YaP9L7c1lS3qVUqbnikNK1gi5/rTZTec2MVwPzKNxiIY+wI8T5SkI9uq5fd13tmNrUPQgShza2A7nll41zVKR77bhdyGZMhS7LqwMgJJDGGM/cbaFvo7OVWcf7+0eAU+ForVexXAHN2Ci45RsC65sMG4XYpk+KDPdrCyj/lIzYn4Oiip3UKSzxT/0l8Sa+IsTq84tSuw6xMW/nQ5QmcdhwqsOdEXQZ0AkH/jyVMrsdfFZ/hUud69ZDViDB80ZwQKm6i0v1o59Dv8qXDR/rkSYnB+9+yt2fvehfGTr7eugYubPcVqQK+ydVPAWIQR7t/cIGHxBzDfqdhPEdK4f9ngi41Rpfdh2h/bR8J3clsPoMpAns1TJ+jyv2/aeOengU75b8+dOVGDLSBcBVYAGrXHdqIg3RWAR2Xug2EmpULPGiT8p0o2avWUf5GqVcH1KuAnG1lsIbWEAtLhZBVFLjefjYFkYT+O4ODfQ4VEX X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MA0P287MB3378.INDP287.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(10070799003)(52116014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QGz9cu2S+4WIUYJjfzNnrgbuAu3NsLej26lUowy541YM+E2mBoK4r6RarGCp7EOk6X6iAtuItm3WKa4DUDxs0Sgaq32ecEKj1vrRRNPwmuzBltXE9JnEy9KMMVJAnUNr1GSpg3Q11Qo5TgtGZfStzPf/2uQ/tG9K2Z3Y8a2OdmlMp9wuuIWO4c363WU+wCSJV/nGRGlDbgOfCe7rPmsxkAH4/nEjUxhCp6ToZxHk87PScB5BjqmReSyfprgYZa6nG6Gb8vaKdAsFqlZAE06rXUqSiMT/6TshVg0RL8LiLaIWAjbk4Tjh8t4IvJCE/68s0lVZJhVc2A0BOxTl1WQVpNFGXNhRnircx5hlIm9gGQ65x4rd3w7V/AqbQLHLU7TPVWv4dBRXcO7r0mDFq3V3ICjek3T8yRJ+rCrCVO/S8rgVIco528BENEwatPklWs8B11oZ+VCIDkciYdjFF5HbRpxKIzdGOMEXWkgzcbJ5O3k/GKatdCw6oQTg7Oawx55EyFSlHCFI6FAYr9qjc7p5JUDi5ZVshXgf0HMZYYNlSdTyBbd3eklDFGLgVvEn3Bkq1VaRdpT45+GtY4QOf30llm2X1prJTTapvk7vjquXAiDNhVNQVuWXVvo4KnlcluQaKK6fvXtHo5r1l9dFi3Sf43oFgTHHf05YXFpaTsRu220cDxmnA1Z+WLtfZNJ1YJIlvGqsPyAQWRV42Eb+4SPXqJSP+umXWIANf83UzhHRAGY72gia/CDU5k+JruS6JNg3pGm95pEFPGltD+ZJr4N/UXeRp+lA+l1/h5BXLbfto12YhAkCugcuqqD6QF3pvLxjztY0ezoxDeozvZKdavINYkZG2QqNapReNfcp92GHTlEHk91MDKQaOowN9HFV+bI/dtzSE5dxjdvc+LeEXjnFq1jphvBUsKItFnlqI+elzXEujmKz6lCq1zA8SaFTUIWbjOl6ujxSs84Ga3iw+jifOB40sQCcfVBmbLEDIECCZGoTxtOw3MOt/uzvl3Vzo+wFLKxozSQ5VmxnhTjp8mTmgU7L7qLQZ+oXpvJm1u6Pymc5KWQUAunXaZkxZUUWexLFJMi2qr2O7vXpzAqwmSOQzm9BS0zsXpT3sFHGyA04dc7rF81G1XbF3VLb7hToLXsZHvXXTT8+y//CgqD3HXYnoo8a0ngeiqhxRvZwVX8rd65w/gsxLCOQCjW5wQySfCM3m5VlIZv2Nxj/7mj9yoGPrIYiBWYbTLKN/TegxpDmHChsHG3XRaXVrzb1Y6WO3gVFyjQUApTAcE/ZhuUg3EV6nZIq9EU8FqMDNqGP0RLOw532o/qJmrf/77FdNarh/Goa+IqlZUq7NNYu6UV/q4HU9vNIFFCSNcJ+Pr93qfYvAN6R07QOz1MMPorW6s3S0CJGATpIG4187WjOjuysFn/vIajuIXt1Q0BY4bxWGOUdQRrusrlIw0tyXXsVDJKNFJMX/PoRmcLt+xR0L3T7nLeudf5MRe2t9bbQ6AhW6+CQ0rRXysLR6LISZL09zThyE5RqsbFO1KmcRYGoYV1GKaMEvvHDnqK/n5qsOIj7FfUoRjHiznyYHWrZPi0Q/4MDHjBSoDj7UFLWmwKRk35cNPqq6oWBt0pJTG4nCsupaAfMmukBdM3okQl1f38i/TV+OccvwjaO0nEF45xzvCboIhxG6LJ0MBVNNMs+zmcg4yqEzbM= X-OriginatorOrg: bmwtechworks.in X-MS-Exchange-CrossTenant-Network-Message-Id: 3c6a4bfc-6b7e-4b8a-243e-08de2811d40d X-MS-Exchange-CrossTenant-AuthSource: MA0P287MB3378.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2025 08:50:17.1338 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 970fa6fd-1031-4cc6-8c56-488f3c61cd05 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 9jdmsCJM5Mm22XitCIE491TSH9yEkW6LV5VbySffCWTtBPJUKkyCMBSKYDMZQc5CQ2gg2sWxS+mssfWpd515q4+A4Qmaflc73BJPuRXZ0jxwvQlywxlnqgVekf+xLfL3 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MA0P287MB1011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 20 Nov 2025 15:26:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/121949 Backport the fix for CVE-2025-57807 Add below patch to fix 0008-ImageMagick-Fix-CVE-2025-57807.patch Signed-off-by: Divyanshu Rathore --- .../0008-ImageMagick-Fix-CVE-2025-57807.patch | 51 +++++++++++++++++++ .../imagemagick/imagemagick_7.0.10.bb | 1 + 2 files changed, 52 insertions(+) create mode 100644 meta-oe/recipes-support/imagemagick/files/0008-ImageMagick-Fix-CVE-2025-57807.patch diff --git a/meta-oe/recipes-support/imagemagick/files/0008-ImageMagick-Fix-CVE-2025-57807.patch b/meta-oe/recipes-support/imagemagick/files/0008-ImageMagick-Fix-CVE-2025-57807.patch new file mode 100644 index 0000000000..a09113fe36 --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/0008-ImageMagick-Fix-CVE-2025-57807.patch @@ -0,0 +1,51 @@ +From 0d258139d51628d53493cf5dc15e1fa9f3077bd3 Mon Sep 17 00:00:00 2001 +From: Divyanshu Rathore +Date: Fri, 24 Oct 2025 12:37:14 +0530 +Subject: [PATCH 2/8] ImageMagick: Fix CVE-2025-57807 + +CVE: CVE-2025-57807 + +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/077a417a19a5ea8c85559b602754a5b928eef23e] + +Comment: Refreshed hunk to match latest kirkstone + +Signed-off-by: Divyanshu Rathore +--- + MagickCore/blob.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/MagickCore/blob.c b/MagickCore/blob.c +index 6a15d4808..38af749fe 100644 +--- a/MagickCore/blob.c ++++ b/MagickCore/blob.c +@@ -1598,7 +1598,7 @@ static inline ssize_t WriteBlobStream(Image *image,const size_t length, + extent=(MagickSizeType) (blob_info->offset+(MagickOffsetType) length); + if (extent >= blob_info->extent) + { +- extent=blob_info->extent+blob_info->quantum+length; ++ extent+=blob_info->quantum+length; + blob_info->quantum<<=1; + if (SetBlobExtent(image,extent) == MagickFalse) + return(0); +@@ -5774,12 +5774,15 @@ MagickExport ssize_t WriteBlob(Image *image,const size_t length, + } + case BlobStream: + { +- if ((blob_info->offset+(MagickOffsetType) length) >= +- (MagickOffsetType) blob_info->extent) ++ MagickSizeType ++ extent; ++ ++ extent=(MagickSizeType) (blob_info->offset+(MagickOffsetType) length); ++ if (extent >= blob_info->extent) + { + if (blob_info->mapped != MagickFalse) + return(0); +- blob_info->extent+=length+blob_info->quantum; ++ blob_info->extent=extent+blob_info->quantum+length; + blob_info->quantum<<=1; + blob_info->data=(unsigned char *) ResizeQuantumMemory( + blob_info->data,blob_info->extent+1,sizeof(*blob_info->data)); +-- +2.34.1 + diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb index e1519b13fa..905af46f11 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -30,6 +30,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt file://0005-ImageMagick-Fix-CVE-2025-53019.patch \ file://0006-ImageMagick-Fix-CVE-2025-55004.patch \ file://0007-ImageMagick-Fix-CVE-2025-57803.patch \ + file://0008-ImageMagick-Fix-CVE-2025-57807.patch \ " SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" From patchwork Thu Nov 20 08:49:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Divyanshu Rathore X-Patchwork-Id: 75099 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFE83CF887B for ; Thu, 20 Nov 2025 15:26:36 +0000 (UTC) Received: from MA0PR01CU009.outbound.protection.outlook.com (MA0PR01CU009.outbound.protection.outlook.com [52.101.227.41]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.30081.1763628751698612110 for ; Thu, 20 Nov 2025 00:52:33 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@bmwtechworks.in header.s=selector1 header.b=znFadXyr; spf=pass (domain: bmwtechworks.in, ip: 52.101.227.41, mailfrom: divyanshu.rathore@bmwtechworks.in) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uqWpHaetX9ApY7VkhTZcEPMC9lmsLbo95dVZ/6ZF1FROSishmk99I3GsdLeKv4AvZ/9m8BnshB9ShVOl/ATTwa2mQ1MuQ5ACj/C6tDg39m6+IlhLHd4XGiuqSw+Lfbt7C2yL92aL74y4z9R+tW8g6X+YEJw/6NxL+8l7ESfIPKKWmSEeCqROJ3Tr+A+cYcbeVA/XW4IyrslVspkJ7LIxhmWgYi+n5rAzR5eUBtwly9koJgzw/zhFqPuVowWNAgGaOw3aMXHykhfKIHBekzg1roRUAzqJyw3TuG9qy46WHBjcUWjqod3AkwHH5u/2QfYfK709L8gVXvs2y1vwDRrbYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8T//vs1vDhIrVXAI5t80S9mNr+72xagDryJZrHEvDFE=; b=IknFUEH1utw9n94C64h0dYqCeWLBgsrEjXySaoGlSRogbArWu+d1Syw7btEKDA7zxudlHLJS6HYKmhioxmsUjf3YvOmj8ArK+JSwCwGzg8oN6FIO1HWqIDxxSxZNUz9NHSqBAe0Ja/m4zRKQZvioUmWvwlAeHl1YmpiqSD5fHO3zVW11kp0rqSLa5cyFvHSf5I23llelFZzVrj6iYXXRfT9dke3EB3YfV0n+YVelfO7cByxrDTWVC+TieaieCJzmf3xo/qMxvCQMbKIyYd9qJrgmk0f19PBQSWTWQjIxWlSVK6YITDqzFNhStpixzXlQ0CttogCqvjVltpjmoorEWQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bmwtechworks.in; dmarc=pass action=none header.from=bmwtechworks.in; dkim=pass header.d=bmwtechworks.in; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmwtechworks.in; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8T//vs1vDhIrVXAI5t80S9mNr+72xagDryJZrHEvDFE=; b=znFadXyrMSfK+tPc5lqe4mlFaoDPlpXskNWNfPseKEaj0Vz0SFFsQMiIbHXglC4Xz/5XdfUx7afd0f9a+BkptEqkYYUGSEnFeMtKamBmOVuNZPYCXagMEFHODjH1B7x4L8WxQPTaIcmvJGMBnwc7oMqEQ8uLzwE1Le1shUGa2DCMbnM9aLE8l4alpNTK1NXayw0v/k19q7K+P4IBqirraX/aeSaWN8QXf0Bvr6lN3haFYAgrhnkfguYt3jTyVRY4F5yPN9BQlmpYoR48DcSbPVv07+FhDYceLL5nFxbj8FZFVFvI9idpxbS8HtEMGXTb6If2+nVAwkjH8f5uAOyBIQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bmwtechworks.in; Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) by MA0P287MB1011.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:e3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.10; Thu, 20 Nov 2025 08:50:18 +0000 Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483]) by MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483%6]) with mapi id 15.20.9343.009; Thu, 20 Nov 2025 08:50:18 +0000 From: Divyanshu Rathore To: openembedded-devel@lists.openembedded.org CC: Sana.Kazi@bmwtechworks.in Subject: [meta-oe][kirkstone][PATCH 09/12] ImageMagick: Fix CVE-2023-34151 Date: Thu, 20 Nov 2025 14:19:56 +0530 Message-ID: <20251120084959.51761-9-Divyanshu.Rathore@bmwtechworks.in> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> References: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> X-ClientProxiedBy: MA5P287CA0130.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:1d2::12) To MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MA0P287MB3378:EE_|MA0P287MB1011:EE_ X-MS-Office365-Filtering-Correlation-Id: f8f1937b-3458-4833-16f1-08de2811d4c6 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|52116014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: 5mu3c7jY4v5OZnJnKCIpNsDd4PPZsY7laYCgDN+lyqpVqEpuPDAFH5bAuvYTS0HjWJlnooDCpCBRDEp6SuqAssKwCX40sVeLe5yqld1SAtZc/CSlPPSUEJOSPAD1CI/BzKGGXR3yZyGTx4JbJ2gIvxiwSV9OOnequVpiJa701wX6gMT4hXvKwUQc6rCsDQC62980IYuBKCzoxtZjMs/CbK7ImAlhqkT+pZE7wVY7WzCPKDpoR2sbgEamMll6hY//Xj/I/MSv0CNA9cdMuIegi3NDfBtuSdHv83oatZrmWdmAMdyMqMqku+U8XUGkuHnLwc9UJMx4ZURSGMPienQklpLEF/YZ5Zl7X8ybezuvBScOC9WrpxPuAw+Cuxx1cWzysgUFvsnEtxwDrnmCjrJrg5Pp4jhlyDGjXoEnrkdorBsDZh0xns/Q3P+Uo1qskJQ+0zFYixZ1QAuRPAt1ZaBZ0ZZ/TSRJsDuFTtiLY2Z/rooC0hUfZlUap7SXcSbejc6zoX9JPXGsmP/2vztXZpQLM/G6GNGlWF0muKv78WR/i2O7IcJyUBRuHogZcPGQQkHmQ7XOLa/d+Ds31q25OuftXSP90OsJBCL5W/ETW2EYrLzsdJ0kjLv0+d14kOx+NpHpV97KnxQt11lTX5l5YdBTb1p5KXs7/qxls7hcG3TZyxRo1v9brux6FmGkuTW1KzS4n0K8zpXyYyaKorPPsLVZPZquJDbyIPapP60Pyh/tcCNarMileP6zHYJ8/vX5KvMewWN+UaEEmw+Hb5CvGBD5H1S4doxqA2Nbn2VWKr29kzGcUZbtHtDuUaGh4eqtxeq51Cg50TC88SjEAvEWNat40rQXZJuwl3D7RpbAYc2/hl4RgAwNyd/TLCEthmPusIs/trv5lUk/9bxC5iJB1W06B3RnLSzJEzrbt+XUc1OZa8CDXy2jBLBBtthD9wVTYfXTIdoeqzRzUK09zZ3UWCgrmCZ+8m9yroWhr2fFofHzwMO1ssXOoO1a4R1GjwPu4g1A3sKv1L6RTVT/1owCuKerMvmVvVWP5ig6bMwIUWH/O4RiEuoO/33lgsz7MGVPw44jMJNq/4pVZPTELQrCimCWfE4kGmp7Q+dTQNhObLoaepO271dDbaAHtailymwLwqgL0b+8jYIBCjnX0dY+5VMXJvalvve7no0MR6UlDyOfP8ANu1+r5v3v1+z0jQlolZ9qq+Bq6JlthHUfu4GDsBecP7SmvSC3nU5XZX/q5hX+Z7/P6WaCMyuSf0uSxCWdq05udxm4NEljS89zUnWyx4qbGEj/JFRHMGhAAeTKPFd3O3t6nLHZF1PeXH2lBJ0ASF3w9EeZsuu0JTOWX2hjHn4QaW+ozbwIglhPjA4qxLhjFmOq4H71ieh/n/O93q3MuOPw9XDhOj9NVa3JcGn4UPqpd/bMVRmOy17PvL1F5q+ZVL75RYNskO/wVwSYWctEBeh8 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MA0P287MB3378.INDP287.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(10070799003)(52116014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 663B5WEbK/1UVEb0UzB5vY0+HRu7CTDItynUqkfG9coV6QwOOtzQQRGB7wCUOUWxM6bJ0F/XGn0xO4/Qlw0d+A/SWBB2W7RtZMMUvNHPpGbjBzxIJeA1bnzy9rHeNkbuWBNzxkLeVXkftWd6/YkQkxHUnAP/BqwWJ+h6bbvFD7YRFfmtibaUcBqMhwngRMUrGcKmUqm55rH7UXq/VfaJOR6LJLu2flZFfumP+OkrMS8xBknF+7pphHrc30pbYpHSaZQvzNomq89o35JVWrRGwZRKtG1M/q6ykDtDGxs1r/fsgTAQhNdH0wKjcVAh1haxDgFJ6gB4gcaf0+OmlU2UPv4gXSULxN6ZAkg82RAjmMzfMzsUkFEOtFyJvahr+CGdpUnE2w4GdUtnK61wRWlaxBY9RMNorMirqtOWyTpKXHiVoSy8WNrR+6TVjS71xf2kyDvtbzCCurxXNlGznhopjybcFETeu3pB0snhxms6osv3dX9RUbXagmfwyx+P05E8zownhEVbI2KgGA3e3+yvb+xTXqF1360n2MjQtu/BRZPrPkUfSh5pXSx5z3qyvv+Hds8fzdygTLkFf7OwD0pDOvSxP6ypTVSBDlcyBc0T9pFID5y0N2M3+Ya8dU34xLrBGtXUbJw2Ja+Fz0OenhzlRArtjFV66o3Y8tc3aXyg0RJJpSIIAwDC4IFykGJsGroc6eK52XqdF5gZv+n5FMQ6QuX/Je97S8MZhpL1dO8Nmsk0CBEUdTzkbaLcN6ffpIT5g0hK4yC/fMr4gRH5cWTqjEOz89S5MIKKO79AxKGd+Jzi63zXpR2oDHA3DIO2g0ebFU6yJmVG3/Lpd/eGJRJdhuI01yo4J1qfN6SRrEDLRE6AGnArLgpSaWJpBG57YXBOzQIo3bGkpb0Nr3qsjxVvFg5x303ZQ7J8guBcrdYu+WoauClV37XfjVXtXvqJPxAfQEaGvNxqcJJyB0fYyMrP2v8A32DHtYJ+l4pn1eRHz+BXwJLXgpy0cjVj73idBH9ctDrrqHCSS6sZ622uBGt6RCscEsquQt6QogWdJiorg6aa+cz6cubVU2veXJjz/QXyXnB4LYa7NFAtjHoN3brMaV1G36xNo6PoXvyvSO7zwp2cMyue+taGvrC4eDzTtSSXxFOJFN/5O6aNLy+7OVb7w/2uSmKFX5RNEwXc6mk72LDPgdrJhnnKIIGt+zBZnWOLEUcuqLJwYRBOYvNz1ArnTBdxXEbz4iWEZC1W/7u53ljLfgXs6u6CpxJ3zudUc1541zcGLCgC1DL3aB7ubGT4BLK+fwDWJTHHvlBqsj4ylcLtrSaUGa3ow/j/Yu20QyrnWHpUSAyGOCsy0WWOoNj+qIYkZE9JJE2wqdaUV1kdjrP0qu2nQQNN44Klq4Www25QPmCo5/uadRhVTIcpahz4orOcG3aE84Pb561OEE/irbhgInKFDc9msEyqytXg8T2NizDlN+/Ckx2EJl+a4S8xP/fEm++/S8uh02d2KjQKYla9/cBOiWVICwDFP377vaDSD0tpb49BPnbvwolZ99PGKMz2pg/+NIeLYANzRltMBuT5pAW0WrLUTiF1u9MWeKhe1TOY2NsXSL91gX5MibsVpWfDSEGVuVEi39yIVDVufXJj4+jC7yzdQZNIkNe95HBMu/5Z0ayT/1syavNVGw0yGyS6TPjDNjPZTj5K0IYsVHI= X-OriginatorOrg: bmwtechworks.in X-MS-Exchange-CrossTenant-Network-Message-Id: f8f1937b-3458-4833-16f1-08de2811d4c6 X-MS-Exchange-CrossTenant-AuthSource: MA0P287MB3378.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2025 08:50:18.3736 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 970fa6fd-1031-4cc6-8c56-488f3c61cd05 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 8vQe76ResWDYikXq+9vi6spZAABilxJAJX8d6Hsr4B1pSz/j4NSx8FzX81H9F0w4y/oCTPJQy9yHc5ahllVJuDNfBkgreftS8QMP1t+tCatIKEObCkPRvuBM9fmtzQY9 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MA0P287MB1011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 20 Nov 2025 15:26:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/121939 Backport the fix for CVE-2023-34151 Add below patch to fix 0009-ImageMagick-Fix-CVE-2023-34151.patch Signed-off-by: Divyanshu Rathore --- .../0009-ImageMagick-Fix-CVE-2023-34151.patch | 287 ++++++++++++++++++ .../imagemagick/imagemagick_7.0.10.bb | 1 + 2 files changed, 288 insertions(+) create mode 100644 meta-oe/recipes-support/imagemagick/files/0009-ImageMagick-Fix-CVE-2023-34151.patch diff --git a/meta-oe/recipes-support/imagemagick/files/0009-ImageMagick-Fix-CVE-2023-34151.patch b/meta-oe/recipes-support/imagemagick/files/0009-ImageMagick-Fix-CVE-2023-34151.patch new file mode 100644 index 0000000000..dd4802d75f --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/0009-ImageMagick-Fix-CVE-2023-34151.patch @@ -0,0 +1,287 @@ +From 338a66fd7b9ec918d4a9d31dcce4a7ca04df51bf Mon Sep 17 00:00:00 2001 +From: Divyanshu Rathore +Date: Fri, 24 Oct 2025 16:17:41 +0530 +Subject: [PATCH 3/8] ImageMagick: Fix CVE-2023-34151 + +CVE: CVE-2023-34151 +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/3d6d98d8a2be30d74172ab43b5b8e874d2deb158] + +Comment: Refreshed hunk to match latest kirkstone + +Signed-off-by: Divyanshu Rathore +--- + MagickCore/annotate.c | 4 ++-- + MagickCore/draw.c | 2 +- + MagickCore/geometry.c | 6 +++--- + MagickCore/shear.c | 6 +++--- + MagickCore/visual-effects.c | 4 ++-- + coders/caption.c | 10 +++++----- + coders/label.c | 10 +++++----- + coders/pcl.c | 4 ++-- + coders/pdf.c | 4 ++-- + coders/ps.c | 4 ++-- + coders/ps2.c | 4 ++-- + coders/ps3.c | 4 ++-- + coders/svg.c | 4 ++-- + 13 files changed, 33 insertions(+), 33 deletions(-) + +diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c +index 4be938be5..3e8f3aa1b 100644 +--- a/MagickCore/annotate.c ++++ b/MagickCore/annotate.c +@@ -336,7 +336,7 @@ MagickExport MagickBooleanType AnnotateImage(Image *image, + (void) CloneString(&annotate->text,textlist[i]); + if ((metrics.width == 0) || (annotate->gravity != NorthWestGravity)) + (void) GetTypeMetrics(image,annotate,&metrics,exception); +- height=(size_t) floor(metrics.ascent-metrics.descent+0.5); ++ height=CastDoubleToUnsigned(metrics.ascent-metrics.descent+0.5); + if (height == 0) + height=draw_info->pointsize; + height+=(size_t) floor(draw_info->interline_spacing+0.5); +@@ -626,7 +626,7 @@ MagickExport ssize_t FormatMagickCaption(Image *image,DrawInfo *draw_info, + status=GetTypeMetrics(image,draw_info,metrics,exception); + if (status == MagickFalse) + break; +- width=(size_t) floor(metrics->width+draw_info->stroke_width+0.5); ++ width=CastDoubleToUnsigned(metrics->width+draw_info->stroke_width+0.5); + if (width <= image->columns) + continue; + if (s != (char *) NULL) +diff --git a/MagickCore/draw.c b/MagickCore/draw.c +index facea115e..54286130a 100644 +--- a/MagickCore/draw.c ++++ b/MagickCore/draw.c +@@ -3478,7 +3478,7 @@ static MagickBooleanType RenderMVGContent(Image *image, + (void) GetNextToken(q,&q,extent,token); + if (*token == ',') + (void) GetNextToken(q,&q,extent,token); +- bounds.height=(size_t) floor(GetDrawValue(token,&next_token)+ ++ bounds.height=CastDoubleToUnsigned(GetDrawValue(token,&next_token)+ + 0.5); + if (token == next_token) + ThrowPointExpectedException(token,exception); +diff --git a/MagickCore/geometry.c b/MagickCore/geometry.c +index 5c6e2ad69..6541db8f4 100644 +--- a/MagickCore/geometry.c ++++ b/MagickCore/geometry.c +@@ -1424,8 +1424,8 @@ MagickExport MagickStatusType ParseMetaGeometry(const char *geometry,ssize_t *x, + scale.y=geometry_info.sigma; + if ((percent_flags & SigmaValue) == 0) + scale.y=scale.x; +- *width=(size_t) floor(scale.x*former_width/100.0+0.5); +- *height=(size_t) floor(scale.y*former_height/100.0+0.5); ++ *width=CastDoubleToUnsigned(scale.x*former_width/100.0+0.5); ++ *height=CastDoubleToUnsigned(scale.y*former_height/100.0+0.5); + former_width=(*width); + former_height=(*height); + } +@@ -1445,7 +1445,7 @@ MagickExport MagickStatusType ParseMetaGeometry(const char *geometry,ssize_t *x, + if (geometry_ratio >= image_ratio) + { + *width=former_width; +- *height=(size_t) floor((double) (PerceptibleReciprocal( ++ *height=CastDoubleToUnsigned((double) (PerceptibleReciprocal( + geometry_ratio)*former_height*image_ratio)+0.5); + } + else +diff --git a/MagickCore/shear.c b/MagickCore/shear.c +index 05703ca34..a4c75431f 100644 +--- a/MagickCore/shear.c ++++ b/MagickCore/shear.c +@@ -1766,9 +1766,9 @@ MagickExport Image *ShearRotateImage(const Image *image,const double degrees, + */ + width=integral_image->columns; + height=integral_image->rows; +- bounds.width=(size_t) floor(fabs((double) height*shear.x)+width+0.5); +- bounds.height=(size_t) floor(fabs((double) bounds.width*shear.y)+height+0.5); +- shear_width=(size_t) floor(fabs((double) bounds.height*shear.x)+ ++ bounds.width=CastDoubleToUnsigned(fabs((double) height*shear.x)+width+0.5); ++ bounds.height=CastDoubleToUnsigned(fabs((double) bounds.width*shear.y)+height+0.5); ++ shear_width=CastDoubleToUnsigned(fabs((double) bounds.height*shear.x)+ + bounds.width+0.5); + bounds.x=CastDoubleToLong(floor((double) ((shear_width > bounds.width) ? + width : bounds.width-shear_width+2)/2.0+0.5)); +diff --git a/MagickCore/visual-effects.c b/MagickCore/visual-effects.c +index 789660231..3f5a5ee5e 100644 +--- a/MagickCore/visual-effects.c ++++ b/MagickCore/visual-effects.c +@@ -2062,8 +2062,8 @@ MagickExport Image *ShadowImage(const Image *image,const double alpha, + (void) SetImageColorspace(clone_image,sRGBColorspace,exception); + (void) SetImageVirtualPixelMethod(clone_image,EdgeVirtualPixelMethod, + exception); +- border_info.width=(size_t) floor(2.0*sigma+0.5); +- border_info.height=(size_t) floor(2.0*sigma+0.5); ++ border_info.width=CastDoubleToUnsigned(2.0*sigma+0.5); ++ border_info.height=CastDoubleToUnsigned(2.0*sigma+0.5); + border_info.x=0; + border_info.y=0; + (void) QueryColorCompliance("none",AllCompliance,&clone_image->border_color, +diff --git a/coders/caption.c b/coders/caption.c +index 67a3fb48c..cff07fd10 100644 +--- a/coders/caption.c ++++ b/coders/caption.c +@@ -155,7 +155,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info, + return(DestroyImageList(image)); + (void) SetImageProperty(image,"caption",caption,exception); + draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL); +- width=(size_t) floor(draw_info->pointsize*strlen(caption)+0.5); ++ width=CastDoubleToUnsigned(draw_info->pointsize*strlen(caption)+0.5); + if (AcquireMagickResource(WidthResource,width) == MagickFalse) + { + caption=DestroyString(caption); +@@ -249,8 +249,8 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info, + status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception); + if (status == MagickFalse) + break; +- width=(size_t) floor(metrics.width+draw_info->stroke_width+0.5); +- height=(size_t) floor(metrics.height+draw_info->interline_spacing+ ++ width=CastDoubleToUnsigned(metrics.width+draw_info->stroke_width+0.5); ++ height=CastDoubleToUnsigned(metrics.height+draw_info->interline_spacing+ + draw_info->stroke_width+0.5); + if ((image->columns != 0) && (image->rows != 0)) + { +@@ -279,8 +279,8 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info, + status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception); + if (status == MagickFalse) + break; +- width=(size_t) floor(metrics.width+draw_info->stroke_width+0.5); +- height=(size_t) floor(metrics.height+draw_info->interline_spacing+ ++ width=CastDoubleToUnsigned(metrics.width+draw_info->stroke_width+0.5); ++ height=CastDoubleToUnsigned(metrics.height+draw_info->interline_spacing+ + draw_info->stroke_width+0.5); + if ((image->columns != 0) && (image->rows != 0)) + { +diff --git a/coders/label.c b/coders/label.c +index b6c25036f..cd76961f7 100644 +--- a/coders/label.c ++++ b/coders/label.c +@@ -135,7 +135,7 @@ static Image *ReadLABELImage(const ImageInfo *image_info, + return(DestroyImageList(image)); + (void) SetImageProperty(image,"label",label,exception); + draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL); +- width=(size_t) floor(draw_info->pointsize*strlen(label)+0.5); ++ width=CastDoubleToUnsigned(draw_info->pointsize*strlen(label)+0.5); + if (AcquireMagickResource(WidthResource,width) == MagickFalse) + { + label=DestroyString(label); +@@ -174,8 +174,8 @@ static Image *ReadLABELImage(const ImageInfo *image_info, + status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception); + if (status == MagickFalse) + break; +- width=(size_t) floor(metrics.width+draw_info->stroke_width+0.5); +- height=(size_t) floor(metrics.height+draw_info->stroke_width+0.5); ++ width=CastDoubleToUnsigned(metrics.width+draw_info->stroke_width+0.5); ++ height=CastDoubleToUnsigned(metrics.height+draw_info->stroke_width+0.5); + if ((image->columns != 0) && (image->rows != 0)) + { + if ((width >= image->columns) && (height >= image->rows)) +@@ -204,8 +204,8 @@ static Image *ReadLABELImage(const ImageInfo *image_info, + status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception); + if (status == MagickFalse) + break; +- width=(size_t) floor(metrics.width+draw_info->stroke_width+0.5); +- height=(size_t) floor(metrics.height+draw_info->stroke_width+0.5); ++ width=CastDoubleToUnsigned(metrics.width+draw_info->stroke_width+0.5); ++ height=CastDoubleToUnsigned(metrics.height+draw_info->stroke_width+0.5); + if ((image->columns != 0) && (image->rows != 0)) + { + if ((width < image->columns) && (height < image->rows)) +diff --git a/coders/pcl.c b/coders/pcl.c +index 8197a0c39..375c8e781 100644 +--- a/coders/pcl.c ++++ b/coders/pcl.c +@@ -333,8 +333,8 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception) + image->resolution.x,image->resolution.y); + if (image_info->ping != MagickFalse) + (void) FormatLocaleString(density,MagickPathExtent,"2.0x2.0"); +- page.width=(size_t) floor(page.width*image->resolution.x/delta.x+0.5); +- page.height=(size_t) floor(page.height*image->resolution.y/delta.y+0.5); ++ page.width=CastDoubleToUnsigned(page.width*image->resolution.x/delta.x+0.5); ++ page.height=CastDoubleToUnsigned(page.height*image->resolution.y/delta.y+0.5); + (void) FormatLocaleString(options,MagickPathExtent,"-g%.20gx%.20g ",(double) + page.width,(double) page.height); + image=DestroyImage(image); +diff --git a/coders/pdf.c b/coders/pdf.c +index 7792d417a..3e8b3c182 100644 +--- a/coders/pdf.c ++++ b/coders/pdf.c +@@ -1605,9 +1605,9 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image, + (void) ParseMetaGeometry(page_geometry,&geometry.x,&geometry.y, + &geometry.width,&geometry.height); + scale.x=(double) (geometry.width*delta.x)/resolution.x; +- geometry.width=(size_t) floor(scale.x+0.5); ++ geometry.width=CastDoubleToUnsigned(scale.x+0.5); + scale.y=(double) (geometry.height*delta.y)/resolution.y; +- geometry.height=(size_t) floor(scale.y+0.5); ++ geometry.height=CastDoubleToUnsigned(scale.y+0.5); + (void) ParseAbsoluteGeometry(page_geometry,&media_info); + (void) ParseGravityGeometry(image,page_geometry,&page_info,exception); + if (image->gravity != UndefinedGravity) +diff --git a/coders/ps.c b/coders/ps.c +index 3c18e5a92..9b3f3da88 100644 +--- a/coders/ps.c ++++ b/coders/ps.c +@@ -1483,9 +1483,9 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image, + (void) ParseMetaGeometry(page_geometry,&geometry.x,&geometry.y, + &geometry.width,&geometry.height); + scale.x=PerceptibleReciprocal(resolution.x)*geometry.width*delta.x; +- geometry.width=(size_t) floor(scale.x+0.5); ++ geometry.width=CastDoubleToUnsigned(scale.x+0.5); + scale.y=PerceptibleReciprocal(resolution.y)*geometry.height*delta.y; +- geometry.height=(size_t) floor(scale.y+0.5); ++ geometry.height=CastDoubleToUnsigned(scale.y+0.5); + (void) ParseAbsoluteGeometry(page_geometry,&media_info); + (void) ParseGravityGeometry(image,page_geometry,&page_info,exception); + if (image->gravity != UndefinedGravity) +diff --git a/coders/ps2.c b/coders/ps2.c +index 31e7f75c7..2e713c64a 100644 +--- a/coders/ps2.c ++++ b/coders/ps2.c +@@ -533,9 +533,9 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image, + (void) ParseMetaGeometry(page_geometry,&geometry.x,&geometry.y, + &geometry.width,&geometry.height); + scale.x=PerceptibleReciprocal(resolution.x)*geometry.width*delta.x; +- geometry.width=(size_t) floor(scale.x+0.5); ++ geometry.width=CastDoubleToUnsigned(scale.x+0.5); + scale.y=PerceptibleReciprocal(resolution.y)*geometry.height*delta.y; +- geometry.height=(size_t) floor(scale.y+0.5); ++ geometry.height=CastDoubleToUnsigned(scale.y+0.5); + (void) ParseAbsoluteGeometry(page_geometry,&media_info); + (void) ParseGravityGeometry(image,page_geometry,&page_info,exception); + if (image->gravity != UndefinedGravity) +diff --git a/coders/ps3.c b/coders/ps3.c +index 62f47c439..beb007587 100644 +--- a/coders/ps3.c ++++ b/coders/ps3.c +@@ -980,9 +980,9 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image, + (void) ParseMetaGeometry(page_geometry,&geometry.x,&geometry.y, + &geometry.width,&geometry.height); + scale.x=PerceptibleReciprocal(resolution.x)*geometry.width*delta.x; +- geometry.width=(size_t) floor(scale.x+0.5); ++ geometry.width=CastDoubleToUnsigned(scale.x+0.5); + scale.y=PerceptibleReciprocal(resolution.y)*geometry.height*delta.y; +- geometry.height=(size_t) floor(scale.y+0.5); ++ geometry.height=CastDoubleToUnsigned(scale.y+0.5); + (void) ParseAbsoluteGeometry(page_geometry,&media_info); + (void) ParseGravityGeometry(image,page_geometry,&page_info,exception); + if (image->gravity != UndefinedGravity) +diff --git a/coders/svg.c b/coders/svg.c +index 8f80d83e3..5caf8afe7 100644 +--- a/coders/svg.c ++++ b/coders/svg.c +@@ -2520,10 +2520,10 @@ static void SVGStartElement(void *context,const xmlChar *name, + svg_info->view_box=svg_info->bounds; + svg_info->width=0; + if (svg_info->bounds.width > 0.0) +- svg_info->width=(size_t) floor(svg_info->bounds.width+0.5); ++ svg_info->width=CastDoubleToUnsigned(svg_info->bounds.width+0.5); + svg_info->height=0; + if (svg_info->bounds.height > 0.0) +- svg_info->height=(size_t) floor(svg_info->bounds.height+0.5); ++ svg_info->height=CastDoubleToUnsigned(svg_info->bounds.height+0.5); + (void) FormatLocaleFile(svg_info->file,"viewbox 0 0 %.20g %.20g\n", + (double) svg_info->width,(double) svg_info->height); + sx=PerceptibleReciprocal(svg_info->view_box.width)*svg_info->width; +-- +2.34.1 + diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb index 905af46f11..bb0c148fd7 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -31,6 +31,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt file://0006-ImageMagick-Fix-CVE-2025-55004.patch \ file://0007-ImageMagick-Fix-CVE-2025-57803.patch \ file://0008-ImageMagick-Fix-CVE-2025-57807.patch \ + file://0009-ImageMagick-Fix-CVE-2023-34151.patch \ " SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" From patchwork Thu Nov 20 08:49:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Divyanshu Rathore X-Patchwork-Id: 75097 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFE4ACF887A for ; Thu, 20 Nov 2025 15:26:36 +0000 (UTC) Received: from PNZPR01CU001.outbound.protection.outlook.com (PNZPR01CU001.outbound.protection.outlook.com [40.107.51.33]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.30416.1763629508148231347 for ; Thu, 20 Nov 2025 01:05:08 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@bmwtechworks.in header.s=selector1 header.b=AhAWwDgM; spf=pass (domain: bmwtechworks.in, ip: 40.107.51.33, mailfrom: divyanshu.rathore@bmwtechworks.in) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TGv3otiwnKkkkchyKkX+dCtmSPNt1UDwWZwubbdY/PKKIHdYGAazvdsFgRijbuj1ZEC1tVfaxkiOKu2L16ip96F4/ZmaLy2frsSyxjhjINwmhV2sjMGDFK9iylKnAFnXSl3PW/E8U2nzpr4JB8Jq6XSTwPB8GRCFP09TTGZZesnH3raaSoDBULPYF8puC5tV2yshS8PAuyAsnxsAQI8b72yl98beefj2ZT8YKU69czdWG+Q17bgaKxOk9M1gs/kjcrLk7tDAACKgjZV0B8SCJFjNA42wTbOw6aUca2cb3lsIoUGOzb2HPaj6JWhS0MoHOvma5k1vjmEvfavoEugBxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NpDZjrrhJKjotYg8HNcK5w/UjHUKLzFn76SvOogyNZs=; b=TFp4JuMiw5GfUZWjJuS+X1oBNlESTwiDlkJsLtJb3rkfwLGppt0S0GJxOgteI4RgebnpiPOyf3Kr3gUw9sjuV96DGUgycqZVvavjWTwdLN6DUFa/0Mz/Y4vDEhn+hdguN6qq3y8RGDCWDp8JiZ1KUJ6fgY3GWz5dzSRubAb15x7JOGjYO8jI1QPOU3JTxUETNBe45K2G5gF3WffNXCqaqSfgJ9f6/FbUP7OARAsj1ZbqbcRpxeFQdviqGCQazcM8+Fcp7Kmk7V3FVNOl22fqQYzHE1qJSDezpUEXnxqEmkHGGkkkZw1WWWUDWtbXgc6XOpxK6SjMNyK6RvgDUGgLvw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bmwtechworks.in; dmarc=pass action=none header.from=bmwtechworks.in; dkim=pass header.d=bmwtechworks.in; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmwtechworks.in; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NpDZjrrhJKjotYg8HNcK5w/UjHUKLzFn76SvOogyNZs=; b=AhAWwDgM99yGbsdzL+25K9nOf/lCTrivfjLLqcmwAgOuw6zkWevqYEboppeyItsaYfDiP+10nrZUrdNq2baUddMNwdEZC7oDUhOxQDshumOa70oomt42U7+CwHL8nKXQeKaFyfnQd2ygvkFzwhaDco5OVrJs07wVKr4mvn1FGbGwmo17Bz5Iw44h+lq3EQzutljwTduUN1Z2ruQbAS0AoKd2snMyYjsCpyj6W8qMSfsr73H1wy8/d8zPlkkG8uTF2nkiShJ7Ww9Em1InMcH9a8WcCEwOnnqtE5pLLDmiYJXXvDVT/SaeiWpUzSN6mIyBiFCQCchZzXHmFHF+58PX0Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bmwtechworks.in; Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) by PN2P287MB1004.INDP287.PROD.OUTLOOK.COM (2603:1096:c01:134::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.10; Thu, 20 Nov 2025 08:50:19 +0000 Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483]) by MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483%6]) with mapi id 15.20.9343.009; Thu, 20 Nov 2025 08:50:19 +0000 From: Divyanshu Rathore To: openembedded-devel@lists.openembedded.org CC: Sana.Kazi@bmwtechworks.in Subject: [meta-oe][kirkstone][PATCH 10/12] ImageMagick: Fix CVE-2025-55154 Date: Thu, 20 Nov 2025 14:19:57 +0530 Message-ID: <20251120084959.51761-10-Divyanshu.Rathore@bmwtechworks.in> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> References: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> X-ClientProxiedBy: MA5P287CA0130.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:1d2::12) To MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MA0P287MB3378:EE_|PN2P287MB1004:EE_ X-MS-Office365-Filtering-Correlation-Id: 3416c5a7-acf6-4ab7-b91a-08de2811d586 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|52116014|10070799003|1800799024; X-Microsoft-Antispam-Message-Info: 1CT95vN/9fnxI29nlNjGbta7Uk0Xf/ITucKxIdTrmv6O/ef1vyPtx+U6Fe6Zn1eUzW0u0XFXnhN4fNRHSirOkaxQM5hEOl8m20P8J+YJEpPXP17yZs4ZUJA6NuSUXhnQ7fss8WjQXLRZ4xLmMjjAuhNQMwftlo9BBWu3Pd5h3IE6+1Z+xvOxAEU11l+UCqaVZuVExIZiYgc2QPQzE8N+qDlMqe3O1ak13etI/zV2RQSQB7CCVVnz6gjl6CfXi/tmnVlReP+vgFm5o8zdDdLVtDbpoyMUcKqkjqPh1QsNqxicMWNavCAioAPHMlX4SC5LVshY97/oMk8eYBmw3/4THpIked5OtUoVBVSL1lSL9F+FlwXNN2lLzCMTITCbuuutIwVAB/iSXTGFK+DEMOYln8Sl00w8PIzFeH/ZMwB/W6JUaLE6RZHEvpW3L0kexa3njY4f/H9WE8M+j3VfFTethH/1q3LAP1HCT4dnSLW6HW4yzNYuhcG/6x7IeL3+PdTGb6ENe9/vRlNnKB2Co37n9Spsa35G5otknLVAK5WQTS55TbQCNweKuH2yrRQcZ6lYNf9MIWwPbGnPgF/bUeofYt8l/S00hBqy2mUTlJUeNDVHThT4GBJtHkHNuUCzjT2JfjRAA+0NGauRefe/2kYsPoa6lD5TpCflSxrvXLPKq2WZJex4UeZ8uFbgiXZbQs7iULLZTOgC7hTRHAdGBvTvB9Bij5tSjkZtXE3ybUZZQa/ukiVB8UsR+jDNCyV/vPEAsheZu1xWpliQaScMgs7pTQxIvc9z2Jm+F/7c6b6so7FVtq/vcE8p3RBku36wj6/916ODegtxU0fSBJo8p//iYWAfTg4EPiEJcpVIBVqrE2x0V/HXCqTOoBiXzA89hkjeCOPD8aPUDnhozqeLwVGKLps47vPY+OudSoy9C7mpE57Pvb+vg93ZqJpP3JQiacxtaNT4faChMYjszbptWXvyzBfjKATcKyM04Z5AqNJSuoUIL2Jd/Up/IB6xf8VqlxDT5NuAd0s9he+fVhAgbn17ZXZmwWg2Vg8yfcbS9h8BXyHUQEYe+C/1gVLekQyEmh0KVckCoE32K0ALgQVwGsriFvbgeVQWarWnnD0mx7JRiJ0AKONcCK4S49qfpTVMZagA6XMYEoZA+MNSv2fthSt4HqyXrb6LYlEVf934mfiaXCxAg+EF0+ftXm5pXY2bx5HnpICb1J00CO8IAkv34X+ag+gzgzvFKE3ChHn7hD1Kuf+fgl3kOsDQM8+xOmYpzOavGDFi52tVchTpnprOmnt7rvahTGMGEKSHQA9H5UeBlHe2yMU6mEF7dz6deZ+Is1BgUgPdz/JGBP/7fUv0CnT6C4chXe0qW4Sb20NTVz8owh7RKmi+YBvmapZK3iIFrbNG/YwyfVVQBMQxs/X0lu45pFDCT9YP0P8zSFhe7bpoyig8STmfOYra3T6aqJfz3ALJ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MA0P287MB3378.INDP287.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(52116014)(10070799003)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ekuqH7N5WyikT99AepjWl+TCHcml/jsjTlAhzQw0Skkz+Z9sBQZMt835NMLRZE0CBi5mcSem+ZjkanDoY801izUpsW6vrGLq1RkklJpB8fDBO5oqoukN6lN7lBfxHYgcr5MJQft04sYM/RXOX6D1AG3/Rug1+IlQhaCzwjokKMQX8jcLp36/r//tc4w7dZsu4NrNQhfuczEElmNEvDJhXDpj0QgOwmywHUJuKHhi9w1P821d7pwLXLiuwuGa6eZcyk3XZrJ60PV0woPRQvz405/ldIb3cthb+b+I+HgoSjmqIAJtcGulYr+eay0NIdoH0lFc2xTvAElED1XVBPsjl/D6ay5S/LJLeoI1xtu34RZhNAsiQ/4L8uxOoBCWl0rMDvsL2nWQClaVrz2ZmFAnWfIHAd+LK0X5WpT3hvcf+APUwMfjlGIQ/b1ZJ+xZIimRGhwXT3Ieuye1lNUxiEe5iV8N0PyGwrQVngxmUQXw1/v1eRrVAVWxxM8hG/LpvR6nc8QfkAXVK9ntTPomLqCtJPUTck6QtzFvBk989121x9F7WLUQvjC8LVkwc4vwbV92q1R3xkzw/PIISHWhpJyBGyqXVh6gZl22q19iDVtrelMJIOXcX+yUr06wk7Lb72cttfI3aiTJFig4lnE3YSmVb1H2d8kUJ1FeDb3v/DBu1vjwKRubaSLfwRTMEQPhwnoYpI6zZJArsKOH0oOGzR0FcCCukNExu/+I/uh7t+W/Oq1Wm+/msDAijuXQj5Qcr89nA+9vhLs7LNlsAqXVb0Bvq0TtuSEOORqr8Hiipj4PHn++SqWGcxGMyITZD04YGkpXk448k08REsrQraYzy05FV5Jnkmhj5PUH+1T3tJHiESJugkh12r75FR7l+3naqPnNGFqIxE8HFb4mlFFcW5KI4i5OE2WsAEAq7RwuTrMcbpKxWayfTsluCzcFWJLyrfsqffjgaSXwjRjV3ame4rmKN4VZUHscEXcPw4+7TczUY8bMx5GfCCsqAbe7oT46J26RlO0pPfcWNVUVo6kbhO6eb2gkkw7HbfsTQ6ik4xnqYH7oGl2pFgjFkKzftTE/h9R9k8twuj2lIbTcwVnIjT6OUK5KfStvFLY/RiUjkNfVFGLngdM5aU512aGPyM5W78qXGTUTEPjjZjPQmE5ox0UAJwFBULjYlV2zlalcZTKS4xTRVEoFfV+FjSZfkW5WJL+P3VJI+eVa6Y2kPmXRWS+nZC7Od9B2N0IlrEDemPGFk+Jfj19yPPUzdHh1Ra4J8+/ge8i+mGqImA6Aq6GmI8OhZZCGIZHJJJ+wrZnWwfOVkb6yNlkjUkYPMSEy4DZy9nz6ptxbLYG9B+ItPKau1CWd/2kkIR1sPU89mHY+DZwaCz1fEFLeypQq+BDFOKVMEzEIrcG+Xf8wk0OlKO/mgxroJm3l6crto0J5uoMYb/u2lErtMm0wHbEBQfpgovNS8i8ro41MHmDpyOcWdTB3pGOYLX6Vdk/ajmOA9EaG+F0qpesUJNhTRVck6NfWMGvauMkXG5REAb0xVgKhIWRBwJ3xAJ0LoKA7Vopnikm6pYhRU/HGgKXfxeadlNWzHthOF+NDJHYh3jn3n4jzE2mFb2F9jAiF3gZOZ5loQT1MyxwauGAUY8EUQdhmhDezkg5b59ijHzdN+KS+vDEstHFFW7r45DQj4PJGyM1T9wRx83nS87M= X-OriginatorOrg: bmwtechworks.in X-MS-Exchange-CrossTenant-Network-Message-Id: 3416c5a7-acf6-4ab7-b91a-08de2811d586 X-MS-Exchange-CrossTenant-AuthSource: MA0P287MB3378.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2025 08:50:19.6515 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 970fa6fd-1031-4cc6-8c56-488f3c61cd05 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Qsb4CsnifvqLujlqx0kYNoKzlVdFHgQogZ1R9VSOBomtKXaostYnKPbYqaKubV7VB5arrAQ0GUtlJqPuVkx62241PIJ5YpAf9dNbfyw8Opu8znXWoOH+Xry0tWQX2L7O X-MS-Exchange-Transport-CrossTenantHeadersStamped: PN2P287MB1004 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 20 Nov 2025 15:26:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/121942 Backport the fix for CVE-2025-55154 Add below patch to fix 0010-ImageMagick-Fix-CVE-2025-55154.patch Signed-off-by: Divyanshu Rathore --- .../0010-ImageMagick-Fix-CVE-2025-55154.patch | 84 +++++++++++++++++++ .../imagemagick/imagemagick_7.0.10.bb | 1 + 2 files changed, 85 insertions(+) create mode 100644 meta-oe/recipes-support/imagemagick/files/0010-ImageMagick-Fix-CVE-2025-55154.patch diff --git a/meta-oe/recipes-support/imagemagick/files/0010-ImageMagick-Fix-CVE-2025-55154.patch b/meta-oe/recipes-support/imagemagick/files/0010-ImageMagick-Fix-CVE-2025-55154.patch new file mode 100644 index 0000000000..f8b752c274 --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/0010-ImageMagick-Fix-CVE-2025-55154.patch @@ -0,0 +1,84 @@ +From b6192e6f3952140099372ec287e773832b511326 Mon Sep 17 00:00:00 2001 +From: Divyanshu Rathore +Date: Tue, 28 Oct 2025 14:12:27 +0530 +Subject: [PATCH 5/8] ImageMagick: Fix CVE-2025-55154 + +CVE: CVE-2025-55154 +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/db986e4782e9f6cc42a0e50151dc4fe43641b337] + +Comment: Refreshed hunk to match latest kirkstone + +Signed-off-by: Divyanshu Rathore +--- + coders/png.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/coders/png.c b/coders/png.c +index 343934ce8..e730edb03 100644 +--- a/coders/png.c ++++ b/coders/png.c +@@ -6841,19 +6841,19 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info, + mng_info->magn_methy = 1; + if (mng_info->magn_methx == 1) + { +- magnified_width=mng_info->magn_ml; ++ magnified_width=(size_t) mng_info->magn_ml; + + if (image->columns > 1) + magnified_width += mng_info->magn_mr; + + if (image->columns > 2) +- magnified_width += (png_uint_32) ++ magnified_width += (size_t) + ((image->columns-2)*(mng_info->magn_mx)); + } + + else + { +- magnified_width=(png_uint_32) image->columns; ++ magnified_width=(size_t) image->columns; + + if (image->columns > 1) + magnified_width += mng_info->magn_ml-1; +@@ -6862,25 +6862,25 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info, + magnified_width += mng_info->magn_mr-1; + + if (image->columns > 3) +- magnified_width += (png_uint_32) ++ magnified_width += (size_t) + ((image->columns-3)*(mng_info->magn_mx-1)); + } + + if (mng_info->magn_methy == 1) + { +- magnified_height=mng_info->magn_mt; ++ magnified_height=(size_t) mng_info->magn_mt; + + if (image->rows > 1) + magnified_height += mng_info->magn_mb; + + if (image->rows > 2) +- magnified_height += (png_uint_32) ++ magnified_height += (size_t) + ((image->rows-2)*(mng_info->magn_my)); + } + + else + { +- magnified_height=(png_uint_32) image->rows; ++ magnified_height=(size_t) image->rows; + + if (image->rows > 1) + magnified_height += mng_info->magn_mt-1; +@@ -6889,7 +6889,7 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info, + magnified_height += mng_info->magn_mb-1; + + if (image->rows > 3) +- magnified_height += (png_uint_32) ++ magnified_height += (size_t) + ((image->rows-3)*(mng_info->magn_my-1)); + } + +-- +2.34.1 + diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb index bb0c148fd7..af0a3149e3 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -32,6 +32,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt file://0007-ImageMagick-Fix-CVE-2025-57803.patch \ file://0008-ImageMagick-Fix-CVE-2025-57807.patch \ file://0009-ImageMagick-Fix-CVE-2023-34151.patch \ + file://0010-ImageMagick-Fix-CVE-2025-55154.patch \ " SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" From patchwork Thu Nov 20 08:49:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Divyanshu Rathore X-Patchwork-Id: 75101 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AFED1CF8875 for ; Thu, 20 Nov 2025 15:26:36 +0000 (UTC) Received: from MA0PR01CU012.outbound.protection.outlook.com (MA0PR01CU012.outbound.protection.outlook.com [40.107.57.43]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.30427.1763629570098347010 for ; Thu, 20 Nov 2025 01:06:12 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@bmwtechworks.in header.s=selector1 header.b=fRXGemf1; spf=pass (domain: bmwtechworks.in, ip: 40.107.57.43, mailfrom: divyanshu.rathore@bmwtechworks.in) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UwDb+EoZGQfomXiPy4AsDJg06QvSwHsxhyR6eX+F9U4BHq2WYVxjgkLXlvAlNswWtSp7GwRnG5Lef9uE7KW57TpyMNlYyqI1untcodSUfmwHJafRVlKnn5OsV7nSmodcC1RzxKr4om4llL26LYPI3SZ9mXxvCK56+506ARakMpR4YOU8AP5FB1a2mzwU0EXyy4FT4Bqodxy3Lc5wGA7g4ruGSxeMiR5ogGx67RHAOR8khBTVHmkfC8O/BZvT+1PRs5DWnG0s9ytKtmSig340Uqv4OJm8ManG/Gr5l1yNYHkJDUtreMqCFf1x4w2xsFQjEYGA5s/8rTipKh3l1txsKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=U1HErrmWz6LXOAokCOJl4GxUeCfc9cEjT3cK+A+k0uY=; b=W9PcZF2MmGzxCw5WFUJ999SHPdiNdg+3i/Em/mTXkNbyYYIFRe9KVOlqQx8No0RGEcS3qdpR9+cLjmN0/nOU6EJS6ia5dRAC+C/O+dC/t9Go9PlCCFd8fXpKiU1H7MTiMHYjCjAmeoLdys79cIw9S5sSBkfvJ7Q7AKpXwt8eMtFr7S6OkOLYHW9rhDV0raXpZz4RrHYRR5+dNtMd42Ll3U6KqEbi3SPDUjIUAL0mYceANAszjfsc1YCO5WKC3MbEHnsOP7ewNeWtjmcJeVEpDnD/czuydeuvvNS6M756xptFIX+MN0Conz4JVwsWwwJ7q9AC949+d0HrZUDBW8Fbfw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bmwtechworks.in; dmarc=pass action=none header.from=bmwtechworks.in; dkim=pass header.d=bmwtechworks.in; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmwtechworks.in; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=U1HErrmWz6LXOAokCOJl4GxUeCfc9cEjT3cK+A+k0uY=; b=fRXGemf11MMMi/G6zwwX6O8uoOnmUsnlFcivXCd8X2j5XcXJU4jzLFGUELhecJW7ONSyJ65Xk3AaZo+wEdytN9721hYBKO909OJ4mh3F4Rf3HRnvu1BreoIzJsH2v7gB73qED2NUHLuOQBEpSdzs1NCJg8YbJEKbJV6l++pGwyo7g9GOmXYEQUS/RnW5553PHGiAWF3ODJjSR9heDHonJ3WYukeopp8e2RW72C9wYOE7loL8ow33NPytOk+Ud/9Gf6gZZ9ieusiJiZnmlbV7bwNEP7n4NL2tGcbrPCpKL41JBY7VBMle0y9zElqhJdaeEvIwe++9PSuwN0BaWUGU8w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bmwtechworks.in; Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) by PN2P287MB1004.INDP287.PROD.OUTLOOK.COM (2603:1096:c01:134::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.10; Thu, 20 Nov 2025 08:50:21 +0000 Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483]) by MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483%6]) with mapi id 15.20.9343.009; Thu, 20 Nov 2025 08:50:21 +0000 From: Divyanshu Rathore To: openembedded-devel@lists.openembedded.org CC: Sana.Kazi@bmwtechworks.in Subject: [meta-oe][kirkstone][PATCH 11/12] ImageMagick: Fix CVE-2025-55298 Date: Thu, 20 Nov 2025 14:19:58 +0530 Message-ID: <20251120084959.51761-11-Divyanshu.Rathore@bmwtechworks.in> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> References: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> X-ClientProxiedBy: MA5P287CA0130.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:1d2::12) To MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MA0P287MB3378:EE_|PN2P287MB1004:EE_ X-MS-Office365-Filtering-Correlation-Id: 532b9fd9-c399-4679-7586-08de2811d64c X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|52116014|10070799003|1800799024; X-Microsoft-Antispam-Message-Info: anNBiMY1c1lC/mpeMXYOQoBUiseNmkObxlnjmSIxwEDcqj82qJJ3GdfoXX1x3b2nHTFd6LWLcGujHL7q5i2ZYgz7Z7DssIQZCoDd7sdavEEH/3IpQAYZ8i9tQK8/fMvkKNvTtJHSqBDKx6mZ1AEGIUvMxHi15uA2STgqXTsD9Cu5vBkws9ig698dMsZNTLg4vMmHV4jR+8qZnir+QRRXbk6KGCcNUKg15D4es58KfCsrDjI4X+kuluYi93kVIH4reNna0NCo74ZyOoiSHnbuy0vA5wOpb2BtEWqVC5Vz2J/lKXymEMpCPITwx+tuiaWSCp1pSfVqVosL77fV72FC5j/sZGc3B8NJ4HobT92SrnEpnC33VIeCkamnjizd2wbVGnqbTEzIXl6QntXPMkTyD7ohVxY9HnEHZBxVfL/CCWpQcXFZ+WKp/rx1sD536yGTIB+J3jXWYPCM6GcxYm2Fnv6uglZxopL1QUw5joud8fqvjZxoV8xnh2Ps43brnUa56Nfjx8zZCNSxW6hd3BlF50ake0I+bCPU+NWKibxj29U7LtnnFHqY/Rw6BzU8KZrQagBNi5lRSs2YzAm8LcSKIJJ6EjeLViFB5KCivWzQeA5PXypl0Y3JpahXz3BbM2fm2DF83BpWmYv9O76+zWSNyDeU20APgoJngdc9yKI0JBxawXx6A5VFLZ3dnrI1qRgESL2lbnwiErA/uLqYf3+rFfxTVotcbNjR6CYaD4io1tRBNHGIlJMuFItMAilCCYtWu1S2hQ4IYtfy82fwTa1eZ9NxueUmvMmARDR3TDN6ZMgBAqJd5TqAhDrI81jxiNg86U1lB4G8zDbUyVgCnJRZy6TOGaNZ0HUQfsPQ7Ti7Ia1ztvc25reE0820zMZRu3Y5pn3lKgqPqCSHALhjNdGWRH8CmIZPZc67CTdqd0dlwEm7a1umlXLP+JyiHftsnu+6hhejFhRwnxhrLPTSSveLWiWZ1sg1gH8M3X12KTTuGZfI5FX2uRqjy4BPULE5s9Rz+3Mr/FVybET9VA8xgGmOetp0+Rk1VGcgF9UbGUcin5ErNOZIqt09/H9czMSOxuw3CpJ7maP9weVIDgGSxmfEbBXtfgHGpx/r5/tchh2hEzLpfVx1C+wWZ4scC7JzvhGKxNm3DqECR1lx2OOZoul2EsTAZtIjkhtaR5YzPOj+WzOMmcepKRuuU7X1AWjg4sYXejPhNIzYP3L3vCg+9X9HItX80BPCUXnK0aKnKZnyCsdkuRFNfRMB3rCYYaWARt/GFvo3DWZccXdfMr9vL95cnbe43M5aaHhKyv+AlS+OGs6WjdHR8MkXd/k+dKplNmfF4ZL70+Ou5NSeKpyRGdqJDS1+fFRKDLFV3JDMoiVIbFqMTub4NZTqcBY+pYMsJYnoJTyiiSda1QSlXHS/QclRM/eA2huiVobOlBuag2KzuqIIFVrCGoI1+B3JG4GerKXR X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MA0P287MB3378.INDP287.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(52116014)(10070799003)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SLpMVtJMIu0cmHwnSZsIy4dD82FPwHcWbMby61ncXvr33h97EOrL0jsTkXZFi48gpE/lBO8f1URaRoa4BKvikwUC+AtaktyAGR1UbRico1BjYXPsQ28PBpaTbLwun9QomSXamH7Vl/0wAXstq34bv5k1VnBtkEb9ulSc7xQFwMu7El7M1BASOyov8AEItK+Uw70kuocuWdeM8HnC/XpCk5vY2U0ZCspWoOXUiSakHSn8fn6sL6HgaQ/bpP4y7HJeie83SuuYryg5cIK8Zj/yLPRWIfh3S9IK0yCuZiKr6o+ZooBXzfygbJm2OFfgJL9c+00a6RM6DDN5aSUlXNtAnD7FjgbPdEilk5HKVvvf7jD5x59V13MvwMAZfH9zAYv6AF55lY9xr6AtkFEIPNHYTIqkIqTQKV7xH9MC/GXrx+1hJScSsJS0GOz1BS/Te9vWvDQHM8e7M//znxmyaq559n59AXaFsSejAXvX3Ymx8xABk6iUtHtp84lv1Fe2OYcc8FpdSaK7CmOWz5jaWmn29CBl8+7pciAikzQrLucHf6MTvsxgIjdNYLaiDHpAXQByGwCLEV7f5lSzyqnl01F14vBLZPSBOkuwKxv1oKKglEM+CBcCdAOrMmBD6RgTxSn1j310Jj1kcg9/F+CeNTwrHx4Bon7nSrcOnA1NLukqCQLvelwLN+znAn66RE6JC18YiD8+FxcTXr4VwrZoS57Xp7q+2OOgqTrZIY9/jh4VOv++vUIHk/3lVAdLs5MBjK6rLUsuMOjZjymMeXstFpuC67bhNZc9OxifWgtVvUM3dny4ZtEM8I+cZCk4+WRqm6QjypSqL7f2xXYxRCCgHWm19Ms/FyskxY8CQWw+cdfbeN/4VBuJUAsS+7gKcuiQNgk2Ypd7pP0+Qk+t4KDB7Y5iaHvgXx4fbSwXxzAQGTBf7/FYCuDm+edXCNF2E8SzM+Zqg/JkM4nXgJAmNEF2Ro9Csdt0yR/q4Etwlb/Bm/jBJnL5mHPAGRYfG7tfz/7L4rcmNGyOTh4RTPsJH2382UZlh+5vrjbzIag3Kv2j2bnYRd3mwhle6iNOIEKj68/Ka4x/SHDgAAsJxhXCmzngEbIwHvtevCrqdEBAHPpYa3mDdn6EpNONWOM0DZ8t4h2cs2N4kADFtrZN2PeCaA1IS15K4b5IviJQ9KBZ1+mdwbrUAh/axcoq8GmPsgMBclwYzTd4CLOn2KtFKgIZYNDyC9TSoILbGzg0ljUR6RtKkA4IA+2r0chF8A46Ps5DLfGa3grxTiXany1Frj3KPTo6Eu8b20l8DH0Gak1z9eE7CxVUj98LvU7FHDgHjv88cvPOydsHcKq5aofTRN3QhRdhRh8o7OuybKr/v7LtVB+Er9vXwTwy67bA459aZDmdZjM6suCwRcZBifR1xAXlR/bPSyY/60mncpUAK6RUhTiGbY3KvL5I6P+ulxZVuSUtxjZTUZzKv6rp3NEyKzQpfgRAtfINGRXvUBDpKdQLB6lr1lfplk4D6I/mNNXDQgHUhjm+8gMbx8uBXcFYy4xuo6eJCA7UUTSST2oMAJOLHdp9JUXec/9pJi+pvH9WGt7QgjLfL1IPakXVO4gHvrZQV15xacqeDsi5R4YM7l5mEYK6h0sDeA2o7HhLwtto3TDf5nNQgP3rdIpmY7GLgmILwcWT4GFpzLptf3eTdA36G0te7J3M6dM= X-OriginatorOrg: bmwtechworks.in X-MS-Exchange-CrossTenant-Network-Message-Id: 532b9fd9-c399-4679-7586-08de2811d64c X-MS-Exchange-CrossTenant-AuthSource: MA0P287MB3378.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2025 08:50:20.9568 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 970fa6fd-1031-4cc6-8c56-488f3c61cd05 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: hOg3RQwu5v/AizKQOviyEG0Jt/9aVbN85mbO+W7vPM0iNeaU5zBMqpPGOBBfB/RZGCyQSz9/q8HNd7/3+/2MgaHUn3+t+XG3R+PRN+iwglV0QzEZbW7eHj2Vq9weF3dZ X-MS-Exchange-Transport-CrossTenantHeadersStamped: PN2P287MB1004 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 20 Nov 2025 15:26:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/121947 Backport the fix for CVE-2025-55298 Add below patch to fix 0011-ImageMagick-Fix-CVE-2025-55298.patch Signed-off-by: Divyanshu Rathore --- ...support-patch-1-to-fix-CVE-2025-5529.patch | 49 ++++ ...support-patch-2-to-fix-CVE-2025-5529.patch | 58 ++++ ...support-patch-3-to-fix-CVE-2025-5529.patch | 205 +++++++++++++ ...support-patch-4-to-fix-CVE-2025-5529.patch | 103 +++++++ ...011-ImageMagick-Fix-1-CVE-2025-55298.patch | 71 +++++ ...011-ImageMagick-Fix-2-CVE-2025-55298.patch | 274 ++++++++++++++++++ .../imagemagick/imagemagick_7.0.10.bb | 6 + 7 files changed, 766 insertions(+) create mode 100644 meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Add-support-patch-1-to-fix-CVE-2025-5529.patch create mode 100644 meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Add-support-patch-2-to-fix-CVE-2025-5529.patch create mode 100644 meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Add-support-patch-3-to-fix-CVE-2025-5529.patch create mode 100644 meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Add-support-patch-4-to-fix-CVE-2025-5529.patch create mode 100644 meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Fix-1-CVE-2025-55298.patch create mode 100644 meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Fix-2-CVE-2025-55298.patch diff --git a/meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Add-support-patch-1-to-fix-CVE-2025-5529.patch b/meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Add-support-patch-1-to-fix-CVE-2025-5529.patch new file mode 100644 index 0000000000..d4bd7d6acb --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Add-support-patch-1-to-fix-CVE-2025-5529.patch @@ -0,0 +1,49 @@ +From 11f9e946dab3f2a4de68809bab9c01be2967bb08 Mon Sep 17 00:00:00 2001 +From: Divyanshu Rathore +Date: Tue, 11 Nov 2025 14:34:12 +0530 +Subject: [PATCH 1/6] ImageMagick: Add support patch 1 to fix CVE-2025-55298 + +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/83caf59fce695fea0c5878e9f0d0b65e662cae66] + +Comment: Refreshed hunk to match latest kirkstone + +Signed-off-by: Divyanshu Rathore +--- + MagickCore/image.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/MagickCore/image.c b/MagickCore/image.c +index 34804e522..849a89931 100644 +--- a/MagickCore/image.c ++++ b/MagickCore/image.c +@@ -1640,15 +1640,15 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, + char + *q; + ++ const char ++ *p; ++ + int + c; + + MagickBooleanType + canonical; + +- const char +- *p; +- + ssize_t + field_width, + offset; +@@ -1656,6 +1656,8 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, + canonical=MagickFalse; + offset=0; + (void) CopyMagickString(filename,format,MagickPathExtent); ++ if (IsStringTrue(GetImageOption(image_info,"filename:literal")) != MagickFalse) ++ return(strlen(filename)); + for (p=strchr(format,'%'); p != (char *) NULL; p=strchr(p+1,'%')) + { + q=(char *) p+1; +-- +2.34.1 + diff --git a/meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Add-support-patch-2-to-fix-CVE-2025-5529.patch b/meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Add-support-patch-2-to-fix-CVE-2025-5529.patch new file mode 100644 index 0000000000..3550a4abba --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Add-support-patch-2-to-fix-CVE-2025-5529.patch @@ -0,0 +1,58 @@ +From c02868456edccf0dd555c3d004efb491974c92c7 Mon Sep 17 00:00:00 2001 +From: Divyanshu Rathore +Date: Tue, 11 Nov 2025 15:17:32 +0530 +Subject: [PATCH 2/6] ImageMagick: Add support patch-2 to fix CVE-2025-55298 + +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/66dc8f51c11b0ae1f1cdeacd381c3e9a4de69774] + +Comment: Refreshed hunk to match latest kirkstone + +Signed-off-by: Divyanshu Rathore +--- + MagickCore/image.c | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/MagickCore/image.c b/MagickCore/image.c +index 849a89931..3437ed358 100644 +--- a/MagickCore/image.c ++++ b/MagickCore/image.c +@@ -1650,7 +1650,6 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, + canonical; + + ssize_t +- field_width, + offset; + + canonical=MagickFalse; +@@ -1666,21 +1665,23 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, + p=q+1; + continue; + } +- field_width=0; +- if (*q == '0') +- field_width=(ssize_t) strtol(q,&q,10); + switch (*q) + { + case 'd': + case 'o': + case 'x': + { ++ ssize_t ++ count; ++ + q++; + c=(*q); + *q='\0'; +- (void) FormatLocaleString(filename+(p-format-offset),(size_t) ++ count=FormatLocaleString(filename+(p-format-offset),(size_t) + (MagickPathExtent-(p-format-offset)),p,value); +- offset+=(4-field_width); ++ if ((count <= 0) || (count > (MagickPathExtent-(p-format-offset)))) ++ return(0); ++ offset+=(ssize_t) ((q-p)-count); + *q=c; + (void) ConcatenateMagickString(filename,q,MagickPathExtent); + canonical=MagickTrue; +-- +2.34.1 + diff --git a/meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Add-support-patch-3-to-fix-CVE-2025-5529.patch b/meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Add-support-patch-3-to-fix-CVE-2025-5529.patch new file mode 100644 index 0000000000..63e88ebfd9 --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Add-support-patch-3-to-fix-CVE-2025-5529.patch @@ -0,0 +1,205 @@ +From 19073f73f83c78a1fed8f040ed08b16ccfc817f5 Mon Sep 17 00:00:00 2001 +From: Divyanshu Rathore +Date: Tue, 11 Nov 2025 21:53:10 +0530 +Subject: [PATCH 3/6] ImageMagick: Add support patch-3 to fix CVE-2025-55298 + +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/82550750ec8f79393b381c3ed349dd495bbab8a7] + +Comment: Refreshed hunk to match latest kirkstone + +Signed-off-by: Divyanshu Rathore +--- + MagickCore/image.c | 134 +++++++++++++++++++-------------------------- + 1 file changed, 55 insertions(+), 79 deletions(-) + +diff --git a/MagickCore/image.c b/MagickCore/image.c +index 3437ed358..cd4de6df9 100644 +--- a/MagickCore/image.c ++++ b/MagickCore/image.c +@@ -1638,34 +1638,41 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, + ExceptionInfo *exception) + { + char +- *q; ++ *p = filename, ++ pattern[MagickPathExtent]; + + const char +- *p; +- +- int +- c; +- +- MagickBooleanType +- canonical; +- +- ssize_t +- offset; ++ *cursor = format; + +- canonical=MagickFalse; +- offset=0; ++ /* ++ Start with a copy of the format string. ++ */ + (void) CopyMagickString(filename,format,MagickPathExtent); + if (IsStringTrue(GetImageOption(image_info,"filename:literal")) != MagickFalse) + return(strlen(filename)); +- for (p=strchr(format,'%'); p != (char *) NULL; p=strchr(p+1,'%')) ++ while ((cursor=strchr(cursor,'%')) != (const char *) NULL) + { +- q=(char *) p+1; +- if (*q == '%') ++ const char ++ *q = cursor; ++ ++ ssize_t ++ offset = (ssize_t) (cursor-format); ++ ++ cursor++; /* move past '%' */ ++ if (*cursor == '%') + { +- p=q+1; ++ /* ++ Escaped %%. ++ */ ++ cursor++; + continue; + } +- switch (*q) ++ /* ++ Skip padding digits like %03d. ++ */ ++ if (*cursor == '0') ++ (void) strtol(cursor,(char **) &cursor,10); ++ switch (*cursor) + { + case 'd': + case 'o': +@@ -1674,93 +1681,62 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, + ssize_t + count; + +- q++; +- c=(*q); +- *q='\0'; +- count=FormatLocaleString(filename+(p-format-offset),(size_t) +- (MagickPathExtent-(p-format-offset)),p,value); +- if ((count <= 0) || (count > (MagickPathExtent-(p-format-offset)))) ++ count=FormatLocaleString(pattern,sizeof(pattern),q,value); ++ if ((count <= 0) || (count >= MagickPathExtent)) + return(0); +- offset+=(ssize_t) ((q-p)-count); +- *q=c; +- (void) ConcatenateMagickString(filename,q,MagickPathExtent); +- canonical=MagickTrue; +- if (*(q-1) != '%') +- break; +- p++; ++ if ((offset+count) >= MagickPathExtent) ++ return(0); ++ (void) CopyMagickString(p+offset,pattern,(size_t) (MagickPathExtent- ++ offset)); ++ cursor++; + break; + } + case '[': + { +- char +- pattern[MagickPathExtent]; +- + const char +- *option; ++ *end = strchr(cursor,']'), ++ *option = (const char *) NULL; + +- char +- *r; +- +- ssize_t +- i; +- +- ssize_t +- depth; ++ size_t ++ extent = (size_t) (end-cursor); + + /* +- Image option. ++ Handle %[key:value]; + */ +- if (strchr(p,']') == (char *) NULL) ++ if (end == (const char *) NULL) + break; +- depth=1; +- r=q+1; +- for (i=0; (i < (MagickPathExtent-1L)) && (*r != '\0'); i++) +- { +- if (*r == '[') +- depth++; +- if (*r == ']') +- depth--; +- if (depth <= 0) +- break; +- pattern[i]=(*r++); +- } +- pattern[i]='\0'; +- if (LocaleNCompare(pattern,"filename:",9) != 0) ++ if (extent >= sizeof(pattern)) + break; +- option=(const char *) NULL; ++ (void) CopyMagickString(pattern,cursor,extent); ++ pattern[extent]='\0'; + if (image != (Image *) NULL) + option=GetImageProperty(image,pattern,exception); +- if ((option == (const char *) NULL) && (image != (Image *) NULL)) ++ if ((option == (const char *) NULL) && (image != (Image *)NULL)) + option=GetImageArtifact(image,pattern); + if ((option == (const char *) NULL) && + (image_info != (ImageInfo *) NULL)) + option=GetImageOption(image_info,pattern); + if (option == (const char *) NULL) + break; +- q--; +- c=(*q); +- *q='\0'; +- (void) CopyMagickString(filename+(p-format-offset),option,(size_t) +- (MagickPathExtent-(p-format-offset))); +- offset+=strlen(pattern)-strlen(option)+3; +- *q=c; +- (void) ConcatenateMagickString(filename,r+1,MagickPathExtent); +- canonical=MagickTrue; +- if (*(q-1) != '%') +- break; +- p++; ++ (void) CopyMagickString(p+offset,option,(size_t) (MagickPathExtent- ++ offset)); ++ cursor=end+1; + break; + } + default: + break; + } + } +- if (canonical == MagickFalse) +- (void) CopyMagickString(filename,format,MagickPathExtent); +- else +- for (q=filename; *q != '\0'; q++) +- if ((*q == '%') && (*(q+1) == '%')) +- (void) CopyMagickString(q,q+1,(size_t) (MagickPathExtent-(q-filename))); ++ for (p=filename; *p != '\0'; ) ++ { ++ /* ++ Replace "%%" with "%". ++ */ ++ if ((*p == '%') && (*(p+1) == '%')) ++ (void) memmove(p,p+1,strlen(p)); /* shift left */ ++ else ++ p++; ++ } + return(strlen(filename)); + } + +-- +2.34.1 + diff --git a/meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Add-support-patch-4-to-fix-CVE-2025-5529.patch b/meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Add-support-patch-4-to-fix-CVE-2025-5529.patch new file mode 100644 index 0000000000..65739cbf44 --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Add-support-patch-4-to-fix-CVE-2025-5529.patch @@ -0,0 +1,103 @@ +From 3b5f524f80851b819bcbfd40e30912af3710ef48 Mon Sep 17 00:00:00 2001 +From: Divyanshu Rathore +Date: Wed, 12 Nov 2025 11:35:37 +0530 +Subject: [PATCH 4/6] ImageMagick: Add support patch-4 to fix CVE-2025-55298 + +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/6c7c8d5866b9c0ce6cc76a741e05b9482716101e] + +Comment: Refreshed hunk to match latest kirkstone + +Signed-off-by: Divyanshu Rathore +--- + MagickCore/image.c | 31 +++++++++++++++++++++---------- + 1 file changed, 21 insertions(+), 10 deletions(-) + +diff --git a/MagickCore/image.c b/MagickCore/image.c +index cd4de6df9..1acf8edbd 100644 +--- a/MagickCore/image.c ++++ b/MagickCore/image.c +@@ -1647,6 +1647,8 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, + /* + Start with a copy of the format string. + */ ++ assert(format != (const char *) NULL); ++ assert(filename != (char *) NULL); + (void) CopyMagickString(filename,format,MagickPathExtent); + if (IsStringTrue(GetImageOption(image_info,"filename:literal")) != MagickFalse) + return(strlen(filename)); +@@ -1670,7 +1672,7 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, + /* + Skip padding digits like %03d. + */ +- if (*cursor == '0') ++ if (isdigit((int) ((unsigned char) *cursor)) != 0) + (void) strtol(cursor,(char **) &cursor,10); + switch (*cursor) + { +@@ -1682,9 +1684,8 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, + count; + + count=FormatLocaleString(pattern,sizeof(pattern),q,value); +- if ((count <= 0) || (count >= MagickPathExtent)) +- return(0); +- if ((offset+count) >= MagickPathExtent) ++ if ((count <= 0) || (count >= MagickPathExtent) || ++ ((offset+count) >= MagickPathExtent)) + return(0); + (void) CopyMagickString(p+offset,pattern,(size_t) (MagickPathExtent- + offset)); +@@ -1698,7 +1699,9 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, + *option = (const char *) NULL; + + size_t +- extent = (size_t) (end-cursor); ++ extent = (size_t) (end-cursor-1), ++ option_length, ++ tail_length; + + /* + Handle %[key:value]; +@@ -1707,19 +1710,27 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, + break; + if (extent >= sizeof(pattern)) + break; +- (void) CopyMagickString(pattern,cursor,extent); ++ (void) CopyMagickString(pattern,cursor+1,extent+1); + pattern[extent]='\0'; + if (image != (Image *) NULL) +- option=GetImageProperty(image,pattern,exception); +- if ((option == (const char *) NULL) && (image != (Image *)NULL)) +- option=GetImageArtifact(image,pattern); ++ { ++ option=GetImageProperty(image,pattern,exception); ++ if (option == (const char *) NULL) ++ option=GetImageArtifact(image,pattern); ++ } + if ((option == (const char *) NULL) && + (image_info != (ImageInfo *) NULL)) + option=GetImageOption(image_info,pattern); + if (option == (const char *) NULL) + break; ++ option_length=strlen(option); ++ tail_length=strlen(end+1); ++ if ((offset+option_length+tail_length+1) > MagickPathExtent) ++ return(0); + (void) CopyMagickString(p+offset,option,(size_t) (MagickPathExtent- + offset)); ++ (void) ConcatenateMagickString(p+offset+option_length,end+1,(size_t) ( ++ MagickPathExtent-offset-option_length-tail_length-1)); + cursor=end+1; + break; + } +@@ -1733,7 +1744,7 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, + Replace "%%" with "%". + */ + if ((*p == '%') && (*(p+1) == '%')) +- (void) memmove(p,p+1,strlen(p)); /* shift left */ ++ (void) memmove(p,p+1,strlen(p+1)+1); /* shift left */ + else + p++; + } +-- +2.34.1 + diff --git a/meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Fix-1-CVE-2025-55298.patch b/meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Fix-1-CVE-2025-55298.patch new file mode 100644 index 0000000000..1a92b36755 --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Fix-1-CVE-2025-55298.patch @@ -0,0 +1,71 @@ +From bc530e782bcee75960dac57e9191ab7257842bd9 Mon Sep 17 00:00:00 2001 +From: Divyanshu Rathore +Date: Wed, 12 Nov 2025 11:52:00 +0530 +Subject: [PATCH 5/6] ImageMagick: Fix CVE-2025-55298 + +CVE: CVE-2025-55298 + +This CVE fixed in two parts, this commit includes the first fix. + +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/1f93323df9d8c011c31bc4c6880390071f7fb895] + +Comment: Refreshed hunk to match latest kirkstone + +Signed-off-by: Divyanshu Rathore +--- + MagickCore/image.c | 32 ++++++++++++++++++++++++++++++++ + 1 file changed, 32 insertions(+) + +diff --git a/MagickCore/image.c b/MagickCore/image.c +index 1acf8edbd..7a52236d8 100644 +--- a/MagickCore/image.c ++++ b/MagickCore/image.c +@@ -1633,6 +1633,31 @@ MagickExport VirtualPixelMethod GetImageVirtualPixelMethod(const Image *image) + % o exception: return any errors or warnings in this structure. + % + */ ++ ++static inline MagickBooleanType PercentNInvalidOperation(char *filename) ++{ ++ MagickBooleanType ++ match = MagickFalse; ++ ++ size_t ++ length = strlen(filename); ++ ++ ssize_t ++ i; ++ ++ for (i=0; i < (ssize_t) length-1; i++) ++ { ++ if ((filename[i] == '%') && ++ ((filename[i+1] == 'n') || (filename[i+1] == 'N'))) ++ { ++ filename[i]='?'; ++ filename[i+1]='\?'; ++ match=MagickTrue; ++ } ++ } ++ return(match); ++} ++ + MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, + Image *image,const char *format,int value,char *filename, + ExceptionInfo *exception) +@@ -1652,6 +1677,13 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, + (void) CopyMagickString(filename,format,MagickPathExtent); + if (IsStringTrue(GetImageOption(image_info,"filename:literal")) != MagickFalse) + return(strlen(filename)); ++ if (PercentNInvalidOperation(filename) != MagickFalse) ++ { ++ errno=EPERM; ++ (void) ThrowMagickException(exception,GetMagickModule(),OptionError, ++ "InvalidArgument","`%s'",filename); ++ return(0); ++ } + while ((cursor=strchr(cursor,'%')) != (const char *) NULL) + { + const char +-- +2.34.1 + diff --git a/meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Fix-2-CVE-2025-55298.patch b/meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Fix-2-CVE-2025-55298.patch new file mode 100644 index 0000000000..22fafbb4ff --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/0011-ImageMagick-Fix-2-CVE-2025-55298.patch @@ -0,0 +1,274 @@ +From 51bdbd8ba79cc29b5b8bd1cbe201612c4f1b6a14 Mon Sep 17 00:00:00 2001 +From: Divyanshu Rathore +Date: Wed, 12 Nov 2025 13:05:40 +0530 +Subject: [PATCH 6/6] ImageMagick: Fix CVE-2025-55298 + +CVE: CVE-2025-55298 + +This CVE fixed in two parts, this commit includes the second fix. + +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/439b362b93c074eea6c3f834d84982b43ef057d5] + +Comment: Refreshed hunk to match latest kirkstone + +Signed-off-by: Divyanshu Rathore +--- + MagickCore/image.c | 182 ++++++++++++++++++++++++--------------------- + 1 file changed, 96 insertions(+), 86 deletions(-) + +diff --git a/MagickCore/image.c b/MagickCore/image.c +index 7a52236d8..beaf69728 100644 +--- a/MagickCore/image.c ++++ b/MagickCore/image.c +@@ -1619,7 +1619,7 @@ MagickExport VirtualPixelMethod GetImageVirtualPixelMethod(const Image *image) + % + % A description of each parameter follows. + % +-% o image_info: the image info.. ++% o image_info: the image info. + % + % o image: the image. + % +@@ -1634,28 +1634,39 @@ MagickExport VirtualPixelMethod GetImageVirtualPixelMethod(const Image *image) + % + */ + +-static inline MagickBooleanType PercentNInvalidOperation(char *filename) ++static inline MagickBooleanType IsValidFormatSpecifier(const char *start, ++ const char *end) + { +- MagickBooleanType +- match = MagickFalse; ++ char ++ specifier = end[-1]; + + size_t +- length = strlen(filename); ++ length = end-start; + +- ssize_t +- i; ++ /* ++ Is this a valid format specifier? ++ */ ++ if ((specifier != 'd') && (specifier != 'x') && (specifier != 'o')) ++ return(MagickFalse); ++ if ((length == 1) && (*start == specifier)) ++ return(MagickTrue); ++ if (length >= 2) ++ { ++ size_t ++ i = 0; + +- for (i=0; i < (ssize_t) length-1; i++) +- { +- if ((filename[i] == '%') && +- ((filename[i+1] == 'n') || (filename[i+1] == 'N'))) +- { +- filename[i]='?'; +- filename[i+1]='\?'; +- match=MagickTrue; +- } +- } +- return(match); ++ if (*start == '0') ++ { ++ if ((length >= 3) && (start[1] == '0')) ++ return(MagickFalse); ++ i=1; ++ } ++ for ( ; i < (length-1); i++) ++ if (isdigit((int) ((unsigned char) start[i])) == 0) ++ return(MagickFalse); ++ return(MagickTrue); ++ } ++ return(MagickFalse); + } + + MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, +@@ -1669,82 +1680,89 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, + const char + *cursor = format; + +- /* +- Start with a copy of the format string. +- */ + assert(format != (const char *) NULL); + assert(filename != (char *) NULL); +- (void) CopyMagickString(filename,format,MagickPathExtent); + if (IsStringTrue(GetImageOption(image_info,"filename:literal")) != MagickFalse) +- return(strlen(filename)); +- if (PercentNInvalidOperation(filename) != MagickFalse) + { +- errno=EPERM; +- (void) ThrowMagickException(exception,GetMagickModule(),OptionError, +- "InvalidArgument","`%s'",filename); +- return(0); ++ (void) CopyMagickString(filename,format,MagickPathExtent); ++ return(strlen(filename)); + } +- while ((cursor=strchr(cursor,'%')) != (const char *) NULL) ++ while ((*cursor != '\0') && ((p-filename) < ((ssize_t) MagickPathExtent-1))) + { + const char +- *q = cursor; +- +- ssize_t +- offset = (ssize_t) (cursor-format); ++ *specifier_start, ++ *start; + +- cursor++; /* move past '%' */ ++ if (*cursor != '%') ++ { ++ *p++=(*cursor++); ++ continue; ++ } ++ start=cursor++; /* Skip '%' */ + if (*cursor == '%') + { +- /* +- Escaped %%. +- */ ++ *p++='%'; + cursor++; + continue; + } +- /* +- Skip padding digits like %03d. +- */ +- if (isdigit((int) ((unsigned char) *cursor)) != 0) +- (void) strtol(cursor,(char **) &cursor,10); +- switch (*cursor) +- { +- case 'd': +- case 'o': +- case 'x': ++ specifier_start=cursor; ++ while (isdigit((int) ((unsigned char) *cursor)) != 0) ++ cursor++; ++ if ((*cursor == 'd') || (*cursor == 'o') || (*cursor == 'x')) + { +- ssize_t +- count; ++ const char ++ *specifier_end = cursor+1; + +- count=FormatLocaleString(pattern,sizeof(pattern),q,value); +- if ((count <= 0) || (count >= MagickPathExtent) || +- ((offset+count) >= MagickPathExtent)) +- return(0); +- (void) CopyMagickString(p+offset,pattern,(size_t) (MagickPathExtent- +- offset)); +- cursor++; +- break; ++ if (IsValidFormatSpecifier(specifier_start,specifier_end) != MagickFalse) ++ { ++ char ++ format_specifier[MagickPathExtent]; ++ ++ size_t ++ length = cursor-specifier_start; ++ ++ ssize_t ++ count; ++ ++ (void) snprintf(format_specifier,sizeof(format_specifier), ++ "%%%.*s%c",(int) length,specifier_start,*cursor); ++ count=FormatLocaleString(pattern,sizeof(pattern),format_specifier, ++ value); ++ if ((count <= 0) || ((p-filename+count) >= MagickPathExtent)) ++ return(0); ++ (void) CopyMagickString(p,pattern,MagickPathExtent-(p-filename)); ++ p+=strlen(pattern); ++ cursor++; ++ continue; ++ } ++ else ++ { ++ /* ++ Invalid specifier — treat as literal. ++ */ ++ cursor=start; ++ *p++=(*cursor++); ++ continue; ++ } + } +- case '[': ++ if (*cursor == '[') + { + const char + *end = strchr(cursor,']'), + *option = (const char *) NULL; + + size_t +- extent = (size_t) (end-cursor-1), +- option_length, +- tail_length; ++ extent, ++ option_length; + +- /* +- Handle %[key:value]; +- */ + if (end == (const char *) NULL) +- break; ++ continue; ++ extent=(size_t) (end-cursor-1); + if (extent >= sizeof(pattern)) +- break; ++ continue; + (void) CopyMagickString(pattern,cursor+1,extent+1); + pattern[extent]='\0'; +- if (image != (Image *) NULL) ++ if (image != NULL) + { + option=GetImageProperty(image,pattern,exception); + if (option == (const char *) NULL) +@@ -1754,32 +1772,24 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, + (image_info != (ImageInfo *) NULL)) + option=GetImageOption(image_info,pattern); + if (option == (const char *) NULL) +- break; ++ continue; + option_length=strlen(option); +- tail_length=strlen(end+1); +- if ((offset+option_length+tail_length+1) > MagickPathExtent) ++ if ((p-filename+option_length) >= MagickPathExtent) + return(0); +- (void) CopyMagickString(p+offset,option,(size_t) (MagickPathExtent- +- offset)); +- (void) ConcatenateMagickString(p+offset+option_length,end+1,(size_t) ( +- MagickPathExtent-offset-option_length-tail_length-1)); ++ (void) CopyMagickString(p,option,MagickPathExtent-(p-filename)); ++ p+=option_length; + cursor=end+1; +- break; ++ continue; + } +- default: +- break; +- } +- } +- for (p=filename; *p != '\0'; ) +- { + /* +- Replace "%%" with "%". ++ Invalid or unsupported specifier — treat as literal. + */ +- if ((*p == '%') && (*(p+1) == '%')) +- (void) memmove(p,p+1,strlen(p+1)+1); /* shift left */ +- else +- p++; ++ cursor=start; ++ if ((p-filename+1) >= MagickPathExtent) ++ return(0); ++ *p++=(*cursor++); + } ++ *p='\0'; + return(strlen(filename)); + } + +-- +2.34.1 + diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb index af0a3149e3..d929a220f1 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -33,6 +33,12 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt file://0008-ImageMagick-Fix-CVE-2025-57807.patch \ file://0009-ImageMagick-Fix-CVE-2023-34151.patch \ file://0010-ImageMagick-Fix-CVE-2025-55154.patch \ + file://0011-ImageMagick-Add-support-patch-1-to-fix-CVE-2025-5529.patch \ + file://0011-ImageMagick-Add-support-patch-2-to-fix-CVE-2025-5529.patch \ + file://0011-ImageMagick-Add-support-patch-3-to-fix-CVE-2025-5529.patch \ + file://0011-ImageMagick-Add-support-patch-4-to-fix-CVE-2025-5529.patch \ + file://0011-ImageMagick-Fix-1-CVE-2025-55298.patch \ + file://0011-ImageMagick-Fix-2-CVE-2025-55298.patch \ " SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" From patchwork Thu Nov 20 08:49:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Divyanshu Rathore X-Patchwork-Id: 75095 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1C91CF886E for ; Thu, 20 Nov 2025 15:26:36 +0000 (UTC) Received: from MA0PR01CU012.outbound.protection.outlook.com (MA0PR01CU012.outbound.protection.outlook.com [40.107.57.43]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.30427.1763629570098347010 for ; Thu, 20 Nov 2025 01:06:10 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@bmwtechworks.in header.s=selector1 header.b=ojZa43Na; spf=pass (domain: bmwtechworks.in, ip: 40.107.57.43, mailfrom: divyanshu.rathore@bmwtechworks.in) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PKTMOquYLgXPIDHduiqpFdaa1TM4sLC7yx8Ws48CpVtXS4blqk1ucRU7Jj/sQYlmyLLxOm1f+ic6r+aWDJ4scKgZjMcUlhndMmrj4PGe/w9foKLs1JH35sQEBB2urxYdNq+zUBolwTgWRcTvAGVtUt0Z2UV2lK8wr+6urvTK6s/FpEvujf42/6ho88b8P1hgtxamgDcptKvV4EJGQWdlXtZ7PyPEbz3Tm3dA8mPPRFOwutApJXRVYhaAn8p5+lcV5EZ7PmbXubo7nLh8UjZBz0bBZEZlt1PhSC1iedRcXZY/Hn3k4OZnbN4UWJuMadAS9BFZL6pVUkA7VK2q0sffcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vG6vqx5fDFyU0Y8Wti6pJsQv+a8NBj9iL87l2LusreM=; b=rh2PlidDXw77Z0X8pFiPAPh5qJn79SYf7MriWInQL83ph6M+km9v94seQJTOWEN6u008n3672PiP6scW9rZmtet1ypRrs8MRu7jQU7G233mkFrtizwXyCGNLD6BhFxTCLg6bzTBjvuOOfr8hrCVhavZpmYt33CgrOk+QQLkFJrWxKT2LieZyS27zCL/5w7aOV80xRA+PcRgNz+JVHRRrlGXBHjyW/mv+Nilbqtl4laEKsjknAMKgKxyyAQOXtB6LueQq71vxud0bL9LCDoAIWVlAO9oET4IxjYfjxnXC5N9ks7bI0RNcpq/ocNabSrxktY/gb9i9KP9PgG/9pRNabA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bmwtechworks.in; dmarc=pass action=none header.from=bmwtechworks.in; dkim=pass header.d=bmwtechworks.in; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmwtechworks.in; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vG6vqx5fDFyU0Y8Wti6pJsQv+a8NBj9iL87l2LusreM=; b=ojZa43NaImhJWlkBxhTK4M3AWlJKWbTnSUF+rAYOaTbeeUaPVfvQt+E8FBnZx6qn3AEHj8fZyeufAEsL6ZZ1ewY5/wIrKOfksJFyIxINVgQEzSkerVk9bojnEWgk2xwN9sj5BR//PejXKCqkD0a5n4etT1S8q5JEpcRXaWbVx/KY+2O3aWHWA7AIcLnHl+//pY2bXxj90VtpjPn5qNavVy8Ov3sF4GhXGS2ad7v4uqR+4q4B150wHrduVj6MtzONgwAg5fUa8y+qWBbl+ZnC9v7Q9q7zFORckWQP6vJUyDfzI3BpM1r13ZzuSzCuuYlQlP+VLUgF6OMHZ2XGb6AyPw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bmwtechworks.in; Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) by PN2P287MB1004.INDP287.PROD.OUTLOOK.COM (2603:1096:c01:134::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.10; Thu, 20 Nov 2025 08:50:22 +0000 Received: from MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483]) by MA0P287MB3378.INDP287.PROD.OUTLOOK.COM ([fe80::9a89:c69c:9878:e483%6]) with mapi id 15.20.9343.009; Thu, 20 Nov 2025 08:50:22 +0000 From: Divyanshu Rathore To: openembedded-devel@lists.openembedded.org CC: Sana.Kazi@bmwtechworks.in Subject: [meta-oe][kirkstone][PATCH 12/12] ImageMagick: Fix CVE-2024-41817 Date: Thu, 20 Nov 2025 14:19:59 +0530 Message-ID: <20251120084959.51761-12-Divyanshu.Rathore@bmwtechworks.in> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> References: <20251120084959.51761-1-Divyanshu.Rathore@bmwtechworks.in> X-ClientProxiedBy: MA5P287CA0130.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:1d2::12) To MA0P287MB3378.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:143::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MA0P287MB3378:EE_|PN2P287MB1004:EE_ X-MS-Office365-Filtering-Correlation-Id: b0109ddb-db09-49ca-ee34-08de2811d717 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|52116014|10070799003|1800799024|13003099007; X-Microsoft-Antispam-Message-Info: LOujjCVTef4/QtGmQPGMD9n2J8RnH3UNnLIC6XxyHjNIaJdbP12J9mnC5x2BTg5NKEBz8zrMXNyam9jru7MKA6v8ONd2kDvZMe/5zMcxAm2Q6iN3zN86cp03NQcz6Odg9S9aolesfWTkMANToyRz5+cOHKi892Bbt17p4XH9U7/qQENHmv4iqTh7Yq2jUBDB39NPVUfiF91ZRXU+esjc8qmqDpnGLDH8VzCHh/ONL+7YAKu1fvVb9M0O2zYnht5H71TRkvNiZbBepO5xoda/4jCjqcyMt4hOXBsFsVJMr6BY4puh18KZjsqM2phn+0dyRNCXQrN4NlyBsf+UVJVX1NGcTJZiBM1VRnw8gZYmsDygrpikLzI2tsh/5emL7tbtTyOdq4H9Q6m2FJ7u8HMz72fhwj7TKc9yyTcv1xaYHN5xO6bGSBEu7XQKQmCzfEaR0Y9HjrpWBMYm8oYYOMO7x3goTfovQwgN8mUFH2y1S26Tu+4d0ftb7O0T/ilV9rmLJ4a6ftorAO08UvtWVyh4HNRAIaBY37fXEGPUXb2bGPtm2OyMoTOcMxzRH4qZx8/9rpIikHWNofTapjlris5UWpHMcCrhHBEvnS1OyCrKS5SnEwB21/F6tiGJjiYsxueMynlOf7v8nrkOAZSltvP1OQ6mhEJDtv0P4y8j2do8TzzhrrnmmoTeVSS7lkGxhtqeVk3bVjK1enCaagB+PVFuUiCmStb6buJraJzRT46D4GjYsskZJIJ3X3lwVGbVk+BgUzH1MFgwNU9K/2glkW4IM5r6NMLw0gLAoVYg84DQpoi4Nebu/wH4p0pDFtQpcq7ddRdMLOX7FdEELXm2c67IZmxzkUaOCOmUZjLS2qtyXKl5kU5jKNIAURy9Py57OGbFFzVp6jRkTvAOV4azu6ByxN6HyZaEnqCuLhrMiw4phzMlhYa8YvrZnRih0Cm+AZKAscXIU9QrNC8cLLnPPZ4pqAM8Mg0WHs2xch2K7mescblD6nka9GiOAb+lVL9s5zhrZehJJVBFYm7shKlp0+gDkkPVdxw1WHcIIHEsN4UhXINyjp7xiHP7PfVMz24OWJ8ypnsFpRJtYVMOaLMmli9zdze2w+RBLsBoYHPR1chMbZbKgrJhPWrQzX/K6IWvsX0z0PDpodxAf8QRx9GNcJnNQT0VzvGsd7oV9Ojx6wavcZYOv3HJwDMATQFgUJD9ADeosGG+34eOHokDhXpP2koR9V9+vY5iJ5so2DZLOW2+M3ucU3lx3cw3+3eZpi9d+oZ5JoA2OoHqKZ2aOhvRppPuyxW0hH8p3Ozb0Y9G+qhrPxYDmjXt16AF6RGDDTqNxNHEPWyN1CKHoX14r3X8+T23O0bRlR5agBy8duShpx76SkBPQ8oH6qkr4DL6Qs0VPJyEcwr7BwChzDcsSeFpoytAtg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MA0P287MB3378.INDP287.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(52116014)(10070799003)(1800799024)(13003099007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0IVBb373TY220jA0a0s5THSBTzt1Kmb2xVnjDu3G2yhHR7DjEn/fI5V1+3gFFDl7sx4DSiKwcs+5Nxiqi0O769J2i1Z3+eUFWqL2S6V+p+3nl0adRkQJ2iIXaBB1iZT82Wse4bt2DgkpctrKSv8yOB69SxIXdvBkkzt0a8XoZl4LjpkHFIz/ITmpsA4hr811/XTRCRZGMpbfTQyVsQ+FplE9+3yfB2+iChr0kJm0KsT1hUK0lPAlFH/xQs2s9YXiu1qBiX1EGh2abnX/bkeFI7/Rq1BbtKUttDNObaG3mxEb6w7+O3nvEmBiZY6eOXy4ljzJuthOGIPBIvrUHI76Fwlr7mlKkd3glw+xZyo82y5oeaCnzX0pa188shhS3t9eI+6BipzqveUDtYuIC3w+ibLOKtZrPF9B+D48t/ZW++hJaMX7puQy/7bgyNN/ZCY5SwyAfqsBpBAkPMrxD+mMI4gVrn1t5Bo+PBF+QCT3tHdFIeJ5BkLj4QWr7c56AvDu7kuSmNlua2Za7eHW+t1qcz4Tf+gheDAFVYG10b6WNftPz4j4J/4GRJ017rZclYnmA9KYc6DhwclkUZznqylG+vctrm5L1jEON6n92A1lPKuVGFT8ftT6t4CH3WwvdlrTb9+4NwlvUCRa0uTbckQGewFadEePXZknGmovdWWSH9++giBMMFyJuVmCJEEAUpN9K+B9QXghieHfU7vjOGT8qF7e4ATgNFPG6jFDc6GHt0SKlyG2uPVT0pdKRP1L8Xgg1BlcavJ46JOCOF3FszwhgiI1L6t220tycc9ZxxYu8uslsTIYiW++jsVgZs6c7oSk9abAasqZIxftEV9AFSOpoQkQT0gKFqRqjN0P45i+4wHtNvhNgOdJ52r+kwQC32jW1HFeRQL0UKXfIc3JsAiUVnatralCXFVvhy9Vog+ZvkP6DXAaY8K2OyKSd1ROTb8Xo/EFK59Y+frygEyEhiC5JcIeqoDO/f8QU0ELuBlmmkr36MnwybAdGMlcgi68ETKIRzI2asykESpzHGBKcNKuhNmNJExwZmeecEQeqBp3+wcKUuzr5kI2fXcs3uW7q4HbiJkQRN4xU8sLnRZyJaWp2ab2wGvac+q5+QWE+yrxySNM8bFizZTlcpQXHXaH62vAk8iNgAtdiEWzvNCHdM/toCs97abn8SXDgmcdggNWPsTtZCerq0657sd0/HGeiOQqcUV0Q+xMRIihgdz7oJXehqywjjYVbb75n5rPvD73/Awb3R4RbCFLAKoaeSFyL2PTldcpZgHzGojuFGTit+2pX2RONVPgiXlzp7+Wm8B3XfsVv2Sg048HadJLgOU1aHCwPEE58n/kiClg8SzzRbz+cObkAqHBvoAXl4i8/lc9iPPhssAc8UCteULRAufTfJu16bNSrZ7rLdtZu+WEm451LRGbiuRa8XJ2cr+V7Zh9ULO3NNSBESr7Nq9zyRSoYUztqXbx3vLamaHiGB+fmUWaUxJwSP2v2VVNF5aQzpnXjZKsAncNLMOxjuqSn0J8X9sUHNsNbhsiT6SWTijrtRr/H2+RVDjOvQkl0SvHWy8p7pc1PsUQES2qDxJb0jX5YfPpKkG2Ap4SjH+00LH7jMdRtAW8hmViqZn2SDWXgGjKbzpFFWZQsTAyDUsniFRTsRfpp1wg/+HMdcxmAIif0Cj2uikbStw7+9ofXUHeye9HuuI= X-OriginatorOrg: bmwtechworks.in X-MS-Exchange-CrossTenant-Network-Message-Id: b0109ddb-db09-49ca-ee34-08de2811d717 X-MS-Exchange-CrossTenant-AuthSource: MA0P287MB3378.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2025 08:50:22.2423 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 970fa6fd-1031-4cc6-8c56-488f3c61cd05 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: P60twOnzglO0kkC2aZANN/jN0g3QvZaItjkjsNLWy5ISL++azBax/YW0vl888fklbGxtiL8HD3qgnyU+92KBrjOF8JjhrcADen/BOLC4QAJRLZS7f83GveO4KQOFB+Hi X-MS-Exchange-Transport-CrossTenantHeadersStamped: PN2P287MB1004 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 20 Nov 2025 15:26:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/121946 Backport the fix for CVE-2024-41817 Add below patch to fix 0012-ImageMagick-Fix-CVE-2024-41817.patch Signed-off-by: Divyanshu Rathore --- .../0012-ImageMagick-Fix-CVE-2024-41817.patch | 44 +++++++++++++++++++ .../imagemagick/imagemagick_7.0.10.bb | 1 + 2 files changed, 45 insertions(+) create mode 100644 meta-oe/recipes-support/imagemagick/files/0012-ImageMagick-Fix-CVE-2024-41817.patch diff --git a/meta-oe/recipes-support/imagemagick/files/0012-ImageMagick-Fix-CVE-2024-41817.patch b/meta-oe/recipes-support/imagemagick/files/0012-ImageMagick-Fix-CVE-2024-41817.patch new file mode 100644 index 0000000000..1a7f2aa72d --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/0012-ImageMagick-Fix-CVE-2024-41817.patch @@ -0,0 +1,44 @@ +From 80612989115844741371c10deda249d592c0b801 Mon Sep 17 00:00:00 2001 +From: Divyanshu Rathore +Date: Fri, 7 Nov 2025 09:45:43 +0530 +Subject: [PATCH 8/8] ImageMagick: Fix CVE-2024-41817 + +CVE: CVE-2024-41817 + +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/6526a2b28510ead6a3e14de711bb991ad9abff38] + +Comment: Refreshed hunk to match latest kirkstone + +Signed-off-by: Divyanshu Rathore +--- + AppRun | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/AppRun b/AppRun +index 4c597fa99..cd2787fe3 100644 +--- a/AppRun ++++ b/AppRun +@@ -7,16 +7,16 @@ + + HERE="$(dirname "$(readlink -f "${0}")")" + +-export MAGICK_HOME="$HERE/usr:$MAGICK_HOME" # https://imagemagick.org/QuickStart.txt +-export MAGICK_CONFIGURE_PATH=$(readlink -f "$HERE/usr/lib/ImageMagick-7.0.9/config-Q16"):$(readlink -f "$HERE/usr/lib/ImageMagick-7.0.9/config-Q16HDRI"):$(readlink -f "$HERE/usr/share/ImageMagick-7"):$(readlink -f "$HERE/usr/etc/ImageMagick-7"):$MAGICK_CONFIGURE_PATH #Wildcards don't work ++export MAGICK_HOME="$HERE/usr$MAGICK_HOME" # https://imagemagick.org/QuickStart.txt ++export MAGICK_CONFIGURE_PATH=$(readlink -f "$HERE/usr/lib/ImageMagick-7.0.9/config-Q16"):$(readlink -f "$HERE/usr/lib/ImageMagick-7.0.9/config-Q16HDRI"):$(readlink -f "$HERE/usr/share/ImageMagick-7"):$(readlink -f "$HERE/usr/etc/ImageMagick-7")$MAGICK_CONFIGURE_PATH #Wildcards don't work + + export LD_LIBRARY_PATH=$(readlink -f "$HERE/usr/lib"):$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=${HERE}/usr/lib/ImageMagick-7.0.9/modules-Q16HDRI/coders:$LD_LIBRARY_PATH + + if [ "$1" == "man" ] ; then +- export MANPATH="$HERE/usr/share/man:$MANPATH" ; exec "$@" ; exit $? ++ export MANPATH="$HERE/usr/share/man$MANPATH" ; exec "$@" ; exit $? + elif [ "$1" == "info" ] ; then +- export INFOPATH="$HERE/usr/share/info:$INFOPATH" ; exec "$@" ; exit $? ++ export INFOPATH="$HERE/usr/share/info$INFOPATH" ; exec "$@" ; exit $? + fi + + if [ ! -z $APPIMAGE ] ; then +-- +2.34.1 + diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb index d929a220f1..1b4ab344c2 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -39,6 +39,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt file://0011-ImageMagick-Add-support-patch-4-to-fix-CVE-2025-5529.patch \ file://0011-ImageMagick-Fix-1-CVE-2025-55298.patch \ file://0011-ImageMagick-Fix-2-CVE-2025-55298.patch \ + file://0012-ImageMagick-Fix-CVE-2024-41817.patch \ " SRCREV = "35b4991eb0939a327f3489988c366e21068b0178"