Tomeu Vizoso
2017-Nov-27 14:21 UTC
[PATCH] drm/virtio: Don't return invalid caps on timeout
If the wait timeouts, the caps are probably invalid and we shouldn't be passing them to userspace. Signed-off-by: Tomeu Vizoso <tomeu.vizoso at collabora.com> --- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c index b94bd5440e57..902120ad4a6d 100644 --- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c +++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c @@ -517,6 +517,8 @@ static int virtio_gpu_get_caps_ioctl(struct drm_device *dev, ret = wait_event_timeout(vgdev->resp_wq, atomic_read(&cache_ent->is_valid), 5 * HZ); + if (!ret) + return -EBUSY; ptr = cache_ent->caps_cache; -- 2.14.3
Reasonably Related Threads
- [PATCH] drm/virtio: Don't return invalid caps on timeout
- [PATCH AUTOSEL 4.14 15/60] drm/virtio: Add memory barriers for capset cache.
- [PATCH AUTOSEL 4.9 13/45] drm/virtio: Add memory barriers for capset cache.
- [PATCH AUTOSEL 4.4 10/35] drm/virtio: Add memory barriers for capset cache.
- [PATCH 1/4] drm/virtio: Ensure cached capset entries are valid before copying.