diff --git a/backport-CVE-2024-4453.patch b/backport-CVE-2024-4453.patch deleted file mode 100644 index afc2b385e6fe55d788a05540046495228e7e71e3..0000000000000000000000000000000000000000 --- a/backport-CVE-2024-4453.patch +++ /dev/null @@ -1,60 +0,0 @@ -From e68eccff103ab0e91e6d77a892f57131b33902f5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= -Date: Thu, 25 Apr 2024 15:21:20 +0300 -Subject: [PATCH] exiftag: Prevent integer overflows and out of bounds reads - when handling undefined tags - -Fixes ZDI-CAN-23896 -Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3483 - -Part-of: ---- - .../gst-libs/gst/tag/gstexiftag.c | 19 +++++++++++++++++-- - 1 file changed, 17 insertions(+), 2 deletions(-) - -diff --git a/gst-libs/gst/tag/gstexiftag.c b/gst-libs/gst/tag/gstexiftag.c -index 98d05c6b87..55753e570e 100644 ---- a/gst-libs/gst/tag/gstexiftag.c -+++ b/gst-libs/gst/tag/gstexiftag.c -@@ -1402,6 +1402,7 @@ parse_exif_undefined_tag (GstExifReader * reader, const GstExifTagMatch * tag, - - if (count > 4) { - GstMapInfo info; -+ gsize alloc_size; - - if (offset < reader->base_offset) { - GST_WARNING ("Offset is smaller (%u) than base offset (%u)", offset, -@@ -1423,14 +1424,28 @@ parse_exif_undefined_tag (GstExifReader * reader, const GstExifTagMatch * tag, - return; - } - -+ if (info.size - real_offset < count) { -+ GST_WARNING ("Invalid size %u for buffer of size %" G_GSIZE_FORMAT -+ ", not adding tag %s", count, info.size, tag->gst_tag); -+ gst_buffer_unmap (reader->buffer, &info); -+ return; -+ } -+ -+ if (!g_size_checked_add (&alloc_size, count, 1)) { -+ GST_WARNING ("Invalid size %u for buffer of size %" G_GSIZE_FORMAT -+ ", not adding tag %s", real_offset, info.size, tag->gst_tag); -+ gst_buffer_unmap (reader->buffer, &info); -+ return; -+ } -+ - /* +1 because it could be a string without the \0 */ -- data = malloc (sizeof (guint8) * count + 1); -+ data = malloc (alloc_size); - memcpy (data, info.data + real_offset, count); - data[count] = 0; - - gst_buffer_unmap (reader->buffer, &info); - } else { -- data = malloc (sizeof (guint8) * count + 1); -+ data = malloc (count + 1); - memcpy (data, (guint8 *) offset_as_data, count); - data[count] = 0; - } --- -2.20.1 - diff --git a/gst-plugins-base-1.24.0.tar.xz b/gst-plugins-base-1.24.0.tar.xz deleted file mode 100644 index c3c2f05e5c8908a2214fb2c28b71c104790c2236..0000000000000000000000000000000000000000 Binary files a/gst-plugins-base-1.24.0.tar.xz and /dev/null differ diff --git a/gst-plugins-base-1.24.10.tar.xz b/gst-plugins-base-1.24.10.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..4e0af58b78b40b887b865ace84503d3c3f65eb90 Binary files /dev/null and b/gst-plugins-base-1.24.10.tar.xz differ diff --git a/gstreamer1-plugins-base.spec b/gstreamer1-plugins-base.spec index cbebaebe806802c5a6121782eeb180e202ee1df9..b3748eed663c73b731c8701cbd2c9dfc492c8de6 100644 --- a/gstreamer1-plugins-base.spec +++ b/gstreamer1-plugins-base.spec @@ -2,14 +2,13 @@ %global gst_mm gstreamer-%{majorminor} Name: gstreamer1-plugins-base -Version: 1.24.0 -Release: 2 +Version: 1.24.10 +Release: 1 Summary: GStreamer streaming media framework base plugins -License: LGPLv2+ -URL: http://gstreamer.freedesktop.org/ -Source0: http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-%{version}.tar.xz +License: LGPL-2.1-or-later +URL: https://gstreamer.freedesktop.org/ +Source0: https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-%{version}.tar.xz Patch0: 0001-missing-plugins-Remove-the-mpegaudioversion-field.patch -Patch1: backport-CVE-2024-4453.patch BuildRequires: gcc-c++ gstreamer1-devel >= %{version} gobject-introspection-devel >= 1.31.1 iso-codes-devel alsa-lib-devel BuildRequires: cdparanoia-devel libogg-devel >= 1.0 libtheora-devel >= 1.1 libvisual-devel libvorbis-devel >= 1.0 libXv-devel @@ -47,9 +46,7 @@ Provides: devel-docs This package provides manual for developpers. %prep -%setup -q -n gst-plugins-base-%{version} -%patch0 -p1 -%patch1 -p1 +%autosetup -p1 -n gst-plugins-base-%{version} %build %meson -D doc=disabled -D orc=enabled \ @@ -94,9 +91,6 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/gstreamer-base.appdata.xml < - 1.24.10-1 +- update to 1.24.10 + * Thu Sep 19 2024 zhangxianting - 1.24.0-2 - fix CVE-2024-4453 diff --git a/gstreamer1-plugins-base.yaml b/gstreamer1-plugins-base.yaml index 273f673c430e1e1f19fc653a97b9b01af5ed03b5..e7579a0228d10733b7735acad976c41058a048d0 100644 --- a/gstreamer1-plugins-base.yaml +++ b/gstreamer1-plugins-base.yaml @@ -1,4 +1,4 @@ version_control: git -src_repo: https://gitlab.freedesktop.org/gstreamer/gst-plugins-base.git -tag_prefix: -seperator: . +src_repo: https://gitlab.freedesktop.org/gstreamer/gstreamer.git +tag_prefix: +separator: .