diff --git a/debian/apertis/copyright b/debian/apertis/copyright index 5e3251565b2576f3cc5fd68d737e3b67564405a7..89415131eaca4be1bb924b8e2eaca208482fbd77 100644 --- a/debian/apertis/copyright +++ b/debian/apertis/copyright @@ -1134,4 +1134,3 @@ License: LGPL-2+ Files: tools/tools.h Copyright: 2004, 2005, Benjamin Otte <otte@gnome.org> License: LGPL-2+ - diff --git a/debian/apertis/gitlab-ci.yml b/debian/apertis/gitlab-ci.yml deleted file mode 100644 index 272299caeacd6bd17188a49269267b4df886e36f..0000000000000000000000000000000000000000 --- a/debian/apertis/gitlab-ci.yml +++ /dev/null @@ -1,4 +0,0 @@ -include: - - project: 'infrastructure/ci-package-builder' - file: '/ci-package-builder.yml' - diff --git a/debian/changelog b/debian/changelog index 01d8af462a43900e7e09010b93ef14782f6d8780..f077df0406dc0056013458b40fed99abcc2d70bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +gstreamer1.0 (1.22.0-2+deb12u1+apertis1) apertis; urgency=medium + + * Sync from debian/bookworm-security. + * Remaining Apertis specific changes: + - Drop dependency on LGPL-3 libdw for better backtraces + + -- Apertis CI <devel@lists.apertis.org> Mon, 06 Jan 2025 08:55:36 +0000 + +gstreamer1.0 (1.22.0-2+deb12u1) bookworm-security; urgency=high + + * Non-maintainer upload by the Security Team. + * allocator: Avoid integer overflow when allocating sysmem (CVE-2024-47606) + + -- Salvatore Bonaccorso <carnil@debian.org> Fri, 13 Dec 2024 06:13:42 +0100 + gstreamer1.0 (1.22.0-2+apertis1) apertis; urgency=medium * Sync updates from Debian Bookworm. diff --git a/debian/patches/allocator-Avoid-integer-overflow-when-allocating-sys.patch b/debian/patches/allocator-Avoid-integer-overflow-when-allocating-sys.patch new file mode 100644 index 0000000000000000000000000000000000000000..9362a8da1b4e3756625654996a408b448bd9e2bd --- /dev/null +++ b/debian/patches/allocator-Avoid-integer-overflow-when-allocating-sys.patch @@ -0,0 +1,48 @@ +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> +Date: Thu, 26 Sep 2024 22:07:22 +0300 +Subject: allocator: Avoid integer overflow when allocating sysmem +Origin: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/72af11b248b4cb60d3dfe4e9459eec0d20052c9b +Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2024-47606 + +Thanks to Antonio Morales for finding and reporting the issue. + +Fixes GHSL-2024-166 +Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3851 + +Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8044> +--- + subprojects/gstreamer/gst/gstallocator.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +--- a/gst/gstallocator.c ++++ b/gst/gstallocator.c +@@ -430,8 +430,20 @@ _sysmem_new_block (GstMemoryFlags flags, + /* ensure configured alignment */ + align |= gst_memory_alignment; + /* allocate more to compensate for alignment */ ++ if (align > G_MAXSIZE || maxsize > G_MAXSIZE - align) { ++ GST_CAT_WARNING (GST_CAT_MEMORY, ++ "Allocating %" G_GSIZE_FORMAT " bytes with alignment %" G_GSIZE_FORMAT ++ "x overflows", maxsize, align); ++ return NULL; ++ } + maxsize += align; + /* alloc header and data in one block */ ++ if (maxsize > G_MAXSIZE - sizeof (GstMemorySystem)) { ++ GST_CAT_WARNING (GST_CAT_MEMORY, ++ "Allocating %" G_GSIZE_FORMAT " bytes with alignment %" G_GSIZE_FORMAT ++ "x overflows", maxsize, align); ++ return NULL; ++ } + slice_size = sizeof (GstMemorySystem) + maxsize; + + mem = g_slice_alloc (slice_size); +@@ -481,6 +493,8 @@ _sysmem_copy (GstMemorySystem * mem, gss + size = mem->mem.size > offset ? mem->mem.size - offset : 0; + + copy = _sysmem_new_block (0, size, mem->mem.align, 0, size); ++ if (!copy) ++ return NULL; + GST_CAT_DEBUG (GST_CAT_PERFORMANCE, + "memcpy %" G_GSIZE_FORMAT " memory %p -> %p", size, mem, copy); + memcpy (copy->data, mem->data + mem->mem.offset + offset, size); diff --git a/debian/patches/series b/debian/patches/series index cbeba032f97484b384c2675f2dbc2b49a4c963dc..14430810f17357a47df55ef18bcd275da58e01dd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-registrybinary-Update-magic-version-string.patch +allocator-Avoid-integer-overflow-when-allocating-sys.patch