16accb6b24
- 264 license table entries with exact download URLs (224/264 resolved) - Complete sources/ directory with all BitBake recipes - Build configuration: tqma6ul-multi-mba6ulx, spaetzle (musl) - Full traceability for Softwarefreigabeantrag - GCC 13.4.0, Linux 6.6.102, U-Boot 2023.04, musl 1.2.4 - License distribution: GPL-2.0 (24), MIT (23), GPL-2.0+ (18), BSD-3 (16)
57 lines
2.1 KiB
Diff
57 lines
2.1 KiB
Diff
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
|
|
|