virglrenderer: fix CVE-2022-0135 and -0175
PATCH 1/1 virglrenderer: fix CVE-2022-0135 and -0175
CVE-2022-0135 concerns out-of-bounds writes in read_transfer_data(). CVE-2022-0175 concerns using malloc() instead of calloc().
We cherry-pick from master.
Modify -0175 patch to apply to hardknott branch.
--- .../virglrenderer/cve-2022-0135.patch | 117 ++++++++++++++++++ .../virglrenderer/cve-2022-0175.patch | 112 +++++++++++++++++ .../virglrenderer/virglrenderer_0.8.2.bb | 2 + 3 files changed, 231 insertions(+) create mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022-0135.patch create mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022-0175.patch
meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022-0135.patch new file +117 -0
@@ -0,0 +1,117 @@ +From 63aee871365f9c9e7fa9125672302a0fb250d34d Mon Sep 17 00:00:00 2001 +From: Gert Wollny <[email protected]> +Date: Tue, 30 Nov 2021 09:16:24 +0100 +Subject: [PATCH 2/2] vrend: propperly check whether the shader image range is + correct + +Also add a test to check the integer underflow. + +Closes: #251 +Signed-off-by: Gert Wollny <[email protected]> +Reviewed-by: Chia-I Wu <[email protected]> + +cherry-pick from anongit.freedesktop.org/virglrenderer +commit 2aed5d4... + +CVE: CVE-2022-0135 +Upstream-Status: Backport +Signed-off-by: Joe Slater <[email protected]> + +--- + src/vrend_decode.c | 3 +- + tests/test_fuzzer_formats.c | 57 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 59 insertions(+), 1 deletion(-) + +diff --git a/src/vrend_decode.c b/src/vrend_decode.c +index 91f5f24..6771b10 100644 +--- a/src/vrend_decode.c ++++ b/src/vrend_decode.c +@@ -1249,8 +1249,9 @@ static int vrend_decode_set_shader_images(struct vrend_context *ctx, const uint3 + if (num_images < 1) { + return 0; + } ++ + if (start_slot > PIPE_MAX_SHADER_IMAGES || +- start_slot > PIPE_MAX_SHADER_IMAGES - num_images) ++ start_slot + num_images > PIPE_MAX_SHADER_IMAGES) + return EINVAL; + + for (uint32_t i = 0; i < num_images; i++) { +diff --git a/tests/test_fuzzer_formats.c b/tests/test_fuzzer_formats.c +index 154a2e5..e32caf0 100644 +--- a/tests/test_fuzzer_formats.c ++++ b/tests/test_fuzzer_formats.c +@@ -958,6 +958,61 @@ static void test_vrend_set_signle_abo_heap_overflow() { + virgl_renderer_submit_cmd((void *) cmd, ctx_id, 0xde); + } + ++static void test_vrend_set_shader_images_overflow() ++{ ++ uint32_t num_shaders = PIPE_MAX_SHADER_IMAGES + 1; ++ uint32_t size = num_shaders * VIRGL_SET_SHADER_IMAGE_ELEMENT_SIZE + 3; ++ uint32_t cmd[size]; ++ int i = 0; ++ cmd[i++] = ((size - 1)<< 16) | 0 << 8 | VIRGL_CCMD_SET_SHADER_IMAGES; ++ cmd[i++] = PIPE_SHADER_FRAGMENT; ++ memset(&cmd[i], 0, size - i); ++ ++ virgl_renderer_submit_cmd((void *) cmd, ctx_id, size); ++} ++ ++/* Test adapted from [email protected]: ++ * 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(); +@@ -980,6 +1035,8 @@ int main() + test_cs_nullpointer_deference(); + test_vrend_set_signle_abo_heap_overflow(); + ++ test_vrend_set_shader_images_overflow(); ++ test_vrend_3d_resource_overflow(); + + virgl_renderer_context_destroy(ctx_id); + virgl_renderer_cleanup(&cookie); +-- +2.25.1 +
meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022-0175.patch new file +112 -0
112 lines not on this page · raw message
meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb +2 -0
@@ -13,6 +13,8 @@ SRCREV = "7d204f3927be65fb3365dce01dbcd04d447a4985" SRC_URI = "git://anongit.freedesktop.org/virglrenderer;branch=master \ file://0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch \ file://0001-meson.build-use-python3-directly-for-python.patch \ + file://cve-2022-0135.patch \ + file://cve-2022-0175.patch \ " S = "${WORKDIR}/git"
Signature · 1 line
2.25.1
Anuj,
Did you miss this one?
I don't see it in:
https://git.openembedded.org/meta-openembedded-contrib/log/?h=hardknott-next
../Randy
Quoted 274 lines · Joe Slater
CVE-2022-0135 concerns out-of-bounds writes in
read_transfer_data(). CVE-2022-0175 concerns usingmalloc()instead ofcalloc().We cherry-pick from master.
Signed-off-by Joe Slater <[email protected]>Signed-off-by Richard Purdie <[email protected]>(cherry picked from commit 91f7511df79c5c1f93add9f2827a5a266453614e)Modify -0175 patch to apply to hardknott branch.
Signed-off-by Joe Slater <[email protected]>--- .../virglrenderer/cve-2022-0135.patch | 117 ++++++++++++++++++ .../virglrenderer/cve-2022-0175.patch | 112 +++++++++++++++++ .../virglrenderer/virglrenderer_0.8.2.bb | 2 + 3 files changed, 231 insertions(+)create mode 100644
meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022-0135.patchcreate mode 100644meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022-0175.patchmeta/recipes-graphics/virglrenderer/virglrenderer/cve-2022-0135.patch new file +117
-0@@ -0,0 +1,117 @@ +From 63aee871365f9c9e7fa9125672302a0fb250d34d Mon Sep 17 00:00:00 2001 +From: Gert Wollny <[email protected]> +Date: Tue, 30 Nov 2021 09:16:24 +0100 +Subject: [PATCH 2/2] vrend: propperly check whether the shader image range is + correct + +Also add a test to check the integer underflow. + +Closes: #251 +Signed-off-by: Gert Wollny <[email protected]> +Reviewed-by: Chia-I Wu <[email protected]> + +cherry-pick from anongit.freedesktop.org/virglrenderer +commit 2aed5d4... + +CVE: CVE-2022-0135 +Upstream-Status: Backport +Signed-off-by: Joe Slater <[email protected]> + +--- + src/vrend_decode.c | 3 +- + tests/test_fuzzer_formats.c | 57 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 59 insertions(+), 1 deletion(-) + +diff --git a/src/vrend_decode.c b/src/vrend_decode.c +index 91f5f24..6771b10 100644 +--- a/src/vrend_decode.c ++++ b/src/vrend_decode.c +@@ -1249,8 +1249,9 @@ static int vrend_decode_set_shader_images(struct vrend_context *ctx, const uint3 + if (num_images < 1) { + return 0; + } ++ + if (start_slot > PIPE_MAX_SHADER_IMAGES || +- start_slot > PIPE_MAX_SHADER_IMAGES - num_images) ++ start_slot + num_images > PIPE_MAX_SHADER_IMAGES) + return EINVAL; + + for (uint32_t i = 0; i < num_images; i++) { +diff --git a/tests/test_fuzzer_formats.c b/tests/test_fuzzer_formats.c +index 154a2e5..e32caf0 100644 +--- a/tests/test_fuzzer_formats.c ++++ b/tests/test_fuzzer_formats.c +@@ -958,6 +958,61 @@ static void test_vrend_set_signle_abo_heap_overflow() { + virgl_renderer_submit_cmd((void *) cmd, ctx_id, 0xde); + } + ++static void test_vrend_set_shader_images_overflow() ++{ ++ uint32_t num_shaders = PIPE_MAX_SHADER_IMAGES + 1; ++ uint32_t size = num_shaders * VIRGL_SET_SHADER_IMAGE_ELEMENT_SIZE + 3; ++ uint32_t cmd[size]; ++ int i = 0; ++ cmd[i++] = ((size - 1)<< 16) | 0 << 8 | VIRGL_CCMD_SET_SHADER_IMAGES; ++ cmd[i++] = PIPE_SHADER_FRAGMENT; ++ memset(&cmd[i], 0, size - i); ++ ++ virgl_renderer_submit_cmd((void *) cmd, ctx_id, size); ++} ++ ++/* Test adapted from [email protected]: ++ * 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(); +@@ -980,6 +1035,8 @@ int main() + test_cs_nullpointer_deference(); + test_vrend_set_signle_abo_heap_overflow(); + ++ test_vrend_set_shader_images_overflow(); ++ test_vrend_3d_resource_overflow(); + + virgl_renderer_context_destroy(ctx_id); + virgl_renderer_cleanup(&cookie); +-- +2.25.1 +meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022-0175.patch new file +112
-0@@ -0,0 +1,112 @@ +From 5ca7aca001092c557f0b6fc1ba3db7dcdab860b7 Mon Sep 17 00:00:00 2001 +From: Gert Wollny <[email protected]> +Date: Tue, 30 Nov 2021 09:29:42 +0100 +Subject: [PATCH 1/2] vrend: clear memory when allocating a host-backed memory + resource + +Closes: #249 +Signed-off-by: Gert Wollny <[email protected]> +Reviewed-by: Chia-I Wu <[email protected]> + +cherry-pick from anongit.freedesktop.org/virglrenderer +commit b05bb61... + +CVE: CVE-2022-0175 +Upstream-Status: Backport +Signed-off-by: Joe Slater <[email protected]> + +Patch to vrend_renderer.c modified to apply to version used by hardknott. +Patch to test_virgl_transfer.c unchanged. + +Signed-off-by: Joe Slater <[email protected]> + +--- + src/vrend_renderer.c | 2 +- + tests/test_virgl_transfer.c | 51 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 52 insertions(+), 1 deletion(-) + +diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c +index ad7a351..d84f785 100644 +--- a/src/vrend_renderer.c ++++ b/src/vrend_renderer.c +@@ -6646,7 +6646,7 @@ int vrend_renderer_resource_create(struct vrend_renderer_resource_create_args *a + if (args->bind == VIRGL_BIND_CUSTOM) { + /* use iovec directly when attached */ + gr->storage_bits |= VREND_STORAGE_HOST_SYSTEM_MEMORY; +- gr->ptr = malloc(args->width); ++ gr->ptr = calloc(1, args->width); + if (!gr->ptr) { + FREE(gr); + return ENOMEM; +diff --git a/tests/test_virgl_transfer.c b/tests/test_virgl_transfer.c +index 2c8669a..8f8e98a 100644 +--- a/tests/test_virgl_transfer.c ++++ b/tests/test_virgl_transfer.c +@@ -952,6 +952,56 @@ START_TEST(virgl_test_transfer_near_res_bounds_with_stride_succeeds) + } + END_TEST + ++START_TEST(test_vrend_host_backed_memory_no_data_leak) ++{ ++ struct iovec iovs[1]; ++ int niovs = 1; ++ ++ struct virgl_context ctx = {0}; ++ ++ int ret = testvirgl_init_ctx_cmdbuf(&ctx); ++ ++ struct virgl_renderer_resource_create_args res; ++ res.handle = 0x400; ++ res.target = PIPE_BUFFER; ++ res.format = VIRGL_FORMAT_R8_UNORM; ++ res.nr_samples = 0; ++ res.last_level = 0; ++ res.array_size = 1; ++ res.bind = VIRGL_BIND_CUSTOM; ++ res.depth = 1; ++ res.width = 32; ++ res.height = 1; ++ res.flags = 0; ++ ++ uint32_t size = 32; ++ uint8_t* data = calloc(1, size); ++ memset(data, 1, 32); ++ iovs[0].iov_base = data; ++ iovs[0].iov_len = size; ++ ++ struct pipe_box box = {0,0,0, size, 1,1}; ++ ++ virgl_renderer_resource_create(&res, NULL, 0); ++ virgl_renderer_ctx_attach_resource(ctx.ctx_id, res.handle); ++ ++ ret = virgl_renderer_transfer_read_iov(res.handle, ctx.ctx_id, 0, 0, 0, ++ (struct virgl_box *)&box, 0, iovs, niovs); ++ ++ ck_assert_int_eq(ret, 0); ++ ++ for (int i = 0; i < 32; ++i) ++ ck_assert_int_eq(data[i], 0); ++ ++ virgl_renderer_ctx_detach_resource(1, res.handle); ++ ++ virgl_renderer_resource_unref(res.handle); ++ free(data); ++ ++} ++END_TEST ++ ++ + static Suite *virgl_init_suite(void) + { + Suite *s; +@@ -981,6 +1031,7 @@ static Suite *virgl_init_suite(void) + tcase_add_test(tc_core, virgl_test_transfer_buffer_bad_strides); + tcase_add_test(tc_core, virgl_test_transfer_2d_array_bad_layer_stride); + tcase_add_test(tc_core, virgl_test_transfer_2d_bad_level); ++ tcase_add_test(tc_core, test_vrend_host_backed_memory_no_data_leak); + + tcase_add_loop_test(tc_core, virgl_test_transfer_res_read_valid, 0, PIPE_MAX_TEXTURE_TYPES); + tcase_add_loop_test(tc_core, virgl_test_transfer_res_write_valid, 0, PIPE_MAX_TEXTURE_TYPES); +-- +2.31.1 +meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb +2
-0@@ -13,6 +13,8 @@ SRCREV = "7d204f3927be65fb3365dce01dbcd04d447a4985" SRC_URI = "git://anongit.freedesktop.org/virglrenderer;branch=master \ file://0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch \ file://0001-meson.build-use-python3-directly-for-python.patch \ + file://cve-2022-0135.patch \ + file://cve-2022-0175.patch \ " S = "${WORKDIR}/git"
Signature · 2 lines
# Randy MacLeod # Wind River Linux
Quoted 3 lines · Randy MacLeod
Anuj,
Did you miss this one?
A hardknott point release, 3.3.5, is in QA right now so I didn't take patches this week. It will be in next week's pull request.
I have taken this for honister in the meantime.
Thanks,
Anuj
Quoted 327 lines
I don't see it in:
https://git.openembedded.org/meta-openembedded-contrib/log/?h=hardknott-next../Randy
Quoted 319 lines · Joe Slater
CVE-2022-0135 concerns out-of-bounds writes in
read_transfer_data().
CVE-2022-0175 concerns usingmalloc()instead ofcalloc().We cherry-pick from master.
Signed-off-by Joe Slater <[email protected]>Signed-off-by Richard Purdie <[email protected]>(cherry picked from commit
91f7511df79c5c1f93add9f2827a5a266453614e)Modify -0175 patch to apply to hardknott branch.
Signed-off-by Joe Slater <[email protected]>---
.../virglrenderer/cve-2022-0135.patch | 117
++++++++++++++++++
.../virglrenderer/cve-2022-0175.patch | 112
+++++++++++++++++
.../virglrenderer/virglrenderer_0.8.2.bb | 2 +3 files changed, 231 insertions(+)create mode 100644 meta/recipes-
graphics/virglrenderer/virglrenderer/cve-2022-0135.patchcreate mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022-0175.patch(quoted diff) +0
-02022-0135.patch b/meta/recipes-
graphics/virglrenderer/virglrenderer/cve-2022-0135.patchnew file mode 100644
index 0000000000..ae42dc8f6cmeta/recipes-graphics/virglrenderer/virglrenderer/cve-2022- new file +0
-00135.patch
meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022- new file +1
-0@@ -0,0 +1,117 @@ +From 63aee871365f9c9e7fa9125672302a0fb250d34d Mon Sep 17 00:00:002001
meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022- new file +3
-0+From: Gert Wollny <[email protected]> +Date: Tue, 30 Nov 2021 09:16:24 +0100 +Subject: [PATCH 2/2] vrend: propperly check whether the shaderimage range is
+ correctmeta/recipes-graphics/virglrenderer/virglrenderer/cve-2022- new file +25
-0+ +Also add a test to check the integer underflow. + +Closes: #251 +Signed-off-by: Gert Wollny <[email protected]> +Reviewed-by: Chia-I Wu <[email protected]> + +cherry-pick from anongit.freedesktop.org/virglrenderer +commit 2aed5d4... + +CVE: CVE-2022-0135 +Upstream-Status: Backport +Signed-off-by: Joe Slater <[email protected]> + +--- + src/vrend_decode.c | 3 +- + tests/test_fuzzer_formats.c | 57 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 59 insertions(+), 1 deletion(-) + +diff --git a/src/vrend_decode.c b/src/vrend_decode.c +index 91f5f24..6771b10 100644 +--- a/src/vrend_decode.c ++++ b/src/vrend_decode.c +@@ -1249,8 +1249,9 @@ static intvrend_decode_set_shader_images(struct
vrend_context*ctx, const uint3
+ if (num_images< 1) {
+ return 0;
+ }
++
+ if (start_slot>PIPE_MAX_SHADER_IMAGES||
+-start_slot>PIPE_MAX_SHADER_IMAGES-num_images) ++start_slot+num_images>PIPE_MAX_SHADER_IMAGES) + return EINVAL;meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022- new file +3
-0+ + for (uint32_t i = 0; i < num_images; i++) { +diff --git a/tests/test_fuzzer_formats.c
b/tests/test_fuzzer_formats.c
+index 154a2e5..e32caf0 100644
+---a/tests/test_fuzzer_formats.c
++++b/tests/test_fuzzer_formats.c
+@@ -958,6 +958,61 @@ static voidtest_vrend_set_signle_abo_heap_overflow(){
+virgl_renderer_submit_cmd((void *) cmd, ctx_id, 0xde);
+ }
+
++static voidtest_vrend_set_shader_images_overflow()++{
++uint32_tnum_shaders=PIPE_MAX_SHADER_IMAGES+ 1; ++uint32_tsize =num_shaders*VIRGL_SET_SHADER_IMAGE_ELEMENT_SIZE+ 3;
++uint32_tcmd[size];
++ int i = 0;
++ cmd[i++] = ((size - 1)<< 16) | 0 << 8 |VIRGL_CCMD_SET_SHADER_IMAGES;
++ cmd[i++] =PIPE_SHADER_FRAGMENT;
++memset(&cmd[i], 0, size - i);
++
++virgl_renderer_submit_cmd((void *) cmd, ctx_id, size); ++}
++
++/* Test adapted from [email protected]:
++ *
https://gitlab.freedesktop.org/virgl/virglrenderer/-/issues/250
++*/
++static voidtest_vrend_3d_resource_overflow(){
++
++ structvirgl_renderer_resource_create_argsresource; ++ 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_tsize =0x400;
++uint32_tcmd[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); ++}
++
++
+ intmain()
+ {
+initialize_environment();
+@@ -980,6 +1035,8 @@ intmain()
+test_cs_nullpointer_deference();
+test_vrend_set_signle_abo_heap_overflow();meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022- new file +9
-0+ ++ test_vrend_set_shader_images_overflow(); ++ test_vrend_3d_resource_overflow(); + + virgl_renderer_context_destroy(ctx_id); + virgl_renderer_cleanup(&cookie); +-- +2.25.1 +(quoted diff) +0
-02022-0175.patch b/meta/recipes-
graphics/virglrenderer/virglrenderer/cve-2022-0175.patchnew file mode 100644
index 0000000000..8bbb9eb579meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022- new file +0
-00175.patch
meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022- new file +1
-0@@ -0,0 +1,112 @@ +From 5ca7aca001092c557f0b6fc1ba3db7dcdab860b7 Mon Sep 17 00:00:002001
meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022- new file +3
-0+From: Gert Wollny <[email protected]> +Date: Tue, 30 Nov 2021 09:29:42 +0100 +Subject: [PATCH 1/2] vrend: clear memory when allocating a host-backed memory
+ resourcemeta/recipes-graphics/virglrenderer/virglrenderer/cve-2022- new file +13
-0+ +Closes: #249 +Signed-off-by: Gert Wollny <[email protected]> +Reviewed-by: Chia-I Wu <[email protected]> + +cherry-pick from anongit.freedesktop.org/virglrenderer +commit b05bb61... + +CVE: CVE-2022-0175 +Upstream-Status: Backport +Signed-off-by: Joe Slater <[email protected]> + +Patch to vrend_renderer.c modified to apply to version used byhardknott.
meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022- new file +15
-0+Patch to test_virgl_transfer.c unchanged. + +Signed-off-by: Joe Slater <[email protected]> + +--- + src/vrend_renderer.c | 2 +- + tests/test_virgl_transfer.c | 51 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 52 insertions(+), 1 deletion(-) + +diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c +index ad7a351..d84f785 100644 +--- a/src/vrend_renderer.c ++++ b/src/vrend_renderer.c +@@ -6646,7 +6646,7 @@ int vrend_renderer_resource_create(struct
vrend_renderer_resource_create_args*a
+ if (args->bind==VIRGL_BIND_CUSTOM) {
+ /* use iovec directly when attached */
+gr->storage_bits|=VREND_STORAGE_HOST_SYSTEM_MEMORY; +-gr->ptr=malloc(args->width);
++gr->ptr=calloc(1, args->width);
+ if (!gr->ptr) {
+ FREE(gr);
+ return ENOMEM;
+diff --gita/tests/test_virgl_transfer.cb/tests/test_virgl_transfer.c
+index 2c8669a..8f8e98a 100644
+---a/tests/test_virgl_transfer.c
++++b/tests/test_virgl_transfer.c
+@@ -952,6 +952,56 @@START_TEST(virgl_test_transfer_near_res_bounds_with_stride_succeeds )
+ }
+END_TEST
+ ++START_TEST(test_vrend_host_backed_memory_no_data_leak) ++{
++ struct iovec iovs[1];
++ int niovs = 1;
++
++ structvirgl_contextctx = {0};
++
++ int ret =testvirgl_init_ctx_cmdbuf(&ctx);
++
++ structvirgl_renderer_resource_create_argsres;
++ res.handle =0x400;
++ res.target =PIPE_BUFFER;
++ res.format =VIRGL_FORMAT_R8_UNORM;
++ res.nr_samples = 0;
++ res.last_level = 0;
++ res.array_size = 1;
++ res.bind =VIRGL_BIND_CUSTOM;
++ res.depth = 1;
++ res.width = 32;
++ res.height = 1;
++ res.flags = 0;
++
++uint32_tsize = 32;
++ uint8_t* data =calloc(1, size);
++memset(data, 1, 32);
++ iovs[0].iov_base = data;
++ iovs[0].iov_len = size;
++
++ structpipe_boxbox = {0,0,0, size, 1,1};
++
++virgl_renderer_resource_create(&res, NULL, 0);
++virgl_renderer_ctx_attach_resource(ctx.ctx_id, res.handle); ++
++ ret = virgl_renderer_transfer_read_iov(res.handle, ctx.ctx_id, 0, 0, 0,
++ (structvirgl_box*)&box, 0, iovs, niovs);
++
++ck_assert_int_eq(ret, 0);
++
++ for (int i = 0; i < 32; ++i)
++ck_assert_int_eq(data[i], 0);
++
++virgl_renderer_ctx_detach_resource(1, res.handle); ++
++virgl_renderer_resource_unref(res.handle);
++ free(data);
++
++}
++END_TEST
++
++
+ static Suite*virgl_init_suite(void)
+ {
+ Suite *s;
+@@ -981,6 +1031,7 @@ static Suite*virgl_init_suite(void)+tcase_add_test(tc_core, virgl_test_transfer_buffer_bad_strides);
+tcase_add_test(tc_core, virgl_test_transfer_2d_array_bad_layer_stride);
+tcase_add_test(tc_core, virgl_test_transfer_2d_bad_level); ++tcase_add_test(tc_core, test_vrend_host_backed_memory_no_data_leak);
+
+tcase_add_loop_test(tc_core, virgl_test_transfer_res_read_valid, 0, PIPE_MAX_TEXTURE_TYPES); +tcase_add_loop_test(tc_core, virgl_test_transfer_res_write_valid, 0, PIPE_MAX_TEXTURE_TYPES);
+--
+2.31.1meta/recipes-graphics/virglrenderer/virglrenderer/cve-2022- new file +1
-0+(quoted diff) +0
-0graphics/virglrenderer/virglrenderer_0.8.2.bb b/meta/recipes- graphics/virglrenderer/virglrenderer_0.8.2.bb
index7f035f820a..d92359565a100644meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb +0
-0@@ -13,6 +13,8 @@ SRCREV ="
7d204f3927be65fb3365dce01dbcd04d447a4985"
SRC_URI= "git://anongit.freedesktop.org/virglrenderer;branch=master\
file://0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch \
file://0001-meson.build-use-python3-directly-for-python.patch \
+ file://cve-2022-0135.patch \
+ file://cve-2022-0175.patch \
"
S = "${WORKDIR}/git"