Merge tag 'core-urgent-2021-01-31' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit f7ea44c7172f · 2021-01-31T11:39:32.000-08:00
Pull single stepping fix from Thomas Gleixner:
 "A single fix for the single step reporting regression caused by
  getting the condition wrong when moving SYSCALL_EMU away from TIF
  flags"

[ There's apparently another problem too, fix pending ]

* tag 'core-urgent-2021-01-31' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  entry: Unbreak single step reporting behaviour
diff --git a/kernel/entry/common.c b/kernel/entry/common.c
@@ -222,7 +222,7 @@ static inline bool report_single_step(unsigned long work)
  */
 static inline bool report_single_step(unsigned long work)
 {
-	if (!(work & SYSCALL_WORK_SYSCALL_EMU))
+	if (work & SYSCALL_WORK_SYSCALL_EMU)
 		return false;
 
 	return !!(current_thread_info()->flags & _TIF_SINGLESTEP);

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ static inline bool report_single_step(unsigned long work)`
`222`	`222`	`*/`
`223`	`223`	`static inline bool report_single_step(unsigned long work)`
`224`	`224`	`{`
`225`		`- if (!(work & SYSCALL_WORK_SYSCALL_EMU))`
	`225`	`+ if (work & SYSCALL_WORK_SYSCALL_EMU)`
`226`	`226`	`return false;`
`227`	`227`
`228`	`228`	`return !!(current_thread_info()->flags & _TIF_SINGLESTEP);`