Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit 6dcf6a4eb95a · 2019-09-12T11:04:50.000+01:00
Pull perf fix from Ingo Molnar:
 "Fix an initialization bug in the hw-breakpoints, which triggered on
  the ARM platform"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/hw_breakpoint: Fix arch_hw_breakpoint use-before-initialization
diff --git a/kernel/events/hw_breakpoint.c b/kernel/events/hw_breakpoint.c
@@ -413,7 +413,7 @@ static int hw_breakpoint_parse(struct perf_event *bp,
 
 int register_perf_hw_breakpoint(struct perf_event *bp)
 {
-	struct arch_hw_breakpoint hw;
+	struct arch_hw_breakpoint hw = { };
 	int err;
 
 	err = reserve_bp_slot(bp);
@@ -461,7 +461,7 @@ int
 modify_user_hw_breakpoint_check(struct perf_event *bp, struct perf_event_attr *attr,
 			        bool check)
 {
-	struct arch_hw_breakpoint hw;
+	struct arch_hw_breakpoint hw = { };
 	int err;
 
 	err = hw_breakpoint_parse(bp, attr, &hw);

Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ static int hw_breakpoint_parse(struct perf_event *bp,`
`413`	`413`
`414`	`414`	`int register_perf_hw_breakpoint(struct perf_event *bp)`
`415`	`415`	`{`
`416`		`- struct arch_hw_breakpoint hw;`
	`416`	`+ struct arch_hw_breakpoint hw = { };`
`417`	`417`	`int err;`
`418`	`418`
`419`	`419`	`err = reserve_bp_slot(bp);`
`@@ -461,7 +461,7 @@ int`
`461`	`461`	`modify_user_hw_breakpoint_check(struct perf_event bp, struct perf_event_attr attr,`
`462`	`462`	`bool check)`
`463`	`463`	`{`
`464`		`- struct arch_hw_breakpoint hw;`
	`464`	`+ struct arch_hw_breakpoint hw = { };`
`465`	`465`	`int err;`
`466`	`466`
`467`	`467`	`err = hw_breakpoint_parse(bp, attr, &hw);`