From 0398b56b691e055085fe7cef2e2bad150497dce3 Mon Sep 17 00:00:00 2001 From: Ali Abdallah Date: Mar 10 2023 07:48:20 +0000 Subject: Merge remote-tracking branch 'remotes/origin/users/pjakobsson/SLE15-SP3-LTSS/for-next' into SLE15-SP3-LTSS Pull virtio_gpu fix from Patrik Jakobsson. --- diff --git a/patches.suse/drm-virtio-Fix-NULL-vs-IS_ERR-checking-in-virtio_gpu.patch b/patches.suse/drm-virtio-Fix-NULL-vs-IS_ERR-checking-in-virtio_gpu.patch new file mode 100644 index 0000000..366bca4 --- /dev/null +++ b/patches.suse/drm-virtio-Fix-NULL-vs-IS_ERR-checking-in-virtio_gpu.patch @@ -0,0 +1,36 @@ +From c24968734abfed81c8f93dc5f44a7b7a9aecadfa Mon Sep 17 00:00:00 2001 +From: Miaoqian Lin +Date: Thu, 2 Jun 2022 14:42:22 +0400 +Subject: drm/virtio: Fix NULL vs IS_ERR checking in + virtio_gpu_object_shmem_init +Git-commit: c24968734abfed81c8f93dc5f44a7b7a9aecadfa +Patch-mainline: v6.0-rc1 +References: bsc#1208776 CVE-2023-22998 + +Since drm_prime_pages_to_sg() function return error pointers. +The drm_gem_shmem_get_sg_table() function returns error pointers too. +Using IS_ERR() to check the return value to fix this. + +Fixes: 2f2aa13724d5 ("drm/virtio: move virtio_gpu_mem_entry initialization to new function") +Signed-off-by: Miaoqian Lin +Link: http://patchwork.freedesktop.org/patch/msgid/20220602104223.54527-1-linmq006@gmail.com +Signed-off-by: Gerd Hoffmann +Acked-by: Patrik Jakobsson +--- + drivers/gpu/drm/virtio/virtgpu_object.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/virtio/virtgpu_object.c ++++ b/drivers/gpu/drm/virtio/virtgpu_object.c +@@ -158,9 +158,9 @@ + * since virtio_gpu doesn't support dma-buf import from other devices. + */ + shmem->pages = drm_gem_shmem_get_sg_table(&bo->base.base); +- if (!shmem->pages) { ++ if (IS_ERR(shmem->pages)) { + drm_gem_shmem_unpin(&bo->base.base); +- return -EINVAL; ++ return PTR_ERR(shmem->pages); + } + + if (use_dma_api) { diff --git a/series.conf b/series.conf index 5dbcdef..700ab83 100644 --- a/series.conf +++ b/series.conf @@ -57249,6 +57249,7 @@ patches.suse/drm-mipi-dbi-align-max_chunk-to-2-in-spi_transfer.patch patches.suse/drm-nouveau-fix-another-off-by-one-in-nvbios_addr.patch patches.suse/virtio-gpu-fix-a-missing-check-to-avoid-NULL-derefer.patch + patches.suse/drm-virtio-Fix-NULL-vs-IS_ERR-checking-in-virtio_gpu.patch patches.suse/drm-adv7511-override-i2c-address-of-cec-before-acces.patch patches.suse/fbcon-Fix-boundary-checks-for-fbcon-vc-n1-n2-paramet.patch patches.suse/drm-bridge-adv7511-Add-check-for-mipi_dsi_driver_reg.patch