Import from AlmaLinux stable repository

.gstreamer1-plugins-bad-free.metadata

@@ -1 +0,0 @@
-318b749af5a289650e380cbabc0293e422b9a3ba SOURCES/gst-plugins-bad-free-1.16.1.tar.xz

SOURCES/0001-mxfdemux-Store-GstMXFDemuxEssenceTrack-in-their-own-.patch

@@ -1,8 +1,8 @@
-From db2e5ccfcf4db7fc3d199d885b07e5eb34770c19 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Fri, 20 Oct 2023 00:09:57 +0300
-Subject: [PATCH 1/2] mxfdemux: Store GstMXFDemuxEssenceTrack in their own
- fixed allocation
+From 24e891568537f4447d1c212dcb355a766296bdbb Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Tue, 12 Dec 2023 18:00:58 +0100
+Subject: [PATCH] mxfdemux: Store GstMXFDemuxEssenceTrack in their own fixed
+ allocation
 
 Previously they were stored inline inside a GArray, but as references to
 the tracks were stored in various other places although the array could
@@ -18,15 +18,15 @@ Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3055
 
 Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5638>
 ---
- .../gst-plugins-bad/gst/mxf/mxfdemux.c        | 116 ++++++++----------
- .../gst-plugins-bad/gst/mxf/mxfdemux.h        |   2 +-
- 2 files changed, 50 insertions(+), 68 deletions(-)
+ gst/mxf/mxfdemux.c | 114 +++++++++++++++++++++------------------------
+ gst/mxf/mxfdemux.h |   2 +-
+ 2 files changed, 53 insertions(+), 63 deletions(-)
 
-diff --git a/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.c b/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.c
-index d9eb9a5844..1b58989631 100644
---- a/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.c
-+++ b/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.c
-@@ -170,10 +170,25 @@ gst_mxf_demux_partition_free (GstMXFDemuxPartition * partition)
+diff --git a/gst/mxf/mxfdemux.c b/gst/mxf/mxfdemux.c
+index f6e5ac048..b97dce1ad 100644
+--- a/gst/mxf/mxfdemux.c
++++ b/gst/mxf/mxfdemux.c
+@@ -154,10 +154,25 @@ gst_mxf_demux_partition_free (GstMXFDemuxPartition * partition)
  }
  
  static void
@@ -54,11 +54,10 @@ index d9eb9a5844..1b58989631 100644
    GST_DEBUG_OBJECT (demux, "Resetting MXF state");
  
    g_list_foreach (demux->partitions, (GFunc) gst_mxf_demux_partition_free,
-@@ -182,23 +197,7 @@ gst_mxf_demux_reset_mxf_state (GstMXFDemux * demux)
-   demux->partitions = NULL;
+@@ -167,22 +182,7 @@ gst_mxf_demux_reset_mxf_state (GstMXFDemux * demux)
  
    demux->current_partition = NULL;
--
+ 
 -  for (i = 0; i < demux->essence_tracks->len; i++) {
 -    GstMXFDemuxEssenceTrack *t =
 -        &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
@@ -79,7 +78,7 @@ index d9eb9a5844..1b58989631 100644
  }
  
  static void
-@@ -216,7 +215,7 @@ gst_mxf_demux_reset_linked_metadata (GstMXFDemux * demux)
+@@ -200,7 +200,7 @@ gst_mxf_demux_reset_linked_metadata (GstMXFDemux * demux)
  
    for (i = 0; i < demux->essence_tracks->len; i++) {
      GstMXFDemuxEssenceTrack *track =
@@ -87,17 +86,8 @@ index d9eb9a5844..1b58989631 100644
 +        g_ptr_array_index (demux->essence_tracks, i);
  
      track->source_package = NULL;
-     track->delta_id = -1;
-@@ -419,7 +418,7 @@ gst_mxf_demux_partition_postcheck (GstMXFDemux * demux,
- 
-   for (i = 0; i < demux->essence_tracks->len; i++) {
-     GstMXFDemuxEssenceTrack *cand =
--        &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
-+        g_ptr_array_index (demux->essence_tracks, i);
- 
-     if (cand->body_sid != partition->partition.body_sid)
-       continue;
-@@ -866,8 +865,7 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
+     track->source_track = NULL;
+@@ -713,8 +713,7 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
  
        for (k = 0; k < demux->essence_tracks->len; k++) {
          GstMXFDemuxEssenceTrack *tmp =
@@ -107,7 +97,7 @@ index d9eb9a5844..1b58989631 100644
  
          if (tmp->track_number == track->parent.track_number &&
              tmp->body_sid == edata->body_sid) {
-@@ -885,24 +883,23 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
+@@ -732,24 +731,23 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
        }
  
        if (!etrack) {
@@ -142,7 +132,7 @@ index d9eb9a5844..1b58989631 100644
              demux->essence_tracks->len - 1);
          new = TRUE;
        }
-@@ -1050,13 +1047,7 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
+@@ -876,13 +874,7 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
  
      next:
        if (new) {
@@ -157,7 +147,7 @@ index d9eb9a5844..1b58989631 100644
              demux->essence_tracks->len - 1);
        }
      }
-@@ -1069,7 +1060,7 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
+@@ -895,7 +887,7 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
  
    for (i = 0; i < demux->essence_tracks->len; i++) {
      GstMXFDemuxEssenceTrack *etrack =
@@ -166,7 +156,7 @@ index d9eb9a5844..1b58989631 100644
  
      if (!etrack->source_package || !etrack->source_track || !etrack->caps) {
        GST_ERROR_OBJECT (demux, "Failed to update essence track %u", i);
-@@ -1438,7 +1429,7 @@ gst_mxf_demux_update_tracks (GstMXFDemux * demux)
+@@ -1117,7 +1109,7 @@ gst_mxf_demux_update_tracks (GstMXFDemux * demux)
  
      for (k = 0; k < demux->essence_tracks->len; k++) {
        GstMXFDemuxEssenceTrack *tmp =
@@ -175,7 +165,7 @@ index d9eb9a5844..1b58989631 100644
  
        if (tmp->source_package == source_package &&
            tmp->source_track == source_track) {
-@@ -1927,8 +1918,7 @@ gst_mxf_demux_pad_set_component (GstMXFDemux * demux, GstMXFDemuxPad * pad,
+@@ -1598,8 +1590,7 @@ gst_mxf_demux_pad_set_component (GstMXFDemux * demux, GstMXFDemuxPad * pad,
    pad->current_essence_track = NULL;
  
    for (k = 0; k < demux->essence_tracks->len; k++) {
@@ -185,78 +175,84 @@ index d9eb9a5844..1b58989631 100644
  
      if (tmp->source_package == source_package &&
          tmp->source_track == source_track) {
-@@ -2712,7 +2702,7 @@ gst_mxf_demux_handle_generic_container_essence_element (GstMXFDemux * demux,
-   if (!etrack) {
+@@ -1731,7 +1722,7 @@ gst_mxf_demux_handle_generic_container_essence_element (GstMXFDemux * demux,
+ 
+   for (i = 0; i < demux->essence_tracks->len; i++) {
+     GstMXFDemuxEssenceTrack *tmp =
+-        &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
++          g_ptr_array_index (demux->essence_tracks, i);
+ 
+     if (tmp->body_sid == demux->current_partition->partition.body_sid &&
+         (tmp->track_number == track_number || tmp->track_number == 0)) {
+@@ -2656,7 +2647,7 @@ gst_mxf_demux_handle_klv_packet (GstMXFDemux * demux, const MXFUL * key,
+ 
+       for (i = 0; i < demux->essence_tracks->len; i++) {
+         GstMXFDemuxEssenceTrack *etrack =
+-            &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
++                g_ptr_array_index (demux->essence_tracks, i);
+ 
+         if (etrack->body_sid != demux->current_partition->partition.body_sid)
+           continue;
+@@ -2719,7 +2710,7 @@ gst_mxf_demux_handle_klv_packet (GstMXFDemux * demux, const MXFUL * key,
+       guint i;
+       for (i = 0; i < demux->essence_tracks->len; i++) {
+         GstMXFDemuxEssenceTrack *etrack =
+-            &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
++            g_ptr_array_index (demux->essence_tracks, i);
+ 
+         if (etrack->body_sid != demux->current_partition->partition.body_sid)
+           continue;
+@@ -2914,7 +2905,7 @@ from_index:
+ 
      for (i = 0; i < demux->essence_tracks->len; i++) {
-       GstMXFDemuxEssenceTrack *tmp =
+       GstMXFDemuxEssenceTrack *t =
 -          &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
 +          g_ptr_array_index (demux->essence_tracks, i);
  
-       if (tmp->body_sid == demux->current_partition->partition.body_sid &&
-           (tmp->track_number == track_number || tmp->track_number == 0)) {
-@@ -3916,8 +3906,7 @@ from_track_offset:
-   gst_mxf_demux_set_partition_for_offset (demux, demux->offset);
+       if (index_start_position != -1 && t == etrack)
+         t->position = index_start_position;
+@@ -2937,8 +2928,7 @@ from_index:
+       if (ret == GST_FLOW_EOS) {
+         for (i = 0; i < demux->essence_tracks->len; i++) {
+           GstMXFDemuxEssenceTrack *t =
+-              &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack,
+-              i);
++              g_ptr_array_index (demux->essence_tracks, i);
  
-   for (i = 0; i < demux->essence_tracks->len; i++) {
--    GstMXFDemuxEssenceTrack *t =
--        &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
-+    GstMXFDemuxEssenceTrack *t = g_ptr_array_index (demux->essence_tracks, i);
+           if (t->position > 0)
+             t->duration = t->position;
+@@ -3020,7 +3010,7 @@ gst_mxf_demux_pull_and_handle_klv_packet (GstMXFDemux * demux)
  
-     if (index_start_position != -1 && t == etrack)
-       t->position = index_start_position;
-@@ -3941,8 +3930,7 @@ from_track_offset:
-       /* Handle EOS */
-       for (i = 0; i < demux->essence_tracks->len; i++) {
-         GstMXFDemuxEssenceTrack *t =
--            &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack,
--            i);
-+            g_ptr_array_index (demux->essence_tracks, i);
+     for (i = 0; i < demux->essence_tracks->len; i++) {
+       GstMXFDemuxEssenceTrack *t =
+-          &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
++          g_ptr_array_index (demux->essence_tracks, i);
  
-         if (t->position > 0)
-           t->duration = t->position;
-@@ -4180,8 +4168,7 @@ gst_mxf_demux_pull_and_handle_klv_packet (GstMXFDemux * demux)
-           guint i;
-           for (i = 0; i < demux->essence_tracks->len; i++) {
-             GstMXFDemuxEssenceTrack *etrack =
--                &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack,
--                i);
-+                g_ptr_array_index (demux->essence_tracks, i);
- 
-             if (etrack->body_sid != partition->partition.body_sid)
-               continue;
-@@ -4652,9 +4639,8 @@ gst_mxf_demux_pad_to_track_and_position (GstMXFDemux * demux,
-   /* Get the corresponding essence track for the given source package and stream id */
-   for (i = 0; i < demux->essence_tracks->len; i++) {
-     GstMXFDemuxEssenceTrack *track =
--        &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
--    GST_LOG_OBJECT (pad,
--        "Looking at essence track body_sid:%d index_sid:%d",
-+        g_ptr_array_index (demux->essence_tracks, i);
-+    GST_LOG_OBJECT (pad, "Looking at essence track body_sid:%d index_sid:%d",
-         track->body_sid, track->index_sid);
-     if (clip->source_track_id == 0 || (track->track_id == clip->source_track_id
-             && mxf_umid_is_equal (&clip->source_package_id,
-@@ -4903,8 +4889,7 @@ gst_mxf_demux_seek_push (GstMXFDemux * demux, GstEvent * event)
+       if (t->position > 0)
+         t->duration = t->position;
+@@ -3627,8 +3617,8 @@ gst_mxf_demux_seek_push (GstMXFDemux * demux, GstEvent * event)
    }
  
    for (i = 0; i < demux->essence_tracks->len; i++) {
 -    GstMXFDemuxEssenceTrack *t =
 -        &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
 +    GstMXFDemuxEssenceTrack *t = g_ptr_array_index (demux->essence_tracks, i);
++
      t->position = -1;
    }
  
-@@ -5342,8 +5327,7 @@ gst_mxf_demux_seek_pull (GstMXFDemux * demux, GstEvent * event)
+@@ -4001,8 +3991,8 @@ gst_mxf_demux_seek_pull (GstMXFDemux * demux, GstEvent * event)
    }
  
    for (i = 0; i < demux->essence_tracks->len; i++) {
 -    GstMXFDemuxEssenceTrack *t =
 -        &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
 +    GstMXFDemuxEssenceTrack *t = g_ptr_array_index (demux->essence_tracks, i);
++
      t->position = -1;
    }
  
-@@ -5642,7 +5626,7 @@ gst_mxf_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
+@@ -4284,7 +4274,7 @@ gst_mxf_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
  
        for (i = 0; i < demux->essence_tracks->len; i++) {
          GstMXFDemuxEssenceTrack *t =
@@ -265,27 +261,29 @@ index d9eb9a5844..1b58989631 100644
  
          if (t->position > 0)
            t->duration = t->position;
-@@ -5683,8 +5667,7 @@ gst_mxf_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
+@@ -4325,8 +4315,8 @@ gst_mxf_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
  
            for (i = 0; i < demux->essence_tracks->len; i++) {
              GstMXFDemuxEssenceTrack *etrack =
 -                &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack,
 -                i);
 +                g_ptr_array_index (demux->essence_tracks, i);
++
              etrack->position = -1;
            }
            ret = TRUE;
-@@ -5708,8 +5691,7 @@ gst_mxf_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
+@@ -4350,8 +4340,8 @@ gst_mxf_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
  
        for (i = 0; i < demux->essence_tracks->len; i++) {
          GstMXFDemuxEssenceTrack *t =
 -            &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack,
 -            i);
 +            g_ptr_array_index (demux->essence_tracks, i);
++
          t->position = -1;
        }
        demux->current_partition = NULL;
-@@ -5982,7 +5964,7 @@ gst_mxf_demux_finalize (GObject * object)
+@@ -4624,7 +4614,7 @@ gst_mxf_demux_finalize (GObject * object)
  
    g_ptr_array_free (demux->src, TRUE);
    demux->src = NULL;
@@ -294,7 +292,7 @@ index d9eb9a5844..1b58989631 100644
    demux->essence_tracks = NULL;
  
    g_hash_table_destroy (demux->metadata);
-@@ -6059,8 +6041,8 @@ gst_mxf_demux_init (GstMXFDemux * demux)
+@@ -4701,8 +4691,8 @@ gst_mxf_demux_init (GstMXFDemux * demux)
    g_rw_lock_init (&demux->metadata_lock);
  
    demux->src = g_ptr_array_new ();
@@ -305,11 +303,11 @@ index d9eb9a5844..1b58989631 100644
  
    gst_segment_init (&demux->segment, GST_FORMAT_TIME);
  
-diff --git a/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.h b/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.h
-index d079a1de1a..1dc8a4edb5 100644
---- a/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.h
-+++ b/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.h
-@@ -266,7 +266,7 @@ struct _GstMXFDemux
+diff --git a/gst/mxf/mxfdemux.h b/gst/mxf/mxfdemux.h
+index aac3e67d0..a452980ee 100644
+--- a/gst/mxf/mxfdemux.h
++++ b/gst/mxf/mxfdemux.h
+@@ -182,7 +182,7 @@ struct _GstMXFDemux
    GList *partitions;
    GstMXFDemuxPartition *current_partition;
  

SOURCES/0003-mxfdemux-Fix-integer-overflow-causing-out-of-bounds-.patch

@@ -0,0 +1,114 @@
+From b6353c44ca9f005d3b57ee07fda0570d80eecc0f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
+Date: Thu, 10 Aug 2023 15:45:01 +0300
+Subject: [PATCH 3/5] mxfdemux: Fix integer overflow causing out of bounds
+ writes when handling invalid uncompressed video
+
+Check ahead of time when parsing the track information whether
+width, height and bpp are valid and usable without overflows.
+
+Fixes ZDI-CAN-21660, CVE-2023-40474
+
+Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2896
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5362>
+---
+ gst/mxf/mxfup.c | 51 +++++++++++++++++++++++++++++++++++++++++--------
+ 1 file changed, 43 insertions(+), 8 deletions(-)
+
+diff --git a/gst/mxf/mxfup.c b/gst/mxf/mxfup.c
+index d8b6664da..ba86255f2 100644
+--- a/gst/mxf/mxfup.c
++++ b/gst/mxf/mxfup.c
+@@ -134,6 +134,8 @@ mxf_up_handle_essence_element (const MXFUL * key, GstBuffer * buffer,
+     gpointer mapping_data, GstBuffer ** outbuf)
+ {
+   MXFUPMappingData *data = mapping_data;
++  gsize expected_in_stride = 0, out_stride = 0;
++  gsize expected_in_size = 0, out_size = 0;
+ 
+   /* SMPTE 384M 7.1 */
+   if (key->u[12] != 0x15 || (key->u[14] != 0x01 && key->u[14] != 0x02
+@@ -162,22 +164,25 @@ mxf_up_handle_essence_element (const MXFUL * key, GstBuffer * buffer,
+     }
+   }
+ 
+-  if (gst_buffer_get_size (buffer) != data->bpp * data->width * data->height) {
++  // Checked for overflows when parsing the descriptor
++  expected_in_stride = data->bpp * data->width;
++  out_stride = GST_ROUND_UP_4 (expected_in_stride);
++  expected_in_size = expected_in_stride * data->height;
++  out_size = out_stride * data->height;
++
++  if (gst_buffer_get_size (buffer) != expected_in_size) {
+     GST_ERROR ("Invalid buffer size");
+     gst_buffer_unref (buffer);
+     return GST_FLOW_ERROR;
+   }
+ 
+-  if (data->bpp != 4
+-      || GST_ROUND_UP_4 (data->width * data->bpp) != data->width * data->bpp) {
++  if (data->bpp != 4 || out_stride != expected_in_stride) {
+     guint y;
+     GstBuffer *ret;
+     GstMapInfo inmap, outmap;
+     guint8 *indata, *outdata;
+ 
+-    ret =
+-        gst_buffer_new_and_alloc (GST_ROUND_UP_4 (data->width * data->bpp) *
+-        data->height);
++    ret = gst_buffer_new_and_alloc (out_size);
+     gst_buffer_map (buffer, &inmap, GST_MAP_READ);
+     gst_buffer_map (ret, &outmap, GST_MAP_WRITE);
+     indata = inmap.data;
+@@ -185,8 +190,8 @@ mxf_up_handle_essence_element (const MXFUL * key, GstBuffer * buffer,
+ 
+     for (y = 0; y < data->height; y++) {
+       memcpy (outdata, indata, data->width * data->bpp);
+-      outdata += GST_ROUND_UP_4 (data->width * data->bpp);
+-      indata += data->width * data->bpp;
++      outdata += out_stride;
++      indata += expected_in_stride;
+     }
+ 
+     gst_buffer_unmap (buffer, &inmap);
+@@ -394,6 +399,36 @@ mxf_up_create_caps (MXFMetadataTimelineTrack * track, GstTagList ** tags,
+     return NULL;
+   }
+ 
++  if (caps) {
++    MXFUPMappingData *data = *mapping_data;
++    gsize expected_in_stride = 0, out_stride = 0;
++    gsize expected_in_size = 0, out_size = 0;
++
++    // Do some checking of the parameters to see if they're valid and
++    // we can actually work with them.
++    if (data->image_start_offset > data->image_end_offset) {
++      GST_WARNING ("Invalid image start/end offset");
++      g_free (data);
++      *mapping_data = NULL;
++      gst_clear_caps (&caps);
++
++      return NULL;
++    }
++
++    if (!g_size_checked_mul (&expected_in_stride, data->bpp, data->width) ||
++        (out_stride = GST_ROUND_UP_4 (expected_in_stride)) < expected_in_stride
++        || !g_size_checked_mul (&expected_in_size, expected_in_stride,
++            data->height)
++        || !g_size_checked_mul (&out_size, out_stride, data->height)) {
++      GST_ERROR ("Invalid resolution or bit depth");
++      g_free (data);
++      *mapping_data = NULL;
++      gst_clear_caps (&caps);
++
++      return NULL;
++    }
++  }
++
+   return caps;
+ }
+ 
+-- 
+2.43.0
+

SOURCES/0004-mxfdemux-Check-number-of-channels-for-AES3-audio.patch

@@ -0,0 +1,45 @@
+From 706abb367ab366be142fbea4e454fdaa7e7e2bcb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
+Date: Thu, 10 Aug 2023 15:47:03 +0300
+Subject: [PATCH 4/5] mxfdemux: Check number of channels for AES3 audio
+
+Only up to 8 channels are allowed and using a higher number would cause
+integer overflows when copying the data, and lead to out of bound
+writes.
+
+Also check that each buffer is at least 4 bytes long to avoid another
+overflow.
+
+Fixes ZDI-CAN-21661, CVE-2023-40475
+
+Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2897
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5362>
+---
+ gst/mxf/mxfd10.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gst/mxf/mxfd10.c b/gst/mxf/mxfd10.c
+index 21401cf52..99c197ab9 100644
+--- a/gst/mxf/mxfd10.c
++++ b/gst/mxf/mxfd10.c
+@@ -119,7 +119,7 @@ mxf_d10_sound_handle_essence_element (const MXFUL * key, GstBuffer * buffer,
+   gst_buffer_map (buffer, &map, GST_MAP_READ);
+ 
+   /* Now transform raw AES3 into raw audio, see SMPTE 331M */
+-  if ((map.size - 4) % 32 != 0) {
++  if (map.size < 4 || (map.size - 4) % 32 != 0) {
+     gst_buffer_unmap (buffer, &map);
+     GST_ERROR ("Invalid D10 sound essence buffer size");
+     return GST_FLOW_ERROR;
+@@ -219,6 +219,7 @@ mxf_d10_create_caps (MXFMetadataTimelineTrack * track, GstTagList ** tags,
+     GstAudioFormat audio_format;
+ 
+     if (s->channel_count == 0 ||
++        s->channel_count > 8 ||
+         s->quantization_bits == 0 ||
+         s->audio_sampling_rate.n == 0 || s->audio_sampling_rate.d == 0) {
+       GST_ERROR ("Invalid descriptor");
+-- 
+2.43.0
+

SOURCES/0005-h265parser-Fix-possible-overflow-using-max_sub_layer.patch

@@ -0,0 +1,42 @@
+From 33868442087aac6f26f18aeafd527c1a75946f34 Mon Sep 17 00:00:00 2001
+From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
+Date: Wed, 17 Jan 2024 12:50:34 +0100
+Subject: [PATCH 5/5] h265parser: Fix possible overflow using
+ max_sub_layers_minus1
+
+This fixes a possible overflow that can be triggered by an invalid value of
+max_sub_layers_minus1 being set in the bitstream. The bitstream uses 3 bits,
+but the allowed range is 0 to 6 only.
+
+Fixes ZDI-CAN-21768, CVE-2023-40476
+
+Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2895
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5364>
+---
+ gst-libs/gst/codecparsers/gsth265parser.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gst-libs/gst/codecparsers/gsth265parser.c b/gst-libs/gst/codecparsers/gsth265parser.c
+index 16fce006b..2e8ef182b 100644
+--- a/gst-libs/gst/codecparsers/gsth265parser.c
++++ b/gst-libs/gst/codecparsers/gsth265parser.c
+@@ -1490,6 +1490,7 @@ gst_h265_parse_vps (GstH265NalUnit * nalu, GstH265VPS * vps)
+ 
+   READ_UINT8 (&nr, vps->max_layers_minus1, 6);
+   READ_UINT8 (&nr, vps->max_sub_layers_minus1, 3);
++  CHECK_ALLOWED (vps->max_sub_layers_minus1, 0, 6);
+   READ_UINT8 (&nr, vps->temporal_id_nesting_flag, 1);
+ 
+   /* skip reserved_0xffff_16bits */
+@@ -1669,6 +1670,7 @@ gst_h265_parse_sps (GstH265Parser * parser, GstH265NalUnit * nalu,
+   sps->vps = vps;
+ 
+   READ_UINT8 (&nr, sps->max_sub_layers_minus1, 3);
++  CHECK_ALLOWED (sps->max_sub_layers_minus1, 0, 6);
+   READ_UINT8 (&nr, sps->temporal_id_nesting_flag, 1);
+ 
+   if (!gst_h265_parse_profile_tier_level (&sps->profile_tier_level, &nr,
+-- 
+2.43.0
+

SPECS/gstreamer1-plugins-bad-free.spec

@@ -14,7 +14,7 @@
 
 Name:           gstreamer1-plugins-bad-free
 Version:        1.16.1
-Release:        2%{?gitcommit:.git%{shortcommit}}%{?dist}.alma.1
+Release:        4%{?gitcommit:.git%{shortcommit}}%{?dist}
 Summary:        GStreamer streaming media framework "bad" plugins
 
 License:        LGPLv2+ and LGPLv2
@@ -32,9 +32,10 @@ Source0:        gst-plugins-bad-free-%{version}.tar.xz
 Source1:        gst-p-bad-cleanup.sh
 
 #upstream patches
-# Patches were taken from:
-# https://git.almalinux.org/rpms/gstreamer1-plugins-bad-free/commit/0e1e0d44a103783c7dc590f59b362a754594bf35
-Patch0001:      0001-mxfdemux-Store-GstMXFDemuxEssenceTrack-in-their-own-.patch
+Patch0:		0001-mxfdemux-Store-GstMXFDemuxEssenceTrack-in-their-own-.patch
+Patch1:		0003-mxfdemux-Fix-integer-overflow-causing-out-of-bounds-.patch
+Patch2:		0004-mxfdemux-Check-number-of-channels-for-AES3-audio.patch
+Patch3:		0005-h265parser-Fix-possible-overflow-using-max_sub_layer.patch
 
 BuildRequires:  gstreamer1-devel >= %{version}
 BuildRequires:  gstreamer1-plugins-base-devel >= %{version}
@@ -187,6 +188,10 @@ aren't tested well enough, or the code is not of good enough quality.
 
 %prep
 %setup -q -n gst-plugins-bad-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %configure --disable-silent-rules --disable-fatal-warnings \
@@ -475,8 +480,19 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 
 
 %changelog
-* Thu Dec 14 2023 Eduard Abdullin <eabdullin@almalinux.org> - 1.16.1-2.alma.1
+* Wed Jan 17 2024 Wim Taymans <wtaymans@redhat.com> - 1.16.1-4
+- Patch CVE-2023-40474: Integer overflow
+- Patch CVE-2023-40475: Integer overflow
+- Patch CVE-2023-40476: Integer overflow in H.265 video parser
+- Resolves: RHEL-19500, RHEL-19504, RHEL-19507
+
+* Thu Jan 11 2024 Wim Taymans <wtaymans@redhat.com> - 1.16.1-3
+- Bump to avoid conflict with z stream.
+- Resolves: RHEL-16794
+
+* Wed Dec 13 2023 Wim Taymans <wtaymans@redhat.com> - 1.16.1-2
 - Patch CVE-2023-44446: MXF demuxer use-after-free
+- Resolves: RHEL-16794
 
 * Mon Nov 18 2019 Wim Taymans <wtaymans@redhat.com> - 1.16.1-1
 - Update to 1.16.1