Commit d89c0c83 authored by Vivek Kasireddy's avatar Vivek Kasireddy Committed by Gerd Hoffmann
Browse files

drm/virtio: Fix NULL dereference error in virtio_gpu_poll 



When virgl is not enabled, vfpriv pointer would not be allocated.
Therefore, check for a valid value before dereferencing.

Reported-by: default avatarChristian Zigotzky <chzigotzky@xenosoft.de>
Cc: Gurchetan Singh <gurchetansingh@chromium.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarVivek Kasireddy <vivek.kasireddy@intel.com>
Tested-by: default avatarChristian Zigotzky <chzigotzky@xenosoft.de>
Link: http://patchwork.freedesktop.org/patch/msgid/20211104214249.1802789-1-vivek.kasireddy@intel.com


Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 14d9a37c

drivers/gpu/drm/virtio/virtgpu_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -163,10 +163,11 @@ static __poll_t virtio_gpu_poll(struct file *filp, 
	struct drm_file *drm_file = filp->private_data;

	struct virtio_gpu_fpriv *vfpriv = drm_file->driver_priv;

	struct drm_device *dev = drm_file->minor->dev;

	struct virtio_gpu_device *vgdev = dev->dev_private;

	struct drm_pending_event *e = NULL;

	__poll_t mask = 0;



	if (!vfpriv->ring_idx_mask)

	if (!vgdev->has_virgl_3d || !vfpriv || !vfpriv->ring_idx_mask)

		return drm_poll(filp, wait);



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