francis.wang
4c86c082a2
Combine poky (Yocto scarthgap), meta-openembedded (scarthgap), and meta-openwrt into a single repository. Components: - poky/ Yocto core framework (BitBake + OE-Core) - meta-openembedded/ Community layers (meta-oe, meta-python, meta-networking) - meta-openwrt/ OpenWrt customization layer - setup-env.sh One-click build environment setup - README.md Project documentation
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
From 0870e87c7c02e28e22a09a7de0c5b1e5bed68c14 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
|
|
Date: Fri, 4 Oct 2024 14:04:03 +0300
|
|
Subject: [PATCH] avisubtitle: Fix size checks and avoid overflows when
|
|
checking sizes
|
|
|
|
Thanks to Antonio Morales for finding and reporting the issue.
|
|
|
|
Fixes GHSL-2024-262
|
|
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3890
|
|
|
|
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8043>
|
|
|
|
CVE: CVE-2024-47774
|
|
Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/0870e87c7c02e28e22a09a7de0c5b1e5bed68c14]
|
|
Signed-off-by: Peter Marko <peter.marko@siemens.com>
|
|
---
|
|
gst/avi/gstavisubtitle.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/gst/avi/gstavisubtitle.c b/gst/avi/gstavisubtitle.c
|
|
index efc5f04051..c816934da6 100644
|
|
--- a/gst/avi/gstavisubtitle.c
|
|
+++ b/gst/avi/gstavisubtitle.c
|
|
@@ -196,7 +196,7 @@ gst_avi_subtitle_parse_gab2_chunk (GstAviSubtitle * sub, GstBuffer * buf)
|
|
/* read 'name' of subtitle */
|
|
name_length = GST_READ_UINT32_LE (map.data + 5 + 2);
|
|
GST_LOG_OBJECT (sub, "length of name: %u", name_length);
|
|
- if (map.size <= 17 + name_length)
|
|
+ if (G_MAXUINT32 - 17 < name_length || map.size < 17 + name_length)
|
|
goto wrong_name_length;
|
|
|
|
name_utf8 =
|
|
@@ -216,7 +216,8 @@ gst_avi_subtitle_parse_gab2_chunk (GstAviSubtitle * sub, GstBuffer * buf)
|
|
file_length = GST_READ_UINT32_LE (map.data + 13 + name_length);
|
|
GST_LOG_OBJECT (sub, "length srt/ssa file: %u", file_length);
|
|
|
|
- if (map.size < (17 + name_length + file_length))
|
|
+ if (G_MAXUINT32 - 17 - name_length < file_length
|
|
+ || map.size < 17 + name_length + file_length)
|
|
goto wrong_total_length;
|
|
|
|
/* store this, so we can send it again after a seek; note that we shouldn't
|
|
--
|
|
2.30.2
|
|
|