Commit a73b603f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2022-11-17' of... 

Merge tag 'drm-intel-fixes-2022-11-17' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

- Fix uaf with lmem_userfault_list handling (Matthew Auld)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Y3X2bNJ/4GR1BAiG@tursulin-desk
parents 5fa88138 4f68332b

drivers/gpu/drm/i915/gem/i915_gem_ttm.c

+3 −3
Original line number Diff line number Diff line
@@ -1013,9 +1013,6 @@ static vm_fault_t vm_fault_ttm(struct vm_fault *vmf) 
		return VM_FAULT_SIGBUS;

	}



	if (i915_ttm_cpu_maps_iomem(bo->resource))

		wakeref = intel_runtime_pm_get(&to_i915(obj->base.dev)->runtime_pm);



	if (!i915_ttm_resource_mappable(bo->resource)) {

		int err = -ENODEV;

		int i;
@@ -1042,6 +1039,9 @@ static vm_fault_t vm_fault_ttm(struct vm_fault *vmf) 
		}

	}



	if (i915_ttm_cpu_maps_iomem(bo->resource))

		wakeref = intel_runtime_pm_get(&to_i915(obj->base.dev)->runtime_pm);



	if (drm_dev_enter(dev, &idx)) {

		ret = ttm_bo_vm_fault_reserved(vmf, vmf->vma->vm_page_prot,

					       TTM_BO_VM_NUM_PREFAULT);