0007-vhost-user-gpu-fix-OOB-write-in-virgl_cmd_get_capset.patch 1.6 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849
  1. CVE: CVE-2021-3546
  2. Upstream-Status: Backport
  3. Signed-off-by: Ross Burton <ross.burton@arm.com>
  4. From 9f22893adcb02580aee5968f32baa2cd109b3ec2 Mon Sep 17 00:00:00 2001
  5. From: Li Qiang <liq3ea@163.com>
  6. Date: Sat, 15 May 2021 20:04:02 -0700
  7. Subject: [PATCH 7/7] vhost-user-gpu: fix OOB write in 'virgl_cmd_get_capset'
  8. (CVE-2021-3546)
  9. MIME-Version: 1.0
  10. Content-Type: text/plain; charset=UTF-8
  11. Content-Transfer-Encoding: 8bit
  12. If 'virgl_cmd_get_capset' set 'max_size' to 0,
  13. the 'virgl_renderer_fill_caps' will write the data after the 'resp'.
  14. This patch avoid this by checking the returned 'max_size'.
  15. virtio-gpu fix: abd7f08b23 ("display: virtio-gpu-3d: check
  16. virgl capabilities max_size")
  17. Fixes: CVE-2021-3546
  18. Reported-by: Li Qiang <liq3ea@163.com>
  19. Reviewed-by: Prasad J Pandit <pjp@fedoraproject.org>
  20. Signed-off-by: Li Qiang <liq3ea@163.com>
  21. Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
  22. Message-Id: <20210516030403.107723-8-liq3ea@163.com>
  23. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
  24. ---
  25. contrib/vhost-user-gpu/virgl.c | 4 ++++
  26. 1 file changed, 4 insertions(+)
  27. diff --git a/contrib/vhost-user-gpu/virgl.c b/contrib/vhost-user-gpu/virgl.c
  28. index a16a311d80..7172104b19 100644
  29. --- a/contrib/vhost-user-gpu/virgl.c
  30. +++ b/contrib/vhost-user-gpu/virgl.c
  31. @@ -177,6 +177,10 @@ virgl_cmd_get_capset(VuGpu *g,
  32. virgl_renderer_get_cap_set(gc.capset_id, &max_ver,
  33. &max_size);
  34. + if (!max_size) {
  35. + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER;
  36. + return;
  37. + }
  38. resp = g_malloc0(sizeof(*resp) + max_size);
  39. resp->hdr.type = VIRTIO_GPU_RESP_OK_CAPSET;
  40. --
  41. 2.25.1