]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
vmwgfx: Only allow 64x64 cursors
authorJakob Bornecrantz <jakob@vmware.com>
Wed, 9 Nov 2011 09:25:28 +0000 (10:25 +0100)
committerDave Airlie <airlied@redhat.com>
Fri, 11 Nov 2011 10:58:26 +0000 (10:58 +0000)
Snooping code expects this to be the case.

Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

index 40c7e617e28b943fda6b160d098104be5b24df45..880e285d7578afa3ebeae75de4dad77443d754ce 100644 (file)
@@ -105,6 +105,10 @@ int vmw_du_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv,
        struct vmw_dma_buffer *dmabuf = NULL;
        int ret;
 
+       /* A lot of the code assumes this */
+       if (handle && (width != 64 || height != 64))
+               return -EINVAL;
+
        if (handle) {
                ret = vmw_user_surface_lookup_handle(dev_priv, tfile,
                                                     handle, &surface);