From: Greg Kroah-Hartman Date: Fri, 10 Mar 2023 12:07:52 +0000 (+0100) Subject: 5.15-stable patches X-Git-Tag: v6.1.17~21 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=626c3d71996b71dd191d7e3a5df17fc7b0644d30;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: drm-virtio-fix-error-code-in-virtio_gpu_object_shmem_init.patch --- diff --git a/queue-5.15/drm-virtio-fix-error-code-in-virtio_gpu_object_shmem_init.patch b/queue-5.15/drm-virtio-fix-error-code-in-virtio_gpu_object_shmem_init.patch new file mode 100644 index 00000000000..889987a7eca --- /dev/null +++ b/queue-5.15/drm-virtio-fix-error-code-in-virtio_gpu_object_shmem_init.patch @@ -0,0 +1,39 @@ +From harshit.m.mogalapalli@oracle.com Fri Mar 10 13:06:40 2023 +From: Harshit Mogalapalli +Date: Thu, 2 Mar 2023 09:25:38 -0800 +Subject: drm/virtio: Fix error code in virtio_gpu_object_shmem_init() +To: dmitry.osipenko@collabora.com, stable@vger.kernel.org +Cc: kraxel@redhat.com, linux-kernel@vger.kernel.org, emil.l.velikov@gmail.com, airlied@linux.ie, error27@gmail.com, darren.kenny@oracle.com, vegard.nossum@oracle.com, Harshit Mogalapalli +Message-ID: <20230302172538.3508747-1-harshit.m.mogalapalli@oracle.com> + +From: Harshit Mogalapalli + +In virtio_gpu_object_shmem_init() we are passing NULL to PTR_ERR, which +is returning 0/success. + +Fix this by storing error value in 'ret' variable before assigning +shmem->pages to NULL. + +Found using static analysis with Smatch. + +Fixes: 64b88afbd92f ("drm/virtio: Correct drm_gem_shmem_get_sg_table() error handling") +Signed-off-by: Harshit Mogalapalli +Reviewed-by: Dmitry Osipenko +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/virtio/virtgpu_object.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/virtio/virtgpu_object.c ++++ b/drivers/gpu/drm/virtio/virtgpu_object.c +@@ -169,8 +169,9 @@ static int virtio_gpu_object_shmem_init( + shmem->pages = drm_gem_shmem_get_sg_table(&bo->base); + if (IS_ERR(shmem->pages)) { + drm_gem_shmem_unpin(&bo->base); ++ ret = PTR_ERR(shmem->pages); + shmem->pages = NULL; +- return PTR_ERR(shmem->pages); ++ return ret; + } + + if (use_dma_api) { diff --git a/queue-5.15/series b/queue-5.15/series index b8e2a73eb73..4ad186dd634 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -127,3 +127,4 @@ drm-display-dp_mst-fix-down-up-message-handling-after-sink-disconnect.patch drm-display-dp_mst-fix-down-message-handling-after-a-packet-reception-error.patch bluetooth-hci_sock-purge-socket-queues-in-the-destruct-callback.patch media-uvcvideo-fix-race-condition-with-usb_kill_urb.patch +drm-virtio-fix-error-code-in-virtio_gpu_object_shmem_init.patch