02/06: gnu: gst-libav: Fix a stack corruption bug.

[guix-commits]

lfam pushed a commit to branch master
in repository guix.

commit 46a65b5a3d6b89313072567694b769b130758516
Author: Leo Famulari <leo@famulari.name>
AuthorDate: Sat Apr 24 14:24:19 2021 -0400

    gnu: gst-libav: Fix a stack corruption bug.
    
    * 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 +
 .../gst-libav-64channels-stack-corruption.patch    | 31 ++++++++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index ed3f0d4..5e02e0c 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 6a050ca..81ac0a2 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 0000000..cc174e6
--- /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;
+     }
+   }