]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/i915/gvt: fix dropping obj reference twice
authorPan Bian <bianpan2016@163.com>
Wed, 6 Nov 2019 07:31:07 +0000 (15:31 +0800)
committerZhenyu Wang <zhenyuw@linux.intel.com>
Fri, 8 Nov 2019 03:04:07 +0000 (11:04 +0800)
The reference count of obj will be decremented twice if error occurs
in dma_buf_fd(). Additionally, attempting to read the reference count of
obj after dropping reference may lead to a use after free bug. Here, we
drop obj's reference until it is not used.

Fixes: e546e281d33d ("drm/i915/gvt: Dmabuf support for GVT-g")
Signed-off-by: Pan Bian <bianpan2016@163.com>
Reviewed-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
drivers/gpu/drm/i915/gvt/dmabuf.c

index 13044c027f272ba02d5c4a370d204287bd317d73..4bfaefdf548d1f3f02fc0b21a95f5a544a0199aa 100644 (file)
@@ -498,8 +498,6 @@ int intel_vgpu_get_dmabuf(struct intel_vgpu *vgpu, unsigned int dmabuf_id)
                goto out_free_gem;
        }
 
-       i915_gem_object_put(obj);
-
        ret = dma_buf_fd(dmabuf, DRM_CLOEXEC | DRM_RDWR);
        if (ret < 0) {
                gvt_vgpu_err("create dma-buf fd failed ret:%d\n", ret);
@@ -524,6 +522,8 @@ int intel_vgpu_get_dmabuf(struct intel_vgpu *vgpu, unsigned int dmabuf_id)
                    file_count(dmabuf->file),
                    kref_read(&obj->base.refcount));
 
+       i915_gem_object_put(obj);
+
        return dmabuf_fd;
 
 out_free_dmabuf: