From patchwork Sat Apr 24 19:14:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 28853 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8B35A27BC7E; Sat, 24 Apr 2021 20:16:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F190627BC7D for ; Sat, 24 Apr 2021 20:16:12 +0100 (BST) Received: from localhost ([::1]:52330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1laNlE-0005h0-4y for patchwork@mira.cbaines.net; Sat, 24 Apr 2021 15:16:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1laNl5-0005gi-8q for guix-patches@gnu.org; Sat, 24 Apr 2021 15:16:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58217) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1laNl4-00035q-Qb for guix-patches@gnu.org; Sat, 24 Apr 2021 15:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1laNl4-0005KR-El for guix-patches@gnu.org; Sat, 24 Apr 2021 15:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48000] [PATCH 2/5] gnu: gst-libav: Fix a stack corruption bug. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Apr 2021 19:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48000 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 48000@debbugs.gnu.org Received: via spool by 48000-submit@debbugs.gnu.org id=B48000.161929170920403 (code B ref 48000); Sat, 24 Apr 2021 19:16:02 +0000 Received: (at 48000) by debbugs.gnu.org; 24 Apr 2021 19:15:09 +0000 Received: from localhost ([127.0.0.1]:41522 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1laNjy-0005Hj-8s for submit@debbugs.gnu.org; Sat, 24 Apr 2021 15:15:09 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:58083) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1laNjr-0005Gp-PD for 48000@debbugs.gnu.org; Sat, 24 Apr 2021 15:14:49 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id B77AE5C00A8; Sat, 24 Apr 2021 15:14:42 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sat, 24 Apr 2021 15:14:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=OQKRZ4HYtw Vpp13al02jgbnLjkB8k2wsPNytcSJxSgc=; b=oe6DeXbdd3/KXNNbAdnUyA+ipW s9lp8hfdp/buLuLr8iiO0nvBKspp/9U2j4saok4fHDcBOt0spJka62O+Rq/zQzhp 5B7cOndjOP2fADX5X8hMk7oqffQllSbHCRoeU00HTDslsR86LIp0yx/2Nb6CtcdF W6V/d8rWjaZKtNBm4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=OQKRZ4HYtwVpp13al02jgbnLjkB8k2wsPNytcSJxSgc=; b=UYaGRej1 GnmOT6FCfa5ZO6weQtBpQXz2pV4tv3X+6kkbRyJriqHUEbAqenjy/I6T4Skl0+4Z aS3h0F9o9g+LZZYjLSwHPyy1BVcxWPWya/DS7Lr9EQW+WPB4pirFzJi8Fn6U2/7Y F/fR6Tq3aPNF5tNKRLHIYuy6U/YA7B7aud4w3h+OnvlQZqNdQz9mhum1VoZvum+b WfoD6eoX1fFk1L7lzSrxfP/ncXgPr1S6ap9XpcFQ9qN8pzL1psD8HpaLl6D4b8jh pDasOkXqgwjc9WKH7fOIuGxrngNiZQcRAYt9ZcUFQ9zNNXAswDwsg0fyJrfmA7wA kadz0WoFzlIgYg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvddugedgudefhecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhl rghrihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeeifeejvefhvdelveehvefggefgje dtueevteelvedtgfethfejieeuteegfeejffenucffohhmrghinhepfhhrvggvuggvshhk thhophdrohhrghenucfkphepuddttddruddurdduieelrdduudeknecuvehluhhsthgvrh fuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhi rdhnrghmvg X-ME-Proxy: Received: from jasmine.lan (pool-100-11-169-118.phlapa.fios.verizon.net [100.11.169.118]) by mail.messagingengine.com (Postfix) with ESMTPA id 61862108005F for <48000@debbugs.gnu.org>; Sat, 24 Apr 2021 15:14:42 -0400 (EDT) From: Leo Famulari Date: Sat, 24 Apr 2021 15:14:32 -0400 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: <06babf269cf58ba83c67efd7fd905f9d5a6bb5b5.1619291675.git.leo@famulari.name> References: <06babf269cf58ba83c67efd7fd905f9d5a6bb5b5.1619291675.git.leo@famulari.name> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/gst-libav-64channels-stack-corruption.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gstreamer.scm (gst-libav)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/gstreamer.scm | 1 + ...st-libav-64channels-stack-corruption.patch | 31 +++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 gnu/packages/patches/gst-libav-64channels-stack-corruption.patch diff --git a/gnu/local.mk b/gnu/local.mk index e19daf76ca..b3e84be598 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1169,6 +1169,7 @@ dist_patch_DATA = \ %D%/packages/patches/grub-setup-root.patch \ %D%/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch \ %D%/packages/patches/gspell-dash-test.patch \ + %D%/packages/patches/gst-libav-64channels-stack-corruption.patch \ %D%/packages/patches/gst-plugins-good-fix-test.patch \ %D%/packages/patches/gst-plugins-good-CVE-2021-3497.patch \ %D%/packages/patches/gst-plugins-good-CVE-2021-3498.patch \ diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 6a050ca297..81ac0a2f5f 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -851,6 +851,7 @@ think twice about shipping them.") (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) + (patches (search-patches "gst-libav-64channels-stack-corruption.patch")) (sha256 (base32 "0jbzams9ggk3sq9ywv4gsl9rghyn203l2582m6l5c1sz9ka9m5in")))) (build-system meson-build-system) diff --git a/gnu/packages/patches/gst-libav-64channels-stack-corruption.patch b/gnu/packages/patches/gst-libav-64channels-stack-corruption.patch new file mode 100644 index 0000000000..cc174e618d --- /dev/null +++ b/gnu/packages/patches/gst-libav-64channels-stack-corruption.patch @@ -0,0 +1,31 @@ +Fix a stack corruption when handling files with more than 64 audio +channels: + +https://gstreamer.freedesktop.org/security/sa-2021-0005.html + +Patch copied from upstream source repository: + +https://gitlab.freedesktop.org/gstreamer/gst-libav/-/commit/dcea8baa14a5fc3b796d876baaf2f238546ba2b1 + +diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c +index b5be4bb7a5f2712f78383da9319754a8849e3307..be22f22cf5c7c7b22b13e44b10999adaacbcca2b 100644 +--- a/ext/libav/gstavcodecmap.c ++++ b/ext/libav/gstavcodecmap.c +@@ -102,7 +102,7 @@ gst_ffmpeg_channel_layout_to_gst (guint64 channel_layout, gint channels, + guint nchannels = 0; + gboolean none_layout = FALSE; + +- if (channel_layout == 0) { ++ if (channel_layout == 0 || channels > 64) { + nchannels = channels; + none_layout = TRUE; + } else { +@@ -163,7 +163,7 @@ gst_ffmpeg_channel_layout_to_gst (guint64 channel_layout, gint channels, + } else { + guint i; + +- for (i = 0; i < nchannels; i++) ++ for (i = 0; i < nchannels && i < 64; i++) + pos[i] = GST_AUDIO_CHANNEL_POSITION_NONE; + } + }