Commit 4714de03 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-urgent-2023-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf event fix from Ingo Molnar:
 "Fix a potential NULL dereference bug"

* tag 'perf-urgent-2023-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/core: Fix potential NULL deref
parents 51a76910 a71ef314

kernel/events/core.c

+2 −1
Original line number Diff line number Diff line
@@ -13372,6 +13372,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;

}