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
46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
From 1be56c1bdd89fccd6cd31a9c2f5ea6e8d8a08216 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
|
|
Date: Fri, 27 Sep 2024 10:38:50 +0300
|
|
Subject: [PATCH 24/28] qtdemux: Make sure there are enough offsets to read
|
|
when parsing samples
|
|
|
|
While this specific case is also caught when initializing co_chunk, the error
|
|
is ignored in various places and calling into the function would lead to out of
|
|
bounds reads if the error message doesn't cause the pipeline to be shut down
|
|
fast enough.
|
|
|
|
To avoid this, no matter what, make sure enough offsets are available when
|
|
parsing them. While this is potentially slower, the same is already done in the
|
|
non-chunks_are_samples case.
|
|
|
|
Thanks to Antonio Morales for finding and reporting the issue.
|
|
|
|
Fixes GHSL-2024-245
|
|
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3847
|
|
|
|
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8060>
|
|
---
|
|
subprojects/gst-plugins-good/gst/isomp4/qtdemux.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
|
|
index e50af4ff52..ffd53fbb38 100644
|
|
--- a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
|
|
+++ b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
|
|
@@ -10065,9 +10065,9 @@ qtdemux_parse_samples (GstQTDemux * qtdemux, QtDemuxStream * stream, guint32 n)
|
|
goto done;
|
|
}
|
|
|
|
- cur->offset =
|
|
- qt_atom_parser_get_offset_unchecked (&stream->co_chunk,
|
|
- stream->co_size);
|
|
+ if (!qt_atom_parser_get_offset (&stream->co_chunk,
|
|
+ stream->co_size, &cur->offset))
|
|
+ goto corrupt_file;
|
|
|
|
GST_LOG_OBJECT (qtdemux, "Created entry %d with offset "
|
|
"%" G_GUINT64_FORMAT, j, cur->offset);
|
|
--
|
|
2.47.0
|
|
|