From: JP Abgrall <jpa@google.com>
Date: Mon, 15 Apr 2013 21:23:14 +0000 (-0700)
Subject: gpu: ion: fix kfree/list_del order
X-Git-Tag: firefly_0821_release~4090^2~586
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8c47868929816b87219c0f75229595b06a8f6c2e;p=firefly-linux-kernel-4.4.55.git

gpu: ion: fix kfree/list_del order

With CONFIG_SLUB_DEBUG_ON it would panic during
ion_alloc()
 ion_buffer_create()
   io_heap_drain_freelist()

Signed-off-by: JP Abgrall <jpa@google.com>
---

diff --git a/drivers/gpu/ion/ion.c b/drivers/gpu/ion/ion.c
index 200b1ad104a2..d2d05139a2b0 100644
--- a/drivers/gpu/ion/ion.c
+++ b/drivers/gpu/ion/ion.c
@@ -1342,8 +1342,8 @@ static bool ion_heap_drain_freelist(struct ion_heap *heap)
 		return false;
 	rt_mutex_lock(&heap->lock);
 	list_for_each_entry_safe(buffer, tmp, &heap->free_list, list) {
-		_ion_buffer_destroy(buffer);
 		list_del(&buffer->list);
+		_ion_buffer_destroy(buffer);
 	}
 	BUG_ON(!list_empty(&heap->free_list));
 	rt_mutex_unlock(&heap->lock);