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

Commit 91d3f8a6 authored by Alexander Shishkin's avatar Alexander Shishkin Committed by Greg Kroah-Hartman
Browse files

intel_th: gth: Fix an off-by-one in output unassigning 



Commit 9ed3f222 ("intel_th: Don't reference unassigned outputs")
fixes a NULL dereference for all masters except the last one ("256+"),
which keeps the stale pointer after the output driver had been unassigned.

Fix the off-by-one.

Signed-off-by: default avatarAlexander Shishkin <alexander.shishkin@linux.intel.com>
Fixes: 9ed3f222 ("intel_th: Don't reference unassigned outputs")
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8c844879

drivers/hwtracing/intel_th/gth.c

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ static void intel_th_gth_unassign(struct intel_th_device *thdev, 
	othdev->output.port = -1;

	othdev->output.active = false;

	gth->output[port].output = NULL;

	for (master = 0; master < TH_CONFIGURABLE_MASTERS; master++)

	for (master = 0; master <= TH_CONFIGURABLE_MASTERS; master++)

		if (gth->master[master] == port)

			gth->master[master] = -1;

	spin_unlock(&gth->gth_lock);