From patchwork Tue Nov 8 16:21:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: adhityax.siddartha.ravula@intel.com X-Patchwork-Id: 15188 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 2A92AC4332F for ; Tue, 8 Nov 2022 16:22:21 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web12.9940.1667924536400301180 for ; Tue, 08 Nov 2022 08:22:16 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=ez9taZFO; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: adhityax.siddartha.ravula@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667924536; x=1699460536; h=from:to:subject:date:message-id; bh=YadYo7tnLT+jBDidrSbjh7V97PN50TQbhvcOWb9/W6Y=; b=ez9taZFO3imN7XrauQHgPfMYPKLPJWbdvn2g5lQ1aSFMSvh5zmqPMJRR MMgRa5JZPBfDXuUorbE3WIdxnQqr9wUzZJ0U4Y8YErawWoSwa4R3Tfy/i T37pFwaORUYhccsAvdvAGOvicB2mOYTA85Vcy+46CYw5MhCUMTQflvFX9 o0UszUesHuuu86c0A0irH+CT5R8Te+GK50XcH59zPpQg/AZTxnwjElqJz vXnsaQbmL4Sm/WziyA3gm5PbbjKyMecYMC8c86lEC+W0wrc+Isu2KL85E uaTMxdSI4mf9oAm3095/llZuENjh0pde1B6Z4aoMjc1CVRWGrZvlt2Lgp w==; X-IronPort-AV: E=McAfee;i="6500,9779,10525"; a="311894194" X-IronPort-AV: E=Sophos;i="5.96,148,1665471600"; d="scan'208";a="311894194" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2022 08:21:59 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10525"; a="630923943" X-IronPort-AV: E=Sophos;i="5.96,148,1665471600"; d="scan'208";a="630923943" Received: from inlubt0314.iind.intel.com ([10.67.198.223]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2022 08:21:58 -0800 From: adhityax.siddartha.ravula@intel.com To: openembedded-core@lists.openembedded.org Subject: [PATCH] pixman: backport fix for CVE-2022-44638 Date: Tue, 8 Nov 2022 21:51:48 +0530 Message-Id: <20221108162148.29550-1-adhityax.siddartha.ravula@intel.com> X-Mailer: git-send-email 2.17.1 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 08 Nov 2022 16:22:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172974 From: Adhitya Siddartha Reference to upstream patch: https://gitlab.freedesktop.org/pixman/pixman/-/commit/a1f88e842e0216a5b4df1ab023caebe33c101395 Signed-off-by: Adhitya Siddartha --- .../xorg-lib/pixman/CVE-2022-44638.patch | 37 +++++++++++++++++++ .../xorg-lib/pixman_0.40.0.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta/recipes-graphics/xorg-lib/pixman/CVE-2022-44638.patch diff --git a/meta/recipes-graphics/xorg-lib/pixman/CVE-2022-44638.patch b/meta/recipes-graphics/xorg-lib/pixman/CVE-2022-44638.patch new file mode 100644 index 0000000000..ab5acaf2ee --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/pixman/CVE-2022-44638.patch @@ -0,0 +1,37 @@ +From a1f88e842e0216a5b4df1ab023caebe33c101395 Mon Sep 17 00:00:00 2001 +From: Matt Turner +Date: Wed, 2 Nov 2022 12:07:32 -0400 +Subject: [PATCH] Avoid integer overflow leading to out-of-bounds write + +Upstream-Status: Backport +CVE: CVE-2022-44638 + +Reference to upstream patch: +https://gitlab.freedesktop.org/pixman/pixman/-/commit/a1f88e842e0216a5b4df1ab023caebe33c101395 + +Signed-off-by: Ravula AdhityaX Siddartha + +Thanks to Maddie Stone and Google's Project Zero for discovering this +issue, providing a proof-of-concept, and a great analysis. + +Closes: https://gitlab.freedesktop.org/pixman/pixman/-/issues/63 +--- + pixman/pixman-trap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pixman/pixman-trap.c b/pixman/pixman-trap.c +index 91766fd..7560405 100644 +--- a/pixman/pixman-trap.c ++++ b/pixman/pixman-trap.c +@@ -74,7 +74,7 @@ pixman_sample_floor_y (pixman_fixed_t y, + + if (f < Y_FRAC_FIRST (n)) + { +- if (pixman_fixed_to_int (i) == 0x8000) ++ if (pixman_fixed_to_int (i) == 0xffff8000) + { + f = 0; /* saturate */ + } +-- +GitLab + diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb b/meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb index ccfe277746..c56733eefd 100644 --- a/meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb +++ b/meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb @@ -9,6 +9,7 @@ DEPENDS = "zlib" SRC_URI = "https://www.cairographics.org/releases/${BP}.tar.gz \ file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ + file://CVE-2022-44638.patch \ " SRC_URI[md5sum] = "73858c0862dd9896fb5f62ae267084a4" SRC_URI[sha256sum] = "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc"