mirror of
https://git.yoctoproject.org/poky
synced 2026-03-11 17:59:39 +01:00
gstreamer1.0-plugins-base: fix CVE-2025-47806 & CVE-2025-47808
Backport fixes for: * CVE-2025-47806 - Upstream-Status: Backport fromda4380c4df* CVE-2025-47808 - Upstream-Status: Backport from6b19f11751(From OE-Core rev: 974670b83970f78edcb9f7d09ba34ec3a327320a) Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
committed by
Steve Sakoman
parent
e1b698abcc
commit
1e0216c6ba
@@ -0,0 +1,50 @@
|
||||
From da4380c4df0e00f8d0bad569927bfc7ea35ec37d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
|
||||
Date: Thu, 8 May 2025 12:46:40 +0300
|
||||
Subject: [PATCH] subparse: Make sure that subrip time string is not too long
|
||||
before zero-padding
|
||||
|
||||
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/4419
|
||||
Fixes CVE-2025-47806
|
||||
|
||||
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/9135>
|
||||
|
||||
CVE: CVE-2025-47806
|
||||
Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/da4380c4df0e00f8d0bad569927bfc7ea35ec37d]
|
||||
Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
|
||||
---
|
||||
gst/subparse/gstsubparse.c | 11 ++++++++++-
|
||||
1 file changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c
|
||||
index 1d8fa51..81a7f65 100644
|
||||
--- a/gst/subparse/gstsubparse.c
|
||||
+++ b/gst/subparse/gstsubparse.c
|
||||
@@ -850,7 +850,7 @@ parse_subrip_time (const gchar * ts_string, GstClockTime * t)
|
||||
g_strdelimit (s, " ", '0');
|
||||
g_strdelimit (s, ".", ',');
|
||||
|
||||
- /* make sure we have exactly three digits after he comma */
|
||||
+ /* make sure we have exactly three digits after the comma */
|
||||
p = strchr (s, ',');
|
||||
if (p == NULL) {
|
||||
/* If there isn't a ',' the timestamp is broken */
|
||||
@@ -859,6 +859,15 @@ parse_subrip_time (const gchar * ts_string, GstClockTime * t)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
+ /* Check if the comma is too far into the string to avoid
|
||||
+ * stack overflow when zero-padding the sub-second part.
|
||||
+ *
|
||||
+ * Allow for 3 digits of hours just in case. */
|
||||
+ if ((p - s) > sizeof ("hhh:mm:ss,")) {
|
||||
+ GST_WARNING ("failed to parse subrip timestamp string '%s'", s);
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
++p;
|
||||
len = strlen (p);
|
||||
if (len > 3) {
|
||||
--
|
||||
2.50.1
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
From 6b19f117518a765a25c99d1c4b09f2838a8ed0c9 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
|
||||
Date: Thu, 8 May 2025 09:04:52 +0300
|
||||
Subject: [PATCH] tmplayer: Don't append NULL + 1 to the string buffer when
|
||||
parsing lines without text
|
||||
|
||||
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/4417
|
||||
Fixes CVE-2025-47808
|
||||
|
||||
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/9132>
|
||||
|
||||
CVE: CVE-2025-47808
|
||||
Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/6b19f117518a765a25c99d1c4b09f2838a8ed0c9]
|
||||
Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
|
||||
---
|
||||
gst/subparse/tmplayerparse.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gst/subparse/tmplayerparse.c b/gst/subparse/tmplayerparse.c
|
||||
index 807e332..a9225d3 100644
|
||||
--- a/gst/subparse/tmplayerparse.c
|
||||
+++ b/gst/subparse/tmplayerparse.c
|
||||
@@ -125,7 +125,9 @@ tmplayer_parse_line (ParserState * state, const gchar * line, guint line_num)
|
||||
* durations from the start times anyway, so as long as the parser just
|
||||
* forwards state->start_time by duration after it pushes the line we
|
||||
* are about to return it will all be good. */
|
||||
- g_string_append (state->buf, text_start + 1);
|
||||
+ if (text_start) {
|
||||
+ g_string_append (state->buf, text_start + 1);
|
||||
+ }
|
||||
} else if (line_num > 0) {
|
||||
GST_WARNING ("end of subtitle unit but no valid start time?!");
|
||||
}
|
||||
--
|
||||
2.50.1
|
||||
|
||||
@@ -20,6 +20,8 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba
|
||||
file://CVE-2024-47615-1.patch \
|
||||
file://CVE-2024-47615-2.patch \
|
||||
file://CVE-2024-47835.patch \
|
||||
file://CVE-2025-47806.patch \
|
||||
file://CVE-2025-47808.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "fde6696a91875095d82c1012b5777c28ba926047ffce08508e12c1d2c66f0057"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user