Merge tag 'core-urgent-2023-09-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit 99a73f9e8d65 · 2023-09-17T10:55:35.000-07:00
Pull WARN fix from Ingo Molnar:
 "Fix a missing preempt-enable in the WARN() slowpath"

* tag 'core-urgent-2023-09-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  panic: Reenable preemption in WARN slowpath
diff --git a/kernel/panic.c b/kernel/panic.c
@@ -697,6 +697,7 @@ void warn_slowpath_fmt(const char *file, int line, unsigned taint,
 	if (!fmt) {
 		__warn(file, line, __builtin_return_address(0), taint,
 		       NULL, NULL);
+		warn_rcu_exit(rcu);
 		return;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -697,6 +697,7 @@ void warn_slowpath_fmt(const char *file, int line, unsigned taint,`
`697`	`697`	`if (!fmt) {`
`698`	`698`	`__warn(file, line, __builtin_return_address(0), taint,`
`699`	`699`	`NULL, NULL);`
	`700`	`+ warn_rcu_exit(rcu);`
`700`	`701`	`return;`
`701`	`702`	`}`
`702`	`703`