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

Commit dd8b17ef authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Greg Kroah-Hartman
Browse files

UPSTREAM: perf/core: Fix potential NULL deref



commit a71ef31485bb51b846e8db8b3a35e432cc15afb5 upstream.

Smatch is awesome.

Fixes: 32671e3799ca ("perf: Disallow mis-matched inherited group reads")
Reported-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 511f3e9b)
Change-Id: I6d2005d6c186cfc7ff41ed2615e37ee9f01da6a5
Bug: 442358987
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent b7a9bb08
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -12115,6 +12115,7 @@ static int inherit_group(struct perf_event *parent_event,
		    !perf_get_aux_event(child_ctr, leader))
			return -EINVAL;
	}
	if (leader)
		leader->group_generation = parent_event->group_generation;
	return 0;
}