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 (file)
index 0000000..889987a
--- /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 <harshit.m.mogalapalli@oracle.com>
+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 <harshit.m.mogalapalli@oracle.com>
+Message-ID: <20230302172538.3508747-1-harshit.m.mogalapalli@oracle.com>
+
+From: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
+
+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 <harshit.m.mogalapalli@oracle.com>
+Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 b8e2a73eb73f99107d6d05584fca4a9d4adee7c0..4ad186dd63489e9bc87bf09ce6ba80bf72fb8dd0 100644 (file)
--- 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