mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

allocator: Avoid integer overflow when allocating sysmem

Browse source 
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>
This commit is contained in:
Sebastian Dröge 2024-09-26 22:07:22 +03:00 committed by Tim-Philipp Müller
parent 2209d4382f
commit f1cdc6f243
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
subprojects/gstreamer/gst/gstallocator.c
View file

@ -427,8 +427,20 @@ _sysmem_new_block (GstMemoryFlags flags,
/* ensure configured alignment */ /* ensure configured alignment */
align |= gst_memory_alignment; align |= gst_memory_alignment;
/* allocate more to compensate for 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; maxsize += align;
/* alloc header and data in one block */ /* 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; slice_size = sizeof (GstMemorySystem) + maxsize;
mem = g_malloc (slice_size); mem = g_malloc (slice_size);
@ -478,6 +490,8 @@ _sysmem_copy (GstMemorySystem * mem, gssize offset, gsize size)
size = mem->mem.size > offset ? mem->mem.size - offset : 0; size = mem->mem.size > offset ? mem->mem.size - offset : 0;
copy = _sysmem_new_block (0, size, mem->mem.align, 0, size); copy = _sysmem_new_block (0, size, mem->mem.align, 0, size);
if (!copy)
return NULL;
GST_CAT_DEBUG (GST_CAT_PERFORMANCE, GST_CAT_DEBUG (GST_CAT_PERFORMANCE,
"memcpy %" G_GSIZE_FORMAT " memory %p -> %p", size, mem, copy); "memcpy %" G_GSIZE_FORMAT " memory %p -> %p", size, mem, copy);
memcpy (copy->data, mem->data + mem->mem.offset + offset, size); memcpy (copy->data, mem->data + mem->mem.offset + offset, size);