Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fc64667 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/tmr: fix corruption of the pending list when rescheduling an alarm 



At least therm/fantog "attempts" to work around this issue, which could
lead to corruption of the pending alarm list.

Fix it properly by not updating the timestamp without the lock held, or
trying to add an already pending alarm to the pending alarm list....

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Cc: stable@vger.kernel.org
parent 1b0f8438

drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c

+10 −7
Original line number Diff line number Diff line
@@ -71,14 +71,17 @@ nvkm_timer_alarm(struct nvkm_timer *tmr, u32 nsec, struct nvkm_alarm *alarm) 
	struct nvkm_alarm *list;

	unsigned long flags;



	alarm->timestamp = nvkm_timer_read(tmr) + nsec;



	/* append new alarm to list, in soonest-alarm-first order */

	/* Remove alarm from pending list.

	 *

	 * This both protects against the corruption of the list,

	 * and implements alarm rescheduling/cancellation.

	 */

	spin_lock_irqsave(&tmr->lock, flags);

	if (!nsec) {

		if (!list_empty(&alarm->head))

			list_del(&alarm->head);

	} else {

	list_del_init(&alarm->head);



	if (nsec) {

		/* Insert into pending list, ordered earliest to latest. */

		alarm->timestamp = nvkm_timer_read(tmr) + nsec;

		list_for_each_entry(list, &tmr->alarms, head) {

			if (list->timestamp > alarm->timestamp)

				break;