46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
From cfccf4b36197359271c95f20bfcda854f6c812cc 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 2/4] 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>
|
|
---
|
|
subprojects/gst-plugins-bad/gst/mxf/mxfd10.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/subprojects/gst-plugins-bad/gst/mxf/mxfd10.c b/subprojects/gst-plugins-bad/gst/mxf/mxfd10.c
|
|
index 66c071372a..060d5a02de 100644
|
|
--- a/subprojects/gst-plugins-bad/gst/mxf/mxfd10.c
|
|
+++ b/subprojects/gst-plugins-bad/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
|
|
|