mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

gstreamer1.0-plugins-good: patch CVE-2024-47606

Browse Source 
Pick commit related to gstreamer from:
* https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8032

(From OE-Core rev: d68a84dd3419811ec7f487907d7412c6105979d0)

Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Peter Marko
2024-12-30 18:27:19 +01:00
committed by Steve Sakoman
parent 77aed6aa09
commit 731ed65861
2 changed files with 57 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-allocator-Avoid-integer-overflow-when-allocating-sys.patch Normal file
View File

@@ -0,0 +1,56 @@
From f1cdc6f24340f6cce4cc7020628002f5c70dd6c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Thu, 26 Sep 2024 22:07:22 +0300
Subject: [PATCH] allocator: Avoid integer overflow when allocating sysmem
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/8032>
CVE: CVE-2024-47606
Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/f1cdc6f24340f6cce4cc7020628002f5c70dd6c7]
Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
gst/gstallocator.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/gst/gstallocator.c b/gst/gstallocator.c
index 996f5dc946..198cfe9523 100644
--- 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, gssize offset, gsize size)
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);
--
2.30.2

1
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.12.bb
View File

@@ -21,6 +21,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x
file://0002-tests-add-support-for-install-the-tests.patch \
file://0003-tests-use-a-dictionaries-for-environment.patch \
file://0004-tests-add-helper-script-to-run-the-installed_tests.patch \
file://0005-allocator-Avoid-integer-overflow-when-allocating-sys.patch \
"
SRC_URI[sha256sum] = "ac352f3d02caa67f3b169daa9aa78b04dea0fc08a727de73cb28d89bd54c6f61"