From patchwork Wed Mar 18 09:13:33 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nitin Wankhade X-Patchwork-Id: 83715 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 77FC110854D3 for ; Wed, 18 Mar 2026 09:09:18 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.9868.1773824953210824739 for ; Wed, 18 Mar 2026 02:09:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=HrJqcrG5; spf=pass (domain: gmail.com, ip: 209.85.214.171, mailfrom: nitin.wankhade333@gmail.com) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2b0500a8152so2265425ad.3 for ; Wed, 18 Mar 2026 02:09:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773824952; x=1774429752; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=+OVUHgkOVBEQDfvJmpQKoo9qIbMv7M0D5WNug0uZ8wk=; b=HrJqcrG5nbGREnSW7/NSfXEtSzK26UKnVEjXZ0c2E/2OT90y8+25XNR4OljMs5xgz/ JRyxD89O7fvBByR4vG9U5ha9kvQx0yRqUtNUJZa+dmrYbEAu0cshQGBCmrgUKVD2CVnP 8fnzbe+tmjm+GC7jvBblI4VyvOhckoliNPAX2rAxp2AiD2+TL1MHIFUwdZDwwAGnd1mA 71hD4WK4R2bz935+q56XzCLGESH1MrZ9uqJCmjdWCnUSdzFCEUw9BPDq2SZB7eWN0XO6 OzgwxQ3grfE9+dYwBDHsfChLqz2+R39ehDxVWzJEKplwLUDLUnaMLojN34jrhTIXXxUH 6Fjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773824952; x=1774429752; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=+OVUHgkOVBEQDfvJmpQKoo9qIbMv7M0D5WNug0uZ8wk=; b=IHUdFAns4cq9deh2vN1bQOzfUPLJE2YOC5AigRFKMI0RzdSdfOi6bdEWjrvso4jUgJ /N/EOLNfsafOiL93UmQgB2UjxJNIxD95VSgna2wRf/7nZgbTcOiEysl8SYTuiuk9ZbIb sH4XX6bj66RaeX51G7PmArimBzHakw1+4f1XoctgNy09EJ23BAHYCSyEu3b3yQY7pCF8 AzRrXrG8YJNMV0sUVkNq0hwnQ2qIbgrhYaS8e2I4Cv4X2I+xZWzPXYDRCGDqGh6fZ+ze iCfzY1ha2Lz2lEDqknr0mPBUgHquyK0tex8ew6B986ZzfIPkCyOuMGuuhGokSoto+QVn k4BQ== X-Gm-Message-State: AOJu0YzfUQIKfx7UnKMOgXZ00O/NES5H0RcPHw43ZAIPNLTzdAb8JNMS LCeq2DmJ4bwUkw0Y/LVv3Nw55O0Hfs4WFUxu4N4eyaTr9/1fAtkUJak+DMxq3Q== X-Gm-Gg: ATEYQzybuRv3cwP72NVJtFbjTjOa9Cez60SkTWKmqNckcF92+MohkF2Oc2A/XPK/2uM tg2tpTEdI9v+hNWEJ4zxjQ8YisLyxPxaRmNb74FpYuFYIas5be3zk/yOsIw/FcibxZT/AICR6WK V5HcrrEP1sIW42BZE/1M2ovlvlnMvy687aigd1ghJHTpgPRrQc1SS/sQxPrMKKyMgU3V1fO3dxN dIW7KvJEU1hk13PambtgeMd932oVK9T2l0pLe2n/xiJeNDnVEPpJNbQv7E6UuoocRa2wNemMG75 pF5Kh0S0f13753+d3173lzrezPyBruYTxjImiPNhRDkX6iUfaD0mxAble3+HoNnhj+Sqy1s0/UD VjhacLdOc2kUG4ZgbsS6qa58gy5gEXI9ThCB80w1qWwCiauVnadKhrV08qtI8sTc1xxMAOzGHgu jilmIoGujpq+B9WgooHls7DQmNUjwdruDc13oiP17ORaA= X-Received: by 2002:a05:6a00:1a16:b0:824:9b3b:787e with SMTP id d2e1a72fcca58-82a6ac9e787mr1209924b3a.1.1773824951690; Wed, 18 Mar 2026 02:09:11 -0700 (PDT) Received: from LL-3324L.kpit.com ([122.167.115.31]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82a6befc046sm2590361b3a.59.2026.03.18.02.09.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 02:09:11 -0700 (PDT) From: Nitin Wankhade X-Google-Original-From: Nitin Wankhade To: openembedded-devel@lists.openembedded.org Cc: nitin.wankhade@kpit.com, Nitin Wankhade Subject: [meta-oe][kirkstone][PATCH 1/6] imagemagick: Fix CVE-2025-43965 Date: Wed, 18 Mar 2026 14:43:33 +0530 Message-Id: <20260318091338.483937-1-nitin.wankhade@partner.bmw.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 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 ; Wed, 18 Mar 2026 09:09:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/125354 Reference: https://github.com/ImageMagick/ImageMagick/commit/bac413a26073923d3ffb258adaab07fb3fe8fdc9 Signed-off-by: Nitin Wankhade --- .../imagemagick/files/CVE-2025-43965.patch | 21 +++++++++++++++++++ .../imagemagick/imagemagick_7.0.10.bb | 1 + 2 files changed, 22 insertions(+) create mode 100644 meta-oe/recipes-support/imagemagick/files/CVE-2025-43965.patch diff --git a/meta-oe/recipes-support/imagemagick/files/CVE-2025-43965.patch b/meta-oe/recipes-support/imagemagick/files/CVE-2025-43965.patch new file mode 100644 index 0000000000..385536957f --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/CVE-2025-43965.patch @@ -0,0 +1,21 @@ +From bac413a26073923d3ffb258adaab07fb3fe8fdc9 Mon Sep 17 00:00:00 2001 +From: Dirk Lemstra +Date: Sat, 8 Feb 2025 23:31:39 +0100 + +Subject: [PATCH] imagemagick: Fix CVE-2025-43965 +CVE: CVE-2025-43965 +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/bac413a26073923d3ffb258adaab07fb3fe8fdc9] +Signed-off-by: Nitin Wankhade +=== +diff --git a/coders/miff.c b/coders/miff.c +index 21b91d0..91bd36a 100644 +--- a/coders/miff.c ++++ b/coders/miff.c +@@ -1307,6 +1307,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info, + if (quantum_format != UndefinedQuantumFormat) + { + status=SetQuantumFormat(image,quantum_info,quantum_format); ++ image->depth=quantum_info->depth; + if (status == MagickFalse) + ThrowMIFFException(ResourceLimitError,"MemoryAllocationFailed"); + } 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 81f4596456..c4e48b4bbe 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -48,6 +48,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt file://CVE-2022-1115.patch \ file://CVE-2025-65955.patch \ file://CVE-2025-62171.patch \ + file://CVE-2025-43965.patch \ " SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" From patchwork Wed Mar 18 09:13:34 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nitin Wankhade X-Patchwork-Id: 83716 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 61DA110854D4 for ; Wed, 18 Mar 2026 09:09:28 +0000 (UTC) Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.9893.1773824964966680540 for ; Wed, 18 Mar 2026 02:09:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=VSbw9Cmu; spf=pass (domain: gmail.com, ip: 209.85.215.169, mailfrom: nitin.wankhade333@gmail.com) Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-c70d802cc05so576365a12.3 for ; Wed, 18 Mar 2026 02:09:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773824964; x=1774429764; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ExuXtCSr4v3IJw4DiQvhxyYdVDpbqnB3jQQwinG9aVM=; b=VSbw9CmuqunEXfFxftTf6H6s0Y+YKMI8fYxXoqApZjv+BkjhpJ4kCIDPyckvMQ5sCI BWvC10iBNXTyjCnjk/mwIyT+Bwra4RFRKxXM4e1slIAviUcKUvHbKyIst/HYYuNTF5Lc m4+LgCfqCLKCqHh0LEgt6lXGMWGS2EXV7HZEHkLitgM/+RP53ofDJbM6klsAxrYhnESO RxnWPzeUtrtgF7hi4Ex5MwYv0KhrKLCIrR1+GSLR7eNl8fU0VNHooW3H+dRtWZwrI+Le iGs1XoyPJPeHJK/fc6zMY/1N9YmJq2OT8EZxK+EFdVnTN1Qk28QpjNmBMPfRo5c0f89V ze+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773824964; x=1774429764; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ExuXtCSr4v3IJw4DiQvhxyYdVDpbqnB3jQQwinG9aVM=; b=ADFXEGBVs/9+bePVWqdqt3Hm/2B1PrY5Opa/t/vuJoC1Zctj6GdHhEdGeCSQWgZi92 hhJixHJoMBOeo3Nz1ujSoD4jAOD59FH06k+3EsbGP4Lqz1LIRHwA08OtTvL8UyprgHLd KwBrG8RbBQdCtQ1cE4OFk71QtWxN+2L8bMqw1GwlMSlLYTQ2NlREOn0SkIf/jGpoRtlN FwaLQ57pAvsmHG3zg29jZD4Ijjkj773R/WeSYs4uPPouJJIVds5bG0simooEepNsTbug BeE2/y4aTOkTnmh7+TvJMXWPoEVKtJyBpXedi7d/Yp92M/WvYj01t0CmhzQpZfkphDAX EUDA== X-Gm-Message-State: AOJu0Ywn1afGjUDMUGKUTFCUhNL7at8dVDaMLYQ9KKajTm7PhbyICCaN 23CIROkqmTh08htewgKlyugZKGgGTy6mgTgrgYDjUYlxfYQAcYjv6/QTN5oplw== X-Gm-Gg: ATEYQzy10YkCsmOaQjQMQGG6nn9ZYGn5sbsy6Ui9Z2mR/EnR0vo/AO8rED7+F+6avn4 nDY8CFTm6p9wjE9CUPGrwvCALAd5wuD3ucdW8mEI7U3JfxoCBogy5AxUQavO2bs2D1MQfIE6gyV fKnGP1osszx6tovAFZJ9AwjavBqJelmgWT1gXUqraywVBX7FM68h+7ltwptNzROr+FZ6Qr7aoCY NxLEZMNp8VNexEesQN/WCQDekKQfR4hUTrgh3xxLeanncpuCpG1cbSXF8eUlDQLFKhCUxTqPjMS ksq5eaDeLsGvz009XWzcKG8h7GLNJMwBA51Telb3JIKFIxAfAiqpvr4qG9TqoqywGuUCEGsMkMd qMEl9xaaiz1ALmzQ+ZPfhPjeLIXlTSbzbgnqJwzapLmJtV5ONgi7sAA12JZLxucrzFyz7YT/0Dh kJxKSqdjI816hpBFET3P+S5wYdfOXgoEzYo1knKFIXeQZxUsXv/FCFGQ== X-Received: by 2002:aa7:8896:0:b0:81f:453d:1ab9 with SMTP id d2e1a72fcca58-82a6aec2b41mr1701457b3a.3.1773824963936; Wed, 18 Mar 2026 02:09:23 -0700 (PDT) Received: from LL-3324L.kpit.com ([122.167.115.31]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82a6befc046sm2590361b3a.59.2026.03.18.02.09.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 02:09:23 -0700 (PDT) From: Nitin Wankhade X-Google-Original-From: Nitin Wankhade To: openembedded-devel@lists.openembedded.org Cc: nitin.wankhade@kpit.com, Nitin Wankhade Subject: [meta-oe][kirkstone][PATCH 2/6] imagemagick: Fix CVE-2025-66628 Date: Wed, 18 Mar 2026 14:43:34 +0530 Message-Id: <20260318091338.483937-2-nitin.wankhade@partner.bmw.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260318091338.483937-1-nitin.wankhade@partner.bmw.de> References: <20260318091338.483937-1-nitin.wankhade@partner.bmw.de> MIME-Version: 1.0 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 ; Wed, 18 Mar 2026 09:09:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/125355 Reference: https://github.com/ImageMagick/ImageMagick/commit/bdae0681ad1e572defe62df85834218f01e6d670 Signed-off-by: Nitin Wankhade --- .../imagemagick/files/CVE-2025-66628.patch | 23 +++++++++++++++++++ .../imagemagick/imagemagick_7.0.10.bb | 1 + 2 files changed, 24 insertions(+) create mode 100644 meta-oe/recipes-support/imagemagick/files/CVE-2025-66628.patch diff --git a/meta-oe/recipes-support/imagemagick/files/CVE-2025-66628.patch b/meta-oe/recipes-support/imagemagick/files/CVE-2025-66628.patch new file mode 100644 index 0000000000..6b1d14ca06 --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/CVE-2025-66628.patch @@ -0,0 +1,23 @@ +From bdae0681ad1e572defe62df85834218f01e6d670 Mon Sep 17 00:00:00 2001 +From: Dirk Lemstra +Date: Tue, 2 Dec 2025 22:49:12 +0100 + +Subject: [PATCH] imagemagick: Fix CVE-2025-66628 +CVE: CVE-2025-66628 +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/bdae0681ad1e572defe62df85834218f01e6d670] +Signed-off-by: Nitin Wankhade +=== +diff --git a/coders/tim.c b/coders/tim.c +index 9a281b3..7b9cb1b 100644 +--- a/coders/tim.c ++++ b/coders/tim.c +@@ -231,7 +231,8 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception) + (void) ReadBlobLSBShort(image); + width=ReadBlobLSBShort(image); + height=ReadBlobLSBShort(image); +- image_size=2*width*height; ++ if (HeapOverflowSanityCheckGetSize(2*width,height,&image_size) != MagickFalse) ++ ThrowReaderException(CorruptImageError,"ImproperImageHeader"); + if (image_size > GetBlobSize(image)) + ThrowReaderException(CorruptImageError,"InsufficientImageDataInFile"); + bytes_per_line=width*2; 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 c4e48b4bbe..7b2d33ccb8 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -49,6 +49,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt file://CVE-2025-65955.patch \ file://CVE-2025-62171.patch \ file://CVE-2025-43965.patch \ + file://CVE-2025-66628.patch \ " SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" From patchwork Wed Mar 18 09:13:35 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nitin Wankhade X-Patchwork-Id: 83718 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 634A410854D4 for ; Wed, 18 Mar 2026 09:09:38 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.9872.1773824971573739717 for ; Wed, 18 Mar 2026 02:09:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=e6QYl3eI; spf=pass (domain: gmail.com, ip: 209.85.210.176, mailfrom: nitin.wankhade333@gmail.com) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-8244105fa96so423607b3a.3 for ; Wed, 18 Mar 2026 02:09:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773824970; x=1774429770; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=p1Evr/TQcnfY1y3yWQFlmVAN21cmqgH8yCAMYAl4a/w=; b=e6QYl3eIJ5ttzpkApranPIWVdM7rQns3Nw0m7+gTueI9vGaXYYNUiXFmf6DTRzpkG1 eGdBJfyTcGjPDpI8G4xcfuSlw0+KUtjiYVXG3ZY+Lf/ZTbB26MkoABtHcSQQhzq+juuI OLlL8lZRZTA9RVdIxBYXq/NQiDuwB/2TDaGNlTtU+xrvHAaqEm6Q0vqcWtArUuHAuaka 2di36cR0a2v2ddv4DHscBQxBfjATMuJ012iGQQ28Af/saB+NzfbytT/vjmq4IBRc73iK Ag/OW3I0f8IZ6+jXFHPyU7HdOMlH6ra3jMYpxJXX1Jln55twtI8R2KyA9qenImy9Euu0 1oew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773824970; x=1774429770; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=p1Evr/TQcnfY1y3yWQFlmVAN21cmqgH8yCAMYAl4a/w=; b=StRg41fPkNt+UVnMMGr2L/Qdv6LmxoUkZHqz/PAz1vt2tyKkH4q9ba7hcWbyz1s0bB onZyMwb3beByIqXRHN6ej0442RmkG+QKhN+EYfY4l5em0OyqIHIBJ+2TtUBxflVKY3EA mW47v4upfLlY/zTr1Sma863IABRW2EI0+TCftrOjVOBT3BMRzMgBRf4RHQd2YZLLSY9T k3xxZFr/tiBhJZh5z5OFuoLZuJ+6emYcQDXNgjGgi+S7xAgt0zBYoCaSYkP/d/SfNNiT 6en4OvabHbjP+I6V7g/ZzWFN/d+3AAJbxMvwqOhx/LL58NJ1fjHq1LVH/POOQO7PmamY aUhQ== X-Gm-Message-State: AOJu0YxgVtcKPfdxHSzkitP8uTRTYitDwCP4CeWb2TQNYXIMBFrvyTqm iwXS48jfSjMraB5e52WAQCHHD53DrJvdVkaEqf1I+WhUDRBl/4lg4H5xGsZAWw== X-Gm-Gg: ATEYQzwzdFBLZVzeBjepqG8aLdTdArkG6tGxiQyDlW6uRqVQMuaQOhmhxjkP8JQldFz 4E3wsjTMoPGhelgvy8xCol61pth3WfX3K7R4ELlKbwMnUlI8KT03Oh5xEHT5u9vdMugW9/iVimN BNm0ssiWOlyMqU90vhSUIrg1auw3AIYsmvEYMg4YrFrYGtdWD8gZi6UzpClkifKFiYsLAGwG1FA fUNXZ3etzy67H1Fp6t0r3Obt6eZ3EIBvBV+6y2GbiF97M4tRUOm0YQB2VaARtbC0hDvY4jF/zoX tkIufjRDVkV/zVAjHp9ddVP1VXnMoK4QwE1BM6Q991vgwCjtgAbhzFD0/x7nwxmnmUiVBtwYjY5 kcngty8PQfyfkf1iDFxYwOyWzEyxh1voshziYo4BFGWv+wC5WipPralogD1V8Hqb+rj5CW0K8AN zQO83y2LhIT/KG1u46Tp2cQfr4kFEdtJelVbDCQNszkB2P/YVkmhZqQw== X-Received: by 2002:a05:6a00:a213:b0:81e:fd4c:fb39 with SMTP id d2e1a72fcca58-82a6aec2c5dmr1792822b3a.4.1773824970562; Wed, 18 Mar 2026 02:09:30 -0700 (PDT) Received: from LL-3324L.kpit.com ([122.167.115.31]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82a6befc046sm2590361b3a.59.2026.03.18.02.09.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 02:09:30 -0700 (PDT) From: Nitin Wankhade X-Google-Original-From: Nitin Wankhade To: openembedded-devel@lists.openembedded.org Cc: nitin.wankhade@kpit.com, Nitin Wankhade Subject: [meta-oe][kirkstone][PATCH 3/6] imagemagick: Fix CVE-2025-68618 Date: Wed, 18 Mar 2026 14:43:35 +0530 Message-Id: <20260318091338.483937-3-nitin.wankhade@partner.bmw.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260318091338.483937-1-nitin.wankhade@partner.bmw.de> References: <20260318091338.483937-1-nitin.wankhade@partner.bmw.de> MIME-Version: 1.0 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 ; Wed, 18 Mar 2026 09:09:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/125356 Reference: https://github.com/ImageMagick/ImageMagick/commit/6f431d445f3ddd609c004a1dde617b0a73e60beb Signed-off-by: Nitin Wankhade --- .../imagemagick/files/CVE-2025-68618.patch | 95 +++++++++++++++++++ .../imagemagick/imagemagick_7.0.10.bb | 1 + 2 files changed, 96 insertions(+) create mode 100644 meta-oe/recipes-support/imagemagick/files/CVE-2025-68618.patch diff --git a/meta-oe/recipes-support/imagemagick/files/CVE-2025-68618.patch b/meta-oe/recipes-support/imagemagick/files/CVE-2025-68618.patch new file mode 100644 index 0000000000..c846b0cc31 --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/CVE-2025-68618.patch @@ -0,0 +1,95 @@ +From 6f431d445f3ddd609c004a1dde617b0a73e60beb Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Sun, 21 Dec 2025 12:43:08 -0500 + +Subject: [PATCH] imagemagick: Fix CVE-2025-68618 +CVE: CVE-2025-68618 +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/6f431d445f3ddd609c004a1dde617b0a73e60beb] +Signed-off-by: Nitin Wankhade +=== +diff --git a/coders/msl.c b/coders/msl.c +index 68abd7d..0e8f632 100644 +--- a/coders/msl.c ++++ b/coders/msl.c +@@ -126,6 +126,7 @@ typedef struct _MSLInfo + + ssize_t + n, ++ depth, + number_groups; + + ImageInfo +@@ -660,13 +661,13 @@ static void MSLStartElement(void *context,const xmlChar *tag, + RectangleInfo + geometry; + +- ssize_t +- i; +- + size_t + height, + width; + ++ ssize_t ++ i; ++ + /* + Called when an opening tag has been processed. + */ +@@ -674,6 +675,13 @@ static void MSLStartElement(void *context,const xmlChar *tag, + " SAX.startElement(%s",tag); + exception=AcquireExceptionInfo(); + msl_info=(MSLInfo *) context; ++ if (msl_info->depth++ >= MagickMaxRecursionDepth) ++ { ++ (void) ThrowMagickException(msl_info->exception,GetMagickModule(), ++ DrawError,"VectorGraphicsNestedTooDeeply","`%s'",tag); ++ xmlStopParser((xmlParserCtxtPtr) context); ++ return; ++ } + n=msl_info->n; + keyword=(const char *) NULL; + value=(char *) NULL; +@@ -7430,12 +7438,12 @@ static void MSLStartElement(void *context,const xmlChar *tag, + + static void MSLEndElement(void *context,const xmlChar *tag) + { +- ssize_t +- n; +- + MSLInfo + *msl_info; + ++ ssize_t ++ n; ++ + /* + Called when the end of an element has been detected. + */ +@@ -7525,6 +7533,7 @@ static void MSLEndElement(void *context,const xmlChar *tag) + } + if (msl_info->content != (char *) NULL) + msl_info->content=DestroyString(msl_info->content); ++ msl_info->depth--; + } + + static void MSLCharacters(void *context,const xmlChar *c,int length) +diff --git a/coders/svg.c b/coders/svg.c +index 5caf8af..ab139e2 100644 +--- a/coders/svg.c ++++ b/coders/svg.c +@@ -1270,7 +1270,13 @@ static void SVGStartElement(void *context,const xmlChar *name, + (void) LogMagickEvent(CoderEvent,GetMagickModule()," SAX.startElement(%s", + name); + svg_info=(SVGInfo *) context; +- svg_info->n++; ++ if (svg_info->n++ > MagickMaxRecursionDepth) ++ { ++ (void) ThrowMagickException(svg_info->exception,GetMagickModule(), ++ DrawError,"VectorGraphicsNestedTooDeeply","`%s'",name); ++ xmlStopParser((xmlParserCtxtPtr) context); ++ return; ++ } + svg_info->scale=(double *) ResizeQuantumMemory(svg_info->scale, + svg_info->n+1UL,sizeof(*svg_info->scale)); + if (svg_info->scale == (double *) NULL) 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 7b2d33ccb8..1afc8bbe2c 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -50,6 +50,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt file://CVE-2025-62171.patch \ file://CVE-2025-43965.patch \ file://CVE-2025-66628.patch \ + file://CVE-2025-68618.patch \ " SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" From patchwork Wed Mar 18 09:13:36 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nitin Wankhade X-Patchwork-Id: 83717 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 746B210854D7 for ; Wed, 18 Mar 2026 09:09:38 +0000 (UTC) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.9875.1773824976948815010 for ; Wed, 18 Mar 2026 02:09:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bSZO1/NA; spf=pass (domain: gmail.com, ip: 209.85.215.179, mailfrom: nitin.wankhade333@gmail.com) Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-c65c87f73e3so330800a12.0 for ; Wed, 18 Mar 2026 02:09:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773824976; x=1774429776; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qf+aU9TE3L6/rND8V0BW45lk19qG/LkqR1i3SRGUwvE=; b=bSZO1/NAICTUMZkXrk2IgIaW98LJjSvFg44yzCUGewCJO/jA5YOGv69YausHKEa0UT o0zrrzVs6GFon0gNdPwxghCXcEhPgtiaPaREfvNpVVltnxYEKe2wvpzMsK30RWby7eCF BgCVlEFgpTeNQKPYVjWrh7omCAPml71yK9xqgLUAsOW0ZRwQV+sUnXUc9zZIGESh/uyM tdAu1x2jStqzqpjLzZ39KIh73cPvmSHTGWfx2+CZaFY76wFJq6Req4TRFuiO+4VBDXRv PLn9KkFIZn/Bu3nTT0t33TM/y8t0cMQASRMdc6m6d3fZa9wIfGg7+GuP+iwtBVhkkVAF Npqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773824976; x=1774429776; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=qf+aU9TE3L6/rND8V0BW45lk19qG/LkqR1i3SRGUwvE=; b=dRXJYLrqHISfpThDBTfGEcC5oL88SVH1iffqFko2bkWurkb+5OtSpOctrvRYeQCVoM BaOoSUyBG0WkGdzglOnqtxJShP16fqKCuD1ZZp3IM86HToTaX+IrUOzm3cNWu2qYWBU7 9uyw4zcCE/5UVAjAMGpal2TAPo5LdOnlpxvGWa94kEqMC852VJda3INYouHyps4X0cya XAegQjvozFUsqafz4de9vcVl39AurGGcYJ2FKoSPkHiAJaHnZrFP6buS2r4i2E7fASQe Xv7jpRnK0hjvHX+rIgDvwG4dBELsGWxjaGcGsQQiaO6p7k6PNnCe/LJfFxLSgTprNVD4 1Fhw== X-Gm-Message-State: AOJu0YwtqqrQS6BG1UbEAU/A7CmR7r+1YHysjhKX0mnGIQO/o4FgLqE6 MgAfChmATbqekCUDDXSe9xcLdkvh3dGu4j5DOp2nCBvGGFh8lbEfW9sBI/B+6Q== X-Gm-Gg: ATEYQzyNh3XaSh8GzXQQzoQ4g8pJfR379H8nkcMb69jOKjOCrFwQL4RqxSGZ4nhzryK DV3gzPnlSQHGY83K+Yb4VX74mfvIOoR405urJkOo0Rhc6NWqY5RkgvR0DRXW2ruL13p1xey2ht8 Mqx6QNjdLjUYxA7+97fJGLKqP+8m9lz1OvM4FS/0myw03VWzm+evmtIEHi3jCFLS9VQdo4mm86f WT9FSqsb6mnoz+3wXFkiy/mxt503sO1Fz48eEm2V28HHYGQcHLPIvPfhVyxrdPX2egGi3Sb6DeO GzPu3UbNnTeXJAONFEtIsnRPudQ/yEBaUwR9hx04lCQZz4G5rwxzynAnMxzxPaSpQgY8EW/h+Zv SWWSs5Kh01LJZlJe1glO+qTSY+OjKSUn0lqUm+h9fprWRJUJQb6crXI2RgpaNpiz4T4LmLwiUA6 HJzEDD7qDPKUl9slnXZBoHkzzVvxET2ZroZkUV278uCDY= X-Received: by 2002:a05:6a21:6d98:b0:398:97dc:5546 with SMTP id adf61e73a8af0-39b99cb42aemr1701755637.2.1773824975993; Wed, 18 Mar 2026 02:09:35 -0700 (PDT) Received: from LL-3324L.kpit.com ([122.167.115.31]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82a6befc046sm2590361b3a.59.2026.03.18.02.09.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 02:09:35 -0700 (PDT) From: Nitin Wankhade X-Google-Original-From: Nitin Wankhade To: openembedded-devel@lists.openembedded.org Cc: nitin.wankhade@kpit.com, Nitin Wankhade Subject: [meta-oe][kirkstone][PATCH 4/6] imagemagick: Fix CVE-2026-22770 Date: Wed, 18 Mar 2026 14:43:36 +0530 Message-Id: <20260318091338.483937-4-nitin.wankhade@partner.bmw.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260318091338.483937-1-nitin.wankhade@partner.bmw.de> References: <20260318091338.483937-1-nitin.wankhade@partner.bmw.de> MIME-Version: 1.0 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 ; Wed, 18 Mar 2026 09:09:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/125357 Reference: https://github.com/ImageMagick/ImageMagick/commit/3e0330721020e0c5bb52e4b77c347527dd71658e Signed-off-by: Nitin Wankhade --- .../imagemagick/files/CVE-2026-22770.patch | 37 +++++++++++++++++++ .../imagemagick/imagemagick_7.0.10.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta-oe/recipes-support/imagemagick/files/CVE-2026-22770.patch diff --git a/meta-oe/recipes-support/imagemagick/files/CVE-2026-22770.patch b/meta-oe/recipes-support/imagemagick/files/CVE-2026-22770.patch new file mode 100644 index 0000000000..f370d3eec5 --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/CVE-2026-22770.patch @@ -0,0 +1,37 @@ +From 3e0330721020e0c5bb52e4b77c347527dd71658e Mon Sep 17 00:00:00 2001 +From: Dirk Lemstra +Date: Sun, 4 Jan 2026 15:26:48 +0100y + +Subject: [PATCH] imagemagick: Fix CVE-2026-22770 +CVE: CVE-2026-22770 +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/3e0330721020e0c5bb52e4b77c347527dd71658e] +Signed-off-by: Nitin Wankhade +=== +diff --git a/MagickCore/effect.c b/MagickCore/effect.c +index bfb1363..3a44240 100644 +--- a/MagickCore/effect.c ++++ b/MagickCore/effect.c +@@ -880,16 +880,21 @@ static double **AcquireBilateralThreadSet(const size_t number_threads, + double + **weights; + ++ size_t ++ count; ++ + ssize_t + i; + ++ if (HeapOverflowSanityCheckGetSize(height,sizeof(**weights),&count) != MagickFalse) ++ return((double **) NULL); + weights=(double **) AcquireQuantumMemory(number_threads+1,sizeof(*weights)); + if (weights == (double **) NULL) + return((double **) NULL); +- (void) memset(weights,0,number_threads*sizeof(*weights)); ++ (void) memset(weights,0,(number_threads+1)*sizeof(*weights)); + for (i=0; i <= (ssize_t) number_threads; i++) + { +- weights[i]=(double *) AcquireQuantumMemory(width,height*sizeof(**weights)); ++ weights[i]=(double *) AcquireQuantumMemory(width,count); + if (weights[i] == (double *) NULL) + return(DestroyBilateralThreadSet(number_threads,weights)); + } 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 1afc8bbe2c..e235b9eb89 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -51,6 +51,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt file://CVE-2025-43965.patch \ file://CVE-2025-66628.patch \ file://CVE-2025-68618.patch \ + file://CVE-2026-22770.patch \ " SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" From patchwork Wed Mar 18 09:13:37 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nitin Wankhade X-Patchwork-Id: 83719 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 770A210854D7 for ; Wed, 18 Mar 2026 09:09:48 +0000 (UTC) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.9896.1773824981569410720 for ; Wed, 18 Mar 2026 02:09:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=OEA/ltHS; spf=pass (domain: gmail.com, ip: 209.85.215.176, mailfrom: nitin.wankhade333@gmail.com) Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-c6e85f76efeso354522a12.1 for ; Wed, 18 Mar 2026 02:09:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773824980; x=1774429780; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AdliWSd5xp7Chvat2iJaoXs8kLfO0UCp90RM25I+rF0=; b=OEA/ltHSmLIizThpBignW/pGGQ2JYzH0ySiCt46qL9aEDSeUrZ7zLbJ2+r6XJBCG9w eehsK8QwP4+YbVcZuPwLWfQ3Jp7KDI4KQLlPpgDuyWG0xAHUDHBhwRB8Bc+/84JruHXc zxnQjHE6qtY+ghRR+CinUHmsZieB4PIb2zPfL/Whq4EGeFxqTucY98WmQthEy2YIvkq8 VdYiMOgKg0uPTkjQfyt4YlUbUTGk8HrTmEmNsx8Sna19OY5QsPpqzXJhFQLvhWhAgL04 33wDJOE0mdXI0OA7whwTCRIvqkp8AssUDS4Cmbt0bxKfh8RNPEHo68qoXaTKiinceeuZ EWFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773824980; x=1774429780; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=AdliWSd5xp7Chvat2iJaoXs8kLfO0UCp90RM25I+rF0=; b=qzNozWowXUxzt6Xr7+buqkvwzIwaQw3b21u2dSB/rLXtEdvjmDgG7mfhdMos9x7bmh +upPQpnHnKkTAqY7UhT9n6vqbB/Coo0ObyMxmnupltgpAuGyNqBV2w66BIeICqMmRpid x0/EsWttukPOoiqN4GaYJGB48+v8EpeV/Ab0YHju+E6FhHIqu/r8AwhhOpUJs27zebIE UQKtpzKrThbLvBkTh4DSMuHwLbNKZD2vRSuexqJ3NGw8Ku4JFMGMPLTupZncqepgDqm4 SfK1QmtvGnz2uDtERVxrKw/fOA7rf27pswvYiaXSq2khgzcv5yQjMZXps/Ht1k1Suv4t 3z2Q== X-Gm-Message-State: AOJu0YwyzWta9/dDKDIj8pC8fENjuz5scfk2ETJx3QZyHFkjEMpw3Rfz QfdkpyxsbUBmbuajy5u+jFZzxdF7BNEFpEkjdyvUTz6jCLE4a7Nfkj4vDKoBKQ== X-Gm-Gg: ATEYQzyhiGdieyXLLP6MGTqIgKosoMZ2pOlczHhcrMKAo0uZEut+gKJ/849Z8oQFTE7 Y15lgBMdGo8yye9902OJRPSdsyDC/cd0w0BS+ZHWfxu5WaeXaL67eOtpWRoESZNfrRVc/xDW0YW 1RgR+EDQGU+31qYytdUvcp5rmc+GcyuewzRCEsDWxKuAIFlu+rqv8Iv4rt4IOwrzdu3gAbDXzJQ +u5Rb677Lx6k39UhfJcBESD1H/Ywv9dHS6do/rgSQIVaMdJ3CUaHj4n2S8dxJFWkA+AVmS8rWIz jMtvSBgcTtbISzcoZot5sU9TD5lFJNyXE8shBwh9Y4tgDd77CtNyBlCn7YpTEwTpikTsdzvILHh PrCPeD8vyXy4mzJgUz2KDDW7yOp+fvsgMxbFByiYkk0saFo77ti7xkmqJ+42TULLc5vRkB42+tU qKO8B6H5UZXNAiMEK3O/5n+9yXhSveqcQm4/lP7hsvVgw= X-Received: by 2002:a05:6a00:138a:b0:827:2b42:10ea with SMTP id d2e1a72fcca58-82a6ac781d2mr1873601b3a.1.1773824980550; Wed, 18 Mar 2026 02:09:40 -0700 (PDT) Received: from LL-3324L.kpit.com ([122.167.115.31]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82a6befc046sm2590361b3a.59.2026.03.18.02.09.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 02:09:40 -0700 (PDT) From: Nitin Wankhade X-Google-Original-From: Nitin Wankhade To: openembedded-devel@lists.openembedded.org Cc: nitin.wankhade@kpit.com, Nitin Wankhade Subject: [meta-oe][kirkstone][PATCH 5/6] imagemagick: Fix CVE-2026-23874 Date: Wed, 18 Mar 2026 14:43:37 +0530 Message-Id: <20260318091338.483937-5-nitin.wankhade@partner.bmw.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260318091338.483937-1-nitin.wankhade@partner.bmw.de> References: <20260318091338.483937-1-nitin.wankhade@partner.bmw.de> MIME-Version: 1.0 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 ; Wed, 18 Mar 2026 09:09:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/125358 Reference: https://github.com/ImageMagick/ImageMagick/commit/2a09644b10a5b146e0a7c63b778bd74a112ebec3 Signed-off-by: Nitin Wankhade --- .../imagemagick/files/CVE-2026-23874.patch | 36 +++++++++++++++++++ .../imagemagick/imagemagick_7.0.10.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta-oe/recipes-support/imagemagick/files/CVE-2026-23874.patch diff --git a/meta-oe/recipes-support/imagemagick/files/CVE-2026-23874.patch b/meta-oe/recipes-support/imagemagick/files/CVE-2026-23874.patch new file mode 100644 index 0000000000..1700f6c06a --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/CVE-2026-23874.patch @@ -0,0 +1,36 @@ +From 2a09644b10a5b146e0a7c63b778bd74a112ebec3 Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Thu, 15 Jan 2026 17:50:19 -0500 + +Subject: [PATCH] imagemagick: Fix CVE-2026-23874 +CVE: CVE-2026-23874 +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/2a09644b10a5b146e0a7c63b778bd74a112ebec3] +Signed-off-by: Nitin Wankhade +=== +diff --git a/coders/msl.c b/coders/msl.c +index 0e8f632..7ace1b3 100644 +--- a/coders/msl.c ++++ b/coders/msl.c +@@ -7416,9 +7416,19 @@ static void MSLStartElement(void *context,const xmlChar *tag, + + /* process */ + { +- *msl_info->image_info[n]->magick='\0'; +- (void) WriteImage(msl_info->image_info[n], msl_info->image[n], +- msl_info->exception); ++ (void) CopyMagickString(msl_info->image_info[n]->filename, ++ msl_info->image[n]->filename,MagickPathExtent); ++ (void) SetImageInfo(msl_info->image_info[n],1,exception); ++ if (LocaleCompare(msl_info->image_info[n]->magick,"msl") != 0) ++ { ++ *msl_info->image_info[n]->magick='\0'; ++ (void) WriteImage(msl_info->image_info[n],msl_info->image[n], ++ msl_info->exception); ++ } ++ else ++ (void) ThrowMagickException(msl_info->exception,GetMagickModule(), ++ FileOpenError,"UnableToWriteFile","`%s'", ++ msl_info->image[n]->filename); + break; + } + } 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 e235b9eb89..a2e08afc1a 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -52,6 +52,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt file://CVE-2025-66628.patch \ file://CVE-2025-68618.patch \ file://CVE-2026-22770.patch \ + file://CVE-2026-23874.patch \ " SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" From patchwork Wed Mar 18 09:13:38 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nitin Wankhade X-Patchwork-Id: 83720 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 87D4510854D9 for ; Wed, 18 Mar 2026 09:09:48 +0000 (UTC) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.9877.1773824985695425438 for ; Wed, 18 Mar 2026 02:09:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=NH1o5ikF; spf=pass (domain: gmail.com, ip: 209.85.215.170, mailfrom: nitin.wankhade333@gmail.com) Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-c7382963b67so368780a12.0 for ; Wed, 18 Mar 2026 02:09:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773824985; x=1774429785; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pAVzRmgkFRGIl65vz6d+C1H85YHlGG3WapmGalx7+4M=; b=NH1o5ikFvNS1fLYCfxaDILUGracYzZDQzGY/h5a8tpjJyB9GAvRRHl1l/YY74qTBwq 6wX/IEmgu/O6eGDQXzO6/ODj86gOa39pJec5wKE1HyYsLL+Rcx5m24gmr7t0RPCzqz97 foDXpxJiDF9Ma/ZjBpKsWHV0NoIntER80NHGJPkxltNNIO2b/LTVSlttekM0c+Jx5pOL OW/ofIlOZdNXgmAP6p3+XJkVTEmVxWVeKvZFqS7RyJkk7qGoUMTnVaYqdGCM5Fbf5DFH EwL7+8yaRtyCOevmoly/WfQmGpgX0alXrN9q+Ql9R7tFQuOwLSeUt1TWySXen8Ds8sc7 TqoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773824985; x=1774429785; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=pAVzRmgkFRGIl65vz6d+C1H85YHlGG3WapmGalx7+4M=; b=fXWfNatOJHoH8mEAYTl6YY+27UkEem/OjQrrK5VYu0FwH+ttqmtadrfoa8142HDCp+ RNNhhv4NnLr6YGJ+Vzt9mUNvfmRGfcVFfQMmCyakYYWEoKDiF6SCLP+BEJTlairgUXQs pXyhNwv62AnfipQpW5xz2oQ/w/vEW/sWieuNv8k0V0eTUZt491Vrqeh9lI6VwczepeQO vk6mM7vcDllLQd5nhkPjsF2PvaY9koI5Cv8jDxA2zbQfbKltAEzpmbsnQS9p6AL42J35 uzFsMSIZBObNgU3lepco4MuO6GPa93o+8gD+oxpLYqBKfT4FlHvQ8xungz2SEyKw1Rec a83A== X-Gm-Message-State: AOJu0YwPb/P2VoISwIwScG/6z5a7W/alsj0y+VSO+hzrnG7mxTppp1iw q+kS3XowQN8+tekCrGtIZ54g/nQ/1T26TAqjo9Dosdg+0e8eFT78ew4ZtEU4Zg== X-Gm-Gg: ATEYQzzu5ZeZ40JvzNrsikP7y6mo1H6ENdZKBo7W31+7ayG0m/uq2DIAAQK77OvYnjU NuUdKhPvSDRXbNj2G+k7l6uI/Z6bPomeZZELAwm+s54Tfd8P2Y3qy1YnHHj4gyO+b8q7Dqr885a 381sFrwDPQwjtiPvAqcSOlxUO78PlqC9H1qUMKZJJIO6rcYXEmrFLrCO8T8kgclfJHfNZCCh8kT kQaM4rX63rg/Bk8M4GguB2/px9TkImn3KFLBAfJfQNMHqOrK4RbN26l8xqZRuP+iQ6pQVj6W9I8 TH5g2c/DmWZdtpXBqlvRj5dElRf9jmfGsigHflQ0mCjGwRLFZNU37YftHSni2iXTlerVa6BmNT6 ExAZsUkloj5viLwpt0JHTbKWIyKHjc6C9px3rdAs6Zb1P9NgFdua0TS+7IF/mgaFcOVVkYTGZAB iUA1h79+oq3WPPfel8VhMI1XaSTBsupzmuYkFJZUb1Kxg= X-Received: by 2002:a05:6a00:2eaa:b0:823:1077:2e88 with SMTP id d2e1a72fcca58-82a6aee61f9mr1699957b3a.6.1773824984517; Wed, 18 Mar 2026 02:09:44 -0700 (PDT) Received: from LL-3324L.kpit.com ([122.167.115.31]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82a6befc046sm2590361b3a.59.2026.03.18.02.09.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 02:09:44 -0700 (PDT) From: Nitin Wankhade X-Google-Original-From: Nitin Wankhade To: openembedded-devel@lists.openembedded.org Cc: nitin.wankhade@kpit.com, Nitin Wankhade Subject: [meta-oe][kirkstone][PATCH 6/6] imagemagick: Fix CVE-2026-23876 Date: Wed, 18 Mar 2026 14:43:38 +0530 Message-Id: <20260318091338.483937-6-nitin.wankhade@partner.bmw.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260318091338.483937-1-nitin.wankhade@partner.bmw.de> References: <20260318091338.483937-1-nitin.wankhade@partner.bmw.de> MIME-Version: 1.0 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 ; Wed, 18 Mar 2026 09:09:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/125359 Reference: https://github.com/ImageMagick/ImageMagick/commit/2fae24192b78fdfdd27d766fd21d90aeac6ea8b8 Signed-off-by: Nitin Wankhade --- .../imagemagick/files/CVE-2026-23876.patch | 63 +++++++++++++++++++ .../imagemagick/imagemagick_7.0.10.bb | 1 + 2 files changed, 64 insertions(+) create mode 100644 meta-oe/recipes-support/imagemagick/files/CVE-2026-23876.patch diff --git a/meta-oe/recipes-support/imagemagick/files/CVE-2026-23876.patch b/meta-oe/recipes-support/imagemagick/files/CVE-2026-23876.patch new file mode 100644 index 0000000000..40d82c9481 --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/files/CVE-2026-23876.patch @@ -0,0 +1,63 @@ +From 2fae24192b78fdfdd27d766fd21d90aeac6ea8b8 Mon Sep 17 00:00:00 2001 +From: Dirk Lemstra +Date: Sun, 18 Jan 2026 17:54:12 +0100 + +Subject: [PATCH] imagemagick: Fix CVE-2026-23876 +CVE: CVE-2026-23876 +Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/2fae24192b78fdfdd27d766fd21d90aeac6ea8b8] +Signed-off-by: Nitin Wankhade +=== +diff --git a/coders/xbm.c b/coders/xbm.c +index b036d5e..2d6bc9c 100644 +--- a/coders/xbm.c ++++ b/coders/xbm.c +@@ -200,6 +200,10 @@ static Image *ReadXBMImage(const ImageInfo *image_info,ExceptionInfo *exception) + short int + hex_digits[256]; + ++ size_t ++ bytes_per_line, ++ length; ++ + ssize_t + y; + +@@ -209,8 +213,6 @@ static Image *ReadXBMImage(const ImageInfo *image_info,ExceptionInfo *exception) + unsigned int + bit, + byte, +- bytes_per_line, +- length, + padding, + version; + +@@ -340,15 +342,15 @@ static Image *ReadXBMImage(const ImageInfo *image_info,ExceptionInfo *exception) + if (((image->columns % 16) != 0) && ((image->columns % 16) < 9) && + (version == 10)) + padding=1; +- bytes_per_line=(unsigned int) (image->columns+7)/8+padding; +- length=(unsigned int) image->rows; +- data=(unsigned char *) AcquireQuantumMemory(length,bytes_per_line* +- sizeof(*data)); ++ bytes_per_line=(image->columns+7)/8+padding; ++ if (HeapOverflowSanityCheckGetSize(bytes_per_line,image->rows,&length) != MagickFalse) ++ ThrowReaderException(CorruptImageError,"ImproperImageHeader"); ++ data=(unsigned char *) AcquireQuantumMemory(length,sizeof(*data)); + if (data == (unsigned char *) NULL) + ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); + p=data; + if (version == 10) +- for (i=0; i < (ssize_t) (bytes_per_line*image->rows); (i+=2)) ++ for (i=0; i < (ssize_t) length; i+=2) + { + c=XBMInteger(image,hex_digits); + if (c < 0) +@@ -361,7 +363,7 @@ static Image *ReadXBMImage(const ImageInfo *image_info,ExceptionInfo *exception) + *p++=(unsigned char) (c >> 8); + } + else +- for (i=0; i < (ssize_t) (bytes_per_line*image->rows); i++) ++ for (i=0; i < (ssize_t) length; i++) + { + c=XBMInteger(image,hex_digits); + if (c < 0) 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 a2e08afc1a..9bc857b715 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -53,6 +53,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt file://CVE-2025-68618.patch \ file://CVE-2026-22770.patch \ file://CVE-2026-23874.patch \ + file://CVE-2026-23876.patch \ " SRCREV = "35b4991eb0939a327f3489988c366e21068b0178"