From 377668aaf6f2d8d0cb11895c4a884c7cfdfe08b6 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 19 Jan 2023 17:10:13 +0100 Subject: [PATCH] render/vulkan: check that requested size is smaller than max Fail with a clearer error when the requested size is too large. Without this, we allocate a buffer with a size smaller than what was requested. References: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3975 --- render/vulkan/renderer.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/render/vulkan/renderer.c b/render/vulkan/renderer.c index f0acd4cd..fe716240 100644 --- a/render/vulkan/renderer.c +++ b/render/vulkan/renderer.c @@ -234,6 +234,13 @@ struct wlr_vk_buffer_span vulkan_get_stage_span(struct wlr_vk_renderer *r, }; } + if (size > max_stage_size) { + wlr_log(WLR_ERROR, "cannot vulkan stage buffer: " + "requested size (%zu bytes) exceeds maximum (%zu bytes)", + (size_t)size, (size_t)max_stage_size); + goto error_alloc; + } + // we didn't find a free buffer - create one // size = clamp(max(size * 2, prev_size * 2), min_size, max_size) VkDeviceSize bsize = size * 2;