Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83a395d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'parisc-4.6-5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc fix from Helge Deller:
 "Patch from Dmitry V Levin to fix a kernel crash when a straced process
  calls the (invalid) syscall which is equal to value of __NR_Linux_syscalls"

* 'parisc-4.6-5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: fix a bug when syscall number of tracee is __NR_Linux_syscalls
parents dd287690 f0b22d1b

arch/parisc/kernel/syscall.S

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ tracesys_next: 
#endif



	cmpib,COND(=),n -1,%r20,tracesys_exit /* seccomp may have returned -1 */

	comiclr,>>=	__NR_Linux_syscalls, %r20, %r0

	comiclr,>>	__NR_Linux_syscalls, %r20, %r0

	b,n	.Ltracesys_nosys



	LDREGX  %r20(%r19), %r19