msm: kgsl: Delete the context event while the context is still valid
Make sure that the context is freed only after the event is deleted
from the list to avoid accessing invalid list pointers. This makes
sure that the context memory is not accessed after being freed.
Change-Id: I9196219f1472396c0063dbeaa5351f66e6e5648f
Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>
Signed-off-by: Uma Maheshwari Bhiram <ubhira@codeaurora.org>
diff --git a/drivers/gpu/msm/kgsl_events.c b/drivers/gpu/msm/kgsl_events.c
index 6798eed..9e9c0da 100644
--- a/drivers/gpu/msm/kgsl_events.c
+++ b/drivers/gpu/msm/kgsl_events.c
@@ -149,6 +149,7 @@
* Send the current timestamp so the event knows how far the
* system got before the event was canceled
*/
+ list_del(&event->list);
trace_kgsl_fire_event(id, cur, jiffies - event->created);
@@ -156,7 +157,6 @@
event->func(device, event->priv, id, cur);
kgsl_context_put(context);
- list_del(&event->list);
kfree(event);
kgsl_active_count_put(device);
@@ -192,6 +192,7 @@
* the callback knows how far the GPU made it before things went
* explosion
*/
+ list_del(&event->list);
trace_kgsl_fire_event(KGSL_MEMSTORE_GLOBAL, cur,
jiffies - event->created);
@@ -202,8 +203,6 @@
if (event->context)
kgsl_context_put(event->context);
-
- list_del(&event->list);
kfree(event);
kgsl_active_count_put(device);
@@ -229,6 +228,7 @@
* confused if they don't bother comparing the current timetamp
* to the timestamp they wanted
*/
+ list_del(&event->list);
trace_kgsl_fire_event(id, event->timestamp,
jiffies - event->created);
@@ -238,8 +238,6 @@
if (event->context)
kgsl_context_put(event->context);
-
- list_del(&event->list);
kfree(event);
kgsl_active_count_put(device);