Merge tag 'drm-intel-fixes-2019-08-15' of... (a85abd5d) · Commits · 戴 / test

Merge tag 'drm-intel-fixes-2019-08-15' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes drm/i915 fixes for v5.4-rc5: - GVT use-after-free fix Signed-off-by:

Dave Airlie <airlied@redhat.com> From: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/87zhkag9ic.fsf@intel.com

drivers/gpu/drm/i915/gvt/scheduler.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1528,9 +1528,9 @@ intel_vgpu_create_workload(struct intel_vgpu *vgpu, int ring_id,
		if (!intel_gvt_ggtt_validate_range(vgpu,
		workload->wa_ctx.indirect_ctx.guest_gma,
		workload->wa_ctx.indirect_ctx.size)) {
		kmem_cache_free(s->workloads, workload);
		gvt_vgpu_err("invalid wa_ctx at: 0x%lx\n",
		workload->wa_ctx.indirect_ctx.guest_gma);
		kmem_cache_free(s->workloads, workload);
		return ERR_PTR(-EINVAL);
		}
		}
		@@ -1542,9 +1542,9 @@ intel_vgpu_create_workload(struct intel_vgpu *vgpu, int ring_id,
		if (!intel_gvt_ggtt_validate_range(vgpu,
		workload->wa_ctx.per_ctx.guest_gma,
		CACHELINE_BYTES)) {
		kmem_cache_free(s->workloads, workload);
		gvt_vgpu_err("invalid per_ctx at: 0x%lx\n",
		workload->wa_ctx.per_ctx.guest_gma);
		kmem_cache_free(s->workloads, workload);
		return ERR_PTR(-EINVAL);
		}
		}

Admin message