From patchwork Mon Jan 24 06:54:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Minjae Kim X-Patchwork-Id: 2836 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 56E10C433EF for ; Mon, 24 Jan 2022 06:54:16 +0000 (UTC) Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by mx.groups.io with SMTP id smtpd.web10.563.1643007255097433228 for ; Sun, 23 Jan 2022 22:54:15 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Tn8slRvT; spf=pass (domain: gmail.com, ip: 209.85.218.44, mailfrom: flowergom@gmail.com) Received: by mail-ej1-f44.google.com with SMTP id ka4so18589085ejc.11 for ; Sun, 23 Jan 2022 22:54:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=eINpaMtuA7llZqNyA3zenzoTbsXRDzlYArwj2J5qX1k=; b=Tn8slRvTA08aaXKcosq1nhbciwxkc0JX3QwdnF7s80VLol3vg3vjdConsSDuNKpm0Y O6FGZu+mSof6jhXafBKbPthyeB8oYqSVsJzrdEz2GukCLjoG7jF7A+H6pcV6D0i0Mnnz 0uvcd5vmJT/H+vLsbKsuhe69MNuXC8iOjX+ebiRUkzSMEDjRssxqgvHDXWYDMiq4GpcW Ffkzb8cOEE89or0H4DBsDlYSXGjQ2aCJ/z3TFu3E1phulKfidjysGFfZqlqogFse0Ziw c+XQPrfb2qR4kSLz64ex4EJRbd5mQWMkRDMyjAYcspNNnBQ3kNQauKdH4GCXLsZ/H3a1 625Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=eINpaMtuA7llZqNyA3zenzoTbsXRDzlYArwj2J5qX1k=; b=lrakbNRw/LEB/IPo5GXkrN1jC56kD83JNNu6Qp3nzL0YJixDkzFOpjjuQlNiOvZQ2Z my0jleKKuXUBrsIBm8blVLyb3TtXZYgmGVCOs8AGxxR0Gxxq6DFfRaGr4zz68NnfwviM 3AumDa5JwhKXF2mUwMOZ86wY/DckCsNpzBrKysrqgbH7nRpsP79qvmhn3dcWzbhWkV2T Q04JcbkNHIhSSo0prAFxdxBlPGFoIzrPdd9U87tMOBRF1GY5WXWAPKlyxrVtVLR5c/3d 6SFpFMRxyTKhP/kzTU5xcY88kDuIGUQRRFPhdTaDDpK6Yjlc7qJYK/sa3si8i3eOhmJV 8APg== X-Gm-Message-State: AOAM532fxuRYk3EdM3xsO9lf53o7f0MuJh87Gp3+VawUu5Wxh0ZeNQEd efUCW6SWFXb6fw/CoCQpUiEACL/bCUplBLy3DYw= X-Google-Smtp-Source: ABdhPJzKzioKn3VLuqK5VvpN2mE/wA8bcNM7FAMr7Z63s8uN5LzYSEKr8ARNl1CyiEarzJtm15epxQ== X-Received: by 2002:a17:907:162a:: with SMTP id hb42mr11883407ejc.292.1643007253155; Sun, 23 Jan 2022 22:54:13 -0800 (PST) Received: from localhost.localdomain (p54b54585.dip0.t-ipconnect.de. [84.181.69.133]) by smtp.gmail.com with ESMTPSA id v23sm4515141ejy.178.2022.01.23.22.54.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jan 2022 22:54:12 -0800 (PST) From: Minjae Kim To: openembedded-core@lists.openembedded.org Cc: Minjae Kim Subject: [dunfell][PATCH v2] ghostscript: fix CVE-2021-45949 Date: Mon, 24 Jan 2022 06:54:04 +0000 Message-Id: <20220124065404.4062-1-flowergom@gmail.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 ; Mon, 24 Jan 2022 06:54:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160870 Ghostscript GhostPDL 9.50 through 9.54.0 has a heap-based buffer overflow in sampled_data_finish (called from sampled_data_continue and interp). To apply the CVE-2021-45949 patch, check-stack-limits-after-function-evalution.patch should be applied first. References: https://nvd.nist.gov/vuln/detail/CVE-2021-45949 Signed-off-by: Minjae Kim --- .../ghostscript/CVE-2021-45949.patch | 68 +++++++++++++++++++ ...tack-limits-after-function-evalution.patch | 51 ++++++++++++++ .../ghostscript/ghostscript_9.52.bb | 2 + 3 files changed, 121 insertions(+) create mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2021-45949.patch create mode 100644 meta/recipes-extended/ghostscript/ghostscript/check-stack-limits-after-function-evalution.patch diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2021-45949.patch b/meta/recipes-extended/ghostscript/ghostscript/CVE-2021-45949.patch new file mode 100644 index 0000000000..605155342e --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript/CVE-2021-45949.patch @@ -0,0 +1,68 @@ +From 2a3129365d3bc0d4a41f107ef175920d1505d1f7 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Tue, 1 Jun 2021 19:57:16 +0100 +Subject: [PATCH] Bug 703902: Fix op stack management in + sampled_data_continue() + +Replace pop() (which does no checking, and doesn't handle stack extension +blocks) with ref_stack_pop() which does do all that. + +We still use pop() in one case (it's faster), but we have to later use +ref_stack_pop() before calling sampled_data_sample() which also accesses the +op stack. + +Fixes: +https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34675 + +Upstream-Status: Backported [https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=2a3129365d3bc0d4a41f107ef175920d1505d1f7] +CVE: CVE-2021-45949 +Signed-off-by: Minjae Kim +--- + psi/zfsample.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/psi/zfsample.c b/psi/zfsample.c +index 0e8e4bc8d..00cd0cfdd 100644 +--- a/psi/zfsample.c ++++ b/psi/zfsample.c +@@ -533,15 +533,19 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + for (j = 0; j < bps; j++) + data_ptr[bps * i + j] = (byte)(cv >> ((bps - 1 - j) * 8)); /* MSB first */ + } +- pop(num_out); /* Move op to base of result values */ + +- /* Check if we are done collecting data. */ ++ pop(num_out); /* Move op to base of result values */ + ++ /* From here on, we have to use ref_stack_pop() rather than pop() ++ so that it handles stack extension blocks properly, before calling ++ sampled_data_sample() which also uses the op stack. ++ */ ++ /* Check if we are done collecting data. */ + if (increment_cube_indexes(params, penum->indexes)) { + if (stack_depth_adjust == 0) +- pop(O_STACK_PAD); /* Remove spare stack space */ ++ ref_stack_pop(&o_stack, O_STACK_PAD); /* Remove spare stack space */ + else +- pop(stack_depth_adjust - num_out); ++ ref_stack_pop(&o_stack, stack_depth_adjust - num_out); + /* Execute the closing procedure, if given */ + code = 0; + if (esp_finish_proc != 0) +@@ -554,11 +558,11 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + if ((O_STACK_PAD - stack_depth_adjust) < 0) { + stack_depth_adjust = -(O_STACK_PAD - stack_depth_adjust); + check_op(stack_depth_adjust); +- pop(stack_depth_adjust); ++ ref_stack_pop(&o_stack, stack_depth_adjust); + } + else { + check_ostack(O_STACK_PAD - stack_depth_adjust); +- push(O_STACK_PAD - stack_depth_adjust); ++ ref_stack_push(&o_stack, O_STACK_PAD - stack_depth_adjust); + for (i=0;i +Date: Fri, 12 Feb 2021 10:34:23 +0000 +Subject: [PATCH] oss-fuzz 30715: Check stack limits after function evaluation. + +During function result sampling, after the callout to the Postscript +interpreter, make sure there is enough stack space available before pushing +or popping entries. + +In thise case, the Postscript procedure for the "function" is totally invalid +(as a function), and leaves the op stack in an unrecoverable state (as far as +function evaluation is concerned). We end up popping more entries off the +stack than are available. + +To cope, add in stack limit checking to throw an appropriate error when this +happens. + +Upstream-Status: Backported [https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=7861fcad13c497728189feafb41cd57b5b50ea25] +Signed-off-by: Minjae Kim +--- + psi/zfsample.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/psi/zfsample.c b/psi/zfsample.c +index 290809405..652ae02c6 100644 +--- a/psi/zfsample.c ++++ b/psi/zfsample.c +@@ -551,9 +551,17 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + } else { + if (stack_depth_adjust) { + stack_depth_adjust -= num_out; +- push(O_STACK_PAD - stack_depth_adjust); +- for (i=0;i