From e09539a04285b616ebcc50f2f6b75ad7fbb0aec5 Mon Sep 17 00:00:00 2001 From: JP Abgrall Date: Fri, 13 Dec 2013 14:24:36 -0800 Subject: [PATCH] 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 [jstultz: modified patch to apply to staging directory] Signed-off-by: John Stultz Signed-off-by: Greg Kroah-Hartman --- drivers/staging/android/ion/ion.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index b965f1559536..b2dcee5ceae5 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/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); -- 2.20.1