Commit daa37200 authored by Jani Nikula's avatar Jani Nikula
Browse files

Merge tag 'gvt-fixes-2019-08-13' of https://github.com/intel/gvt-linux into drm-intel-fixes 



gvt-fixes-2019-08-13

- Fix one use-after-free error (Dan)

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
From: Zhenyu Wang <zhenyuw@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190813095845.GF19140@zhen-hp.sh.intel.com
parents d45331b0 eac4471d

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

+2 −2
Original line number Original line 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,

			if (!intel_gvt_ggtt_validate_range(vgpu,

				workload->wa_ctx.indirect_ctx.guest_gma,

				workload->wa_ctx.indirect_ctx.guest_gma,

				workload->wa_ctx.indirect_ctx.size)) {

				workload->wa_ctx.indirect_ctx.size)) {

				kmem_cache_free(s->workloads, workload);

				gvt_vgpu_err("invalid wa_ctx at: 0x%lx\n",

				gvt_vgpu_err("invalid wa_ctx at: 0x%lx\n",

				    workload->wa_ctx.indirect_ctx.guest_gma);

				    workload->wa_ctx.indirect_ctx.guest_gma);

				kmem_cache_free(s->workloads, workload);

				return ERR_PTR(-EINVAL);

				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,

			if (!intel_gvt_ggtt_validate_range(vgpu,

				workload->wa_ctx.per_ctx.guest_gma,

				workload->wa_ctx.per_ctx.guest_gma,

				CACHELINE_BYTES)) {

				CACHELINE_BYTES)) {

				kmem_cache_free(s->workloads, workload);

				gvt_vgpu_err("invalid per_ctx at: 0x%lx\n",

				gvt_vgpu_err("invalid per_ctx at: 0x%lx\n",

					workload->wa_ctx.per_ctx.guest_gma);

					workload->wa_ctx.per_ctx.guest_gma);

				kmem_cache_free(s->workloads, workload);

				return ERR_PTR(-EINVAL);

				return ERR_PTR(-EINVAL);

			}

			}

		}

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE