7375f9916a
CVE-2024-47543, CVE-2024-47544, CVE-2024-47545, CVE-2024-47546, CVE-2024-47596, CVE-2024-47597, CVE-2024-47598, CVE-2024-47599, CVE-2024-47601, CVE-2024-47602, CVE-2024-47603, CVE-2024-47606, CVE-2024-47613, CVE-2024-47774, CVE-2024-47775, CVE-2024-47776, CVE-2024-47777, CVE-2024-47778, CVE-2024-47834 Resolves: RHEL-70958, RHEL-70971, RHEL-71033, RHEL-71195 Resolves: RHEL-71210, RHEL-71202, RHEL-71171, RHEL-71200 Resolves: RHEL-71206, RHEL-71173, RHEL-71198, RHEL-71204 Resolves: RHEL-71208, RHEL-71031, RHEL-71007, RHEL-71039 Resolves: RHEL-71169, RHEL-71192, RHEL-71161, RHEL-71167 Resolves: RHEL-71189
60 lines
2.5 KiB
Diff
60 lines
2.5 KiB
Diff
From f4cca76f59c6babf3a122f5485f611ab373dfde3 Mon Sep 17 00:00:00 2001
|
|
From: Antonio Morales <antonio-morales@github.com>
|
|
Date: Thu, 26 Sep 2024 18:39:37 +0300
|
|
Subject: [PATCH 18/28] qtdemux: Fix integer overflow when allocating the
|
|
samples table for fragmented MP4
|
|
|
|
This can lead to out of bounds writes and NULL pointer dereferences.
|
|
|
|
Fixes GHSL-2024-094, GHSL-2024-237, GHSL-2024-241
|
|
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3839
|
|
|
|
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8059>
|
|
---
|
|
subprojects/gst-plugins-good/gst/isomp4/qtdemux.c | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
|
|
index fcc818c7d7..2406098062 100644
|
|
--- a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
|
|
+++ b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
|
|
@@ -3342,6 +3342,7 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
|
|
gint i;
|
|
guint8 *data;
|
|
guint entry_size, dur_offset, size_offset, flags_offset = 0, ct_offset = 0;
|
|
+ guint new_n_samples;
|
|
QtDemuxSample *sample;
|
|
gboolean ismv = FALSE;
|
|
gint64 initial_offset;
|
|
@@ -3442,14 +3443,13 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
|
|
goto fail;
|
|
data = (guint8 *) gst_byte_reader_peek_data_unchecked (trun);
|
|
|
|
- if (stream->n_samples + samples_count >=
|
|
- QTDEMUX_MAX_SAMPLE_INDEX_SIZE / sizeof (QtDemuxSample))
|
|
+ if (!g_uint_checked_add (&new_n_samples, stream->n_samples, samples_count) ||
|
|
+ new_n_samples >= QTDEMUX_MAX_SAMPLE_INDEX_SIZE / sizeof (QtDemuxSample))
|
|
goto index_too_big;
|
|
|
|
GST_DEBUG_OBJECT (qtdemux, "allocating n_samples %u * %u (%.2f MB)",
|
|
- stream->n_samples + samples_count, (guint) sizeof (QtDemuxSample),
|
|
- (stream->n_samples + samples_count) *
|
|
- sizeof (QtDemuxSample) / (1024.0 * 1024.0));
|
|
+ new_n_samples, (guint) sizeof (QtDemuxSample),
|
|
+ (new_n_samples) * sizeof (QtDemuxSample) / (1024.0 * 1024.0));
|
|
|
|
/* create a new array of samples if it's the first sample parsed */
|
|
if (stream->n_samples == 0) {
|
|
@@ -3458,7 +3458,7 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
|
|
/* or try to reallocate it with space enough to insert the new samples */
|
|
} else
|
|
stream->samples = g_try_renew (QtDemuxSample, stream->samples,
|
|
- stream->n_samples + samples_count);
|
|
+ new_n_samples);
|
|
if (stream->samples == NULL)
|
|
goto out_of_memory;
|
|
|
|
--
|
|
2.47.0
|
|
|