aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2020-8002.patch
diff options
context:
space:
mode:
authorLee Chee Yang <chee.yang.lee@intel.com>2020-03-02 14:32:59 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2020-03-04 10:54:01 +0800
commitfb0b056cba2b3b6e92427996f098333bf09f0ee9 (patch)
tree8b4c6086957d079c57f7586093722bd8d4e3720e /meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2020-8002.patch
parent46fd0c6a8d98adb62bf1116bba26c83950d59813 (diff)
downloadopenembedded-core-contrib-anujm/zeus2.tar.gz
virglrenderer: fix multiple CVEsanujm/zeus2
fix these CVE: CVE-2019-18390 CVE-2019-18391 CVE-2020-8002 Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2020-8002.patch')
-rw-r--r--meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2020-8002.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2020-8002.patch b/meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2020-8002.patch
new file mode 100644
index 0000000000..925f2c8eb0
--- /dev/null
+++ b/meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2020-8002.patch
@@ -0,0 +1,39 @@
+From 63bcca251f093d83da7e290ab4bbd38ae69089b5 Mon Sep 17 00:00:00 2001
+From: Gert Wollny <gert.wollny@collabora.com>
+Date: Wed, 15 Jan 2020 13:43:58 +0100
+Subject: [PATCH] vrend: Don't try launching a grid if no CS is available
+
+Closes #155
+
+Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
+Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
+
+Upstream-Status: Backport
+[https://gitlab.freedesktop.org/virgl/virglrenderer/-/commit/63bcca251f093d83da7e290ab4bbd38ae69089b5.patch]
+CVE: CVE-2020-8002
+Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
+---
+ src/vrend_renderer.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c
+index a054bad8..2280fc43 100644
+--- a/src/vrend_renderer.c
++++ b/src/vrend_renderer.c
+@@ -4604,6 +4604,13 @@ void vrend_launch_grid(struct vrend_context *ctx,
+ }
+ ctx->sub->shader_dirty = true;
+ }
++
++ if (!ctx->sub->prog) {
++ vrend_printf("%s: Skipping compute shader execution due to missing shaders: %s\n",
++ __func__, ctx->debug_name);
++ return;
++ }
++
+ vrend_use_program(ctx, ctx->sub->prog->id);
+
+ vrend_draw_bind_ubo_shader(ctx, PIPE_SHADER_COMPUTE, 0);
+--
+2.24.1
+