96 lines
3.0 KiB
Diff
96 lines
3.0 KiB
Diff
|
From 95e581fd181b213c2ed7cdc63f2abc03eaaa77ec Mon Sep 17 00:00:00 2001
|
||
|
|
From: Gert Wollny <gert.wollny@collabora.com>
|
||
|
|
Date: Tue, 30 Nov 2021 10:17:26 +0100
|
||
|
|
Subject: [PATCH] vrend: Add test to resource OOB write and fix it
|
||
|
|
|
||
|
|
v2: Also check that no depth != 1 has been send when none is due
|
||
|
|
|
||
|
|
Closes: #250
|
||
|
|
Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
|
||
|
|
Reviewed-by: Chia-I Wu <olvaffe@gmail.com>
|
||
|
|
---
|
||
|
|
src/vrend_renderer.c | 3 +++
|
||
|
|
tests/test_fuzzer_formats.c | 43 +++++++++++++++++++++++++++++++++++++
|
||
|
|
2 files changed, 46 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c
|
||
|
|
index 28f6697..357b81b 100644
|
||
|
|
--- a/src/vrend_renderer.c
|
||
|
|
+++ b/src/vrend_renderer.c
|
||
|
|
@@ -7833,8 +7833,11 @@ static int vrend_renderer_transfer_write_iov(struct vrend_context *ctx,
|
||
|
|
info->box->height) * elsize;
|
||
|
|
if (res->target == GL_TEXTURE_3D ||
|
||
|
|
res->target == GL_TEXTURE_2D_ARRAY ||
|
||
|
|
+ res->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY ||
|
||
|
|
res->target == GL_TEXTURE_CUBE_MAP_ARRAY)
|
||
|
|
send_size *= info->box->depth;
|
||
|
|
+ else if (need_temp && info->box->depth != 1)
|
||
|
|
+ return EINVAL;
|
||
|
|
|
||
|
|
if (need_temp) {
|
||
|
|
data = malloc(send_size);
|
||
|
|
diff --git a/tests/test_fuzzer_formats.c b/tests/test_fuzzer_formats.c
|
||
|
|
index 59d6fb6..2de9a9a 100644
|
||
|
|
--- a/tests/test_fuzzer_formats.c
|
||
|
|
+++ b/tests/test_fuzzer_formats.c
|
||
|
|
@@ -957,6 +957,48 @@ static void test_vrend_set_signle_abo_heap_overflow() {
|
||
|
|
virgl_renderer_submit_cmd((void *) cmd, ctx_id, 0xde);
|
||
|
|
}
|
||
|
|
|
||
|
|
+/* Test adapted from yaojun8558363@gmail.com:
|
||
|
|
+ * https://gitlab.freedesktop.org/virgl/virglrenderer/-/issues/250
|
||
|
|
+*/
|
||
|
|
+static void test_vrend_3d_resource_overflow() {
|
||
|
|
+
|
||
|
|
+ struct virgl_renderer_resource_create_args resource;
|
||
|
|
+ resource.handle = 0x4c474572;
|
||
|
|
+ resource.target = PIPE_TEXTURE_2D_ARRAY;
|
||
|
|
+ resource.format = VIRGL_FORMAT_Z24X8_UNORM;
|
||
|
|
+ resource.nr_samples = 2;
|
||
|
|
+ resource.last_level = 0;
|
||
|
|
+ resource.array_size = 3;
|
||
|
|
+ resource.bind = VIRGL_BIND_SAMPLER_VIEW;
|
||
|
|
+ resource.depth = 1;
|
||
|
|
+ resource.width = 8;
|
||
|
|
+ resource.height = 4;
|
||
|
|
+ resource.flags = 0;
|
||
|
|
+
|
||
|
|
+ virgl_renderer_resource_create(&resource, NULL, 0);
|
||
|
|
+ virgl_renderer_ctx_attach_resource(ctx_id, resource.handle);
|
||
|
|
+
|
||
|
|
+ uint32_t size = 0x400;
|
||
|
|
+ uint32_t cmd[size];
|
||
|
|
+ int i = 0;
|
||
|
|
+ cmd[i++] = (size - 1) << 16 | 0 << 8 | VIRGL_CCMD_RESOURCE_INLINE_WRITE;
|
||
|
|
+ cmd[i++] = resource.handle;
|
||
|
|
+ cmd[i++] = 0; // level
|
||
|
|
+ cmd[i++] = 0; // usage
|
||
|
|
+ cmd[i++] = 0; // stride
|
||
|
|
+ cmd[i++] = 0; // layer_stride
|
||
|
|
+ cmd[i++] = 0; // x
|
||
|
|
+ cmd[i++] = 0; // y
|
||
|
|
+ cmd[i++] = 0; // z
|
||
|
|
+ cmd[i++] = 8; // w
|
||
|
|
+ cmd[i++] = 4; // h
|
||
|
|
+ cmd[i++] = 3; // d
|
||
|
|
+ memset(&cmd[i], 0, size - i);
|
||
|
|
+
|
||
|
|
+ virgl_renderer_submit_cmd((void *) cmd, ctx_id, size);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+
|
||
|
|
int main()
|
||
|
|
{
|
||
|
|
initialize_environment();
|
||
|
|
@@ -979,6 +1021,7 @@ int main()
|
||
|
|
test_cs_nullpointer_deference();
|
||
|
|
test_vrend_set_signle_abo_heap_overflow();
|
||
|
|
|
||
|
|
+ test_vrend_3d_resource_overflow();
|
||
|
|
|
||
|
|
virgl_renderer_context_destroy(ctx_id);
|
||
|
|
virgl_renderer_cleanup(&cookie);
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|