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

torvalds · torvalds · commit 4714de033298 · 2023-10-28T08:10:47.000-10:00
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
diff --git a/kernel/events/core.c b/kernel/events/core.c
@@ -13372,7 +13372,8 @@ static int inherit_group(struct perf_event *parent_event,
 		    !perf_get_aux_event(child_ctr, leader))
 			return -EINVAL;
 	}
-	leader->group_generation = parent_event->group_generation;
+	if (leader)
+		leader->group_generation = parent_event->group_generation;
 	return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -13372,7 +13372,8 @@ static int inherit_group(struct perf_event *parent_event,`
`13372`	`13372`	`!perf_get_aux_event(child_ctr, leader))`
`13373`	`13373`	`return -EINVAL;`
`13374`	`13374`	`}`
`13375`		`- leader->group_generation = parent_event->group_generation;`
	`13375`	`+ if (leader)`
	`13376`	`+ leader->group_generation = parent_event->group_generation;`
`13376`	`13377`	`return 0;`
`13377`	`13378`	`}`
`13378`	`13379`