drm/i915: Protect private gem objects from truncate (such as imported dmabuf)

[deliverable/linux.git] / drivers / gpu / drm / i915 / i915_gem.c

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 1ec5f7ef2cc2417b32cccdf55de09ec84649d608..eb54a6d8151729c0982cf115b660dfa1d3c5129c 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1385,6 +1385,11 @@ i915_gem_object_truncate(struct drm_i915_gem_object *obj)
 {
        struct inode *inode;
 
+       i915_gem_object_free_mmap_offset(obj);
+
+       if (obj->base.filp == NULL)
+               return;
+
        /* Our goal here is to return as much of the memory as
         * is possible back to the system as we are called from OOM.
         * To do this we must instruct the shmfs to drop all of its
@@ -1393,8 +1398,6 @@ i915_gem_object_truncate(struct drm_i915_gem_object *obj)
        inode = obj->base.filp->f_path.dentry->d_inode;
        shmem_truncate_range(inode, 0, (loff_t)-1);
 
-       i915_gem_object_free_mmap_offset(obj);
-
        obj->madv = __I915_MADV_PURGED;
 }