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

Commit 26893107 authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Ingo Molnar
Browse files

x86_64/vsyscall: Restore orig_ax after vsyscall seccomp 



The vsyscall emulation code sets orig_ax for seccomp's benefit,
but it forgot to set it back.

I'm not sure that this is observable at all, but it could cause
confusion to various /proc or ptrace users, and it's possible
that it could cause minor artifacts if a signal were to be
delivered on return from vsyscall emulation.

Signed-off-by: default avatarAndy Lutomirski <luto@amacapital.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/cdc6a564517a4df09235572ee5f530ccdcf933f7.1415144089.git.luto@amacapital.net


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 07114f0f

arch/x86/kernel/vsyscall_64.c

+1 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address) 
				  "seccomp tried to change syscall nr or ip");

		do_exit(SIGSYS);

	}

	regs->orig_ax = -1;

	if (tmp)

		goto do_ret;  /* skip requested */