[PATCH] drm/i915: Fix use-after-free of context during free_contexts

* [PATCH] drm/i915: Fix use-after-free of context during free_contexts
@ 2017-06-30 23:05 Chris Wilson
  2017-06-30 23:23 ` ✓ Fi.CI.BAT: success for " Patchwork
  2017-06-30 23:42 ` [PATCH] " Matthew Auld
  0 siblings, 2 replies; 4+ messages in thread
From: Chris Wilson @ 2017-06-30 23:05 UTC (permalink / raw)
  To: intel-gfx; +Cc: Matthew Auld

When iterating the list of contexts to free, we need to use a safe
iterator as we are freeing the link as we go. Pass an extra thick brown
paper bag.

Fixes: 5f09a9c8ab6b ("drm/i915: Allow contexts to be unreferenced locklessly")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
---
 drivers/gpu/drm/i915/i915_gem_context.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 71d2ea7dab64..2eb5d8203999 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -193,11 +193,11 @@ static void i915_gem_context_free(struct i915_gem_context *ctx)
 static void contexts_free(struct drm_i915_private *i915)
 {
 	struct llist_node *freed = llist_del_all(&i915->contexts.free_list);
-	struct i915_gem_context *ctx;
+	struct i915_gem_context *ctx, *cn;
 
 	lockdep_assert_held(&i915->drm.struct_mutex);
 
-	llist_for_each_entry(ctx, freed, free_link)
+	llist_for_each_entry_safe(ctx, cn, freed, free_link)
 		i915_gem_context_free(ctx);
 }
 
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 4+ messages in thread