drm/i915/gem: don't trust the dma_buf->size

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / gem / i915_gem_dmabuf.c

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
index 0dd477e..dc11497 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
@@ -114,8 +114,7 @@ static int i915_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct *
        if (ret)
                return ret;
 
-       fput(vma->vm_file);
-       vma->vm_file = get_file(obj->base.filp);
+       vma_set_file(vma, obj->base.filp);
 
        return 0;
 }
@@ -245,6 +244,16 @@ struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev,
                }
        }
 
+       /*
+        * XXX: There is a prevalence of the assumption that we fit the
+        * object's page count inside a 32bit _signed_ variable. Let's document
+        * this and catch if we ever need to fix it. In the meantime, if you do
+        * spot such a local variable, please consider fixing!
+        */
+
+       if (dma_buf->size >> PAGE_SHIFT > INT_MAX)
+               return ERR_PTR(-E2BIG);
+
        /* need to attach */
        attach = dma_buf_attach(dma_buf, dev->dev);
        if (IS_ERR(attach))