diff options
Diffstat (limited to 'meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2019-18391.patch')
-rw-r--r-- | meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2019-18391.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2019-18391.patch b/meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2019-18391.patch new file mode 100644 index 0000000000..cc641d8293 --- /dev/null +++ b/meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2019-18391.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | From 2abeb1802e3c005b17a7123e382171b3fb665971 Mon Sep 17 00:00:00 2001 | ||
2 | From: Gert Wollny <gert.wollny@collabora.com> | ||
3 | Date: Tue, 8 Oct 2019 17:27:01 +0200 | ||
4 | Subject: [PATCH] vrend: check that the transfer iov holds enough data for the | ||
5 | data upload | ||
6 | |||
7 | Closes #140 | ||
8 | |||
9 | Signed-off-by: Gert Wollny <gert.wollny@collabora.com> | ||
10 | Reviewed-by: Emil Velikov <emil.velikov@collabora.com> | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | [https://gitlab.freedesktop.org/virgl/virglrenderer/commit/2abeb1802e3c005b17a7123e382171b3fb665971] | ||
14 | CVE: CVE-2019-18391 | ||
15 | Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> | ||
16 | --- | ||
17 | src/vrend_renderer.c | 11 +++++++++-- | ||
18 | 1 file changed, 9 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c | ||
21 | index 694e1d0e..fe23846b 100644 | ||
22 | --- a/src/vrend_renderer.c | ||
23 | +++ b/src/vrend_renderer.c | ||
24 | @@ -7005,15 +7005,22 @@ static int vrend_renderer_transfer_write_iov(struct vrend_context *ctx, | ||
25 | invert = true; | ||
26 | } | ||
27 | |||
28 | + send_size = util_format_get_nblocks(res->base.format, info->box->width, | ||
29 | + info->box->height) * elsize; | ||
30 | + if (res->target == GL_TEXTURE_3D || | ||
31 | + res->target == GL_TEXTURE_2D_ARRAY || | ||
32 | + res->target == GL_TEXTURE_CUBE_MAP_ARRAY) | ||
33 | + send_size *= info->box->depth; | ||
34 | + | ||
35 | if (need_temp) { | ||
36 | - send_size = util_format_get_nblocks(res->base.format, info->box->width, | ||
37 | - info->box->height) * elsize * info->box->depth; | ||
38 | data = malloc(send_size); | ||
39 | if (!data) | ||
40 | return ENOMEM; | ||
41 | read_transfer_data(iov, num_iovs, data, res->base.format, info->offset, | ||
42 | stride, layer_stride, info->box, invert); | ||
43 | } else { | ||
44 | + if (send_size > iov[0].iov_len - info->offset) | ||
45 | + return EINVAL; | ||
46 | data = (char*)iov[0].iov_base + info->offset; | ||
47 | } | ||
48 | |||
49 | -- | ||
50 | 2.24.1 | ||
51 | |||