Commit e99b2507 authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -65,7 +65,8 @@ static long syscall_trace_enter(struct pt_regs *regs, long syscall, ...@@ -65,7 +65,8 @@ static long syscall_trace_enter(struct pt_regs *regs, long syscall,
syscall_enter_audit(regs, 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) noinstr long syscall_enter_from_user_mode(struct pt_regs *regs, long syscall)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment