Merge "disp: msm: sde: return latest rsvp_next pointer on poll timeouts"

2020-09-18 00:12:13 -07:00
parent c16eaa7924 6e8693a6ef
commit 3ac7505d1d
1 changed files with 2 additions and 2 deletions
--- a/msm/sde/sde_rm.c
+++ b/msm/sde/sde_rm.c
@@ -2389,8 +2389,8 @@ struct sde_rm_rsvp *_sde_rm_poll_get_rsvp_nxt_locked(struct sde_rm *rm,
 		usleep_range(sleep, sleep * 2);
 		mutex_lock(&rm->rm_lock);
 	}
-
-	return rsvp_nxt;
+	/* make sure to get latest rsvp_next to avoid use after free issues  */
+	return _sde_rm_get_rsvp_nxt(rm, enc);
 }

 int sde_rm_reserve(