Commit e99b2507 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'core-urgent-2020-08-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull entry fix from Thomas Gleixner:
 "A single bug fix for the common entry code.

  The transcription of the x86 version messed up the reload of the
  syscall number from pt_regs after ptrace and seccomp which breaks
  syscall number rewriting"

* tag 'core-urgent-2020-08-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  core/entry: Respect syscall number rewrites
parents d9232cb7 d88d59b6

kernel/entry/common.c

+2 −1
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ static long syscall_trace_enter(struct pt_regs *regs, long syscall, 


	syscall_enter_audit(regs, syscall);



	return ret ? : syscall;

	/* The above might have changed the syscall number */

	return ret ? : syscall_get_nr(current, regs);

}



noinstr long syscall_enter_from_user_mode(struct pt_regs *regs, long syscall)