summaryrefslogtreecommitdiffstats
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
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-16 16:44:53 +0000
commit95a319c7b43c582c8b8fc317270a595cfe8a0bb0 (patch)
tree546a724f246943b806e985563fea11db164942bc /meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2020-8002.patch
parentae1001ab3a82de100619878644ff5e20d276eb6c (diff)
downloadpoky-95a319c7b43c582c8b8fc317270a595cfe8a0bb0.tar.gz
virglrenderer: fix multiple CVEs
fix these CVE: CVE-2019-18390 CVE-2019-18391 CVE-2020-8002 (From OE-Core rev: 74a1ec4a39fe3b05045c1d60a89393cd25eccb1f) Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 @@
1From 63bcca251f093d83da7e290ab4bbd38ae69089b5 Mon Sep 17 00:00:00 2001
2From: Gert Wollny <gert.wollny@collabora.com>
3Date: Wed, 15 Jan 2020 13:43:58 +0100
4Subject: [PATCH] vrend: Don't try launching a grid if no CS is available
5
6Closes #155
7
8Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
9Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
10
11Upstream-Status: Backport
12[https://gitlab.freedesktop.org/virgl/virglrenderer/-/commit/63bcca251f093d83da7e290ab4bbd38ae69089b5.patch]
13CVE: CVE-2020-8002
14Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
15---
16 src/vrend_renderer.c | 7 +++++++
17 1 file changed, 7 insertions(+)
18
19diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c
20index a054bad8..2280fc43 100644
21--- a/src/vrend_renderer.c
22+++ b/src/vrend_renderer.c
23@@ -4604,6 +4604,13 @@ void vrend_launch_grid(struct vrend_context *ctx,
24 }
25 ctx->sub->shader_dirty = true;
26 }
27+
28+ if (!ctx->sub->prog) {
29+ vrend_printf("%s: Skipping compute shader execution due to missing shaders: %s\n",
30+ __func__, ctx->debug_name);
31+ return;
32+ }
33+
34 vrend_use_program(ctx, ctx->sub->prog->id);
35
36 vrend_draw_bind_ubo_shader(ctx, PIPE_SHADER_COMPUTE, 0);
37--
382.24.1
39