This is a note to let you know that I've just added the patch titled
drm/virtio: Fix NULL vs IS_ERR checking in virtio_gpu_object_shmem_init
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-virtio-fix-null-vs-is_err-checking-in-virtio_gpu_object_shmem_init.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From c24968734abfed81c8f93dc5f44a7b7a9aecadfa Mon Sep 17 00:00:00 2001
From: Miaoqian Lin <linmq006@xxxxxxxxx>
Date: Thu, 2 Jun 2022 14:42:22 +0400
Subject: drm/virtio: Fix NULL vs IS_ERR checking in virtio_gpu_object_shmem_init
From: Miaoqian Lin <linmq006@xxxxxxxxx>
commit c24968734abfed81c8f93dc5f44a7b7a9aecadfa upstream.
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 <linmq006@xxxxxxxxx>
Link: http://patchwork.freedesktop.org/patch/msgid/20220602104223.54527-1-linmq006@xxxxxxxxx
Signed-off-by: Gerd Hoffmann <kraxel@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ovidiu Panait <ovidiu.panait@xxxxxxxxxxxxx>
---
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
@@ -157,9 +157,9 @@ static int virtio_gpu_object_shmem_init(
* 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) {
Patches currently in stable-queue which might be from linmq006@xxxxxxxxx are
queue-5.10/drm-virtio-fix-null-vs-is_err-checking-in-virtio_gpu_object_shmem_init.patch
