Commit 84edf537 authored by Matthew Brost's avatar Matthew Brost Committed by Tvrtko Ursulin
Browse files

drm/i915: Fix bug in user proto-context creation that leaked contexts 



Set number of engines before attempting to create contexts so the
function free_engines can clean up properly. Also check return of
alloc_engines for NULL.

v2:
 (Tvrtko)
  - Send as stand alone patch
 (John Harrison)
  - Check for alloc_engines returning NULL
v3:
 (Checkpatch / Tvrtko)
  - Remove braces around single line if statement

Cc: Jason Ekstrand <jason@jlekstrand.net>
Fixes: d4433c76 ("drm/i915/gem: Use the proto-context to handle create parameters (v5)")
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211001155825.6762-1-matthew.brost@intel.com
parent 4b2437f6

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

+4 −1
Original line number Diff line number Diff line
@@ -941,6 +941,10 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx, 
	unsigned int n;



	e = alloc_engines(num_engines);

	if (!e)

		return ERR_PTR(-ENOMEM);

	e->num_engines = num_engines;



	for (n = 0; n < num_engines; n++) {

		struct intel_context *ce;

		int ret;
@@ -974,7 +978,6 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx, 
			goto free_engines;

		}

	}

	e->num_engines = num_engines;



	return e;