Re: [PATCH] drm/virtio: add null check in virtio_gpu_poll

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 





On Mon, Nov 15, 2021 at 9:58 AM Gurchetan Singh <gurchetansingh@xxxxxxxxxxxx> wrote:
From: Gurchetan Singh <gurchetansingh@xxxxxxxxxxxx>

If vfpriv is null, we shouldn't check vfpriv->ring_idx_mask.

Signed-off-by: Gurchetan Singh <gurchetansingh@xxxxxxxxxxxx>
---
 drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c
index 749db18dcfa2..7975ea06b316 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.c
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.c
@@ -166,7 +166,7 @@ static __poll_t virtio_gpu_poll(struct file *filp,
        struct drm_pending_event *e = NULL;
        __poll_t mask = 0;

-       if (!vfpriv->ring_idx_mask)
+       if (!vfpriv || !vfpriv->ring_idx_mask)
                return drm_poll(filp, wait);

        poll_wait(filp, &drm_file->event_wait, wait);

Nevermind, looks like fix was merged in the main tree and will make it back to to drm-misc-next:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d89c0c8322ecdc9a2ec84b959b6f766be082da76

--
2.34.0.rc1.387.gb447b232ab-goog


[Index of Archives]     [Linux DRI Users]     [Linux Intel Graphics]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux