Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754492AbbLERzc (ORCPT ); Sat, 5 Dec 2015 12:55:32 -0500 Received: from terminus.zytor.com ([198.137.202.10]:48148 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754329AbbLERz3 (ORCPT ); Sat, 5 Dec 2015 12:55:29 -0500 Date: Sat, 5 Dec 2015 09:55:09 -0800 From: "tip-bot for Dmitry V. Levin" Message-ID: Cc: mingo@kernel.org, ldv@altlinux.org, hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, lineprinter0@gmail.com Reply-To: mingo@kernel.org, ldv@altlinux.org, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, lineprinter0@gmail.com In-Reply-To: <20151130215436.GA25996@altlinux.org> References: <20151130215436.GA25996@altlinux.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/signal: Fix restart_syscall number for x32 tasks Git-Commit-ID: 22eab1108781eff09961ae7001704f7bd8fb1dce X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2618 Lines: 66 Commit-ID: 22eab1108781eff09961ae7001704f7bd8fb1dce Gitweb: http://git.kernel.org/tip/22eab1108781eff09961ae7001704f7bd8fb1dce Author: Dmitry V. Levin AuthorDate: Tue, 1 Dec 2015 00:54:36 +0300 Committer: Thomas Gleixner CommitDate: Sat, 5 Dec 2015 18:52:14 +0100 x86/signal: Fix restart_syscall number for x32 tasks When restarting a syscall with regs->ax == -ERESTART_RESTARTBLOCK, regs->ax is assigned to a restart_syscall number. For x32 tasks, this syscall number must have __X32_SYSCALL_BIT set, otherwise it will be an x86_64 syscall number instead of a valid x32 syscall number. This issue has been there since the introduction of x32. Reported-by: strace/tests/restart_syscall.test Reported-and-tested-by: Elvira Khabirova Signed-off-by: Dmitry V. Levin Cc: Elvira Khabirova Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/20151130215436.GA25996@altlinux.org Signed-off-by: Thomas Gleixner --- arch/x86/kernel/signal.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c index b7ffb7c..cb6282c 100644 --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c @@ -690,12 +690,15 @@ handle_signal(struct ksignal *ksig, struct pt_regs *regs) signal_setup_done(failed, ksig, stepping); } -#ifdef CONFIG_X86_32 -#define NR_restart_syscall __NR_restart_syscall -#else /* !CONFIG_X86_32 */ -#define NR_restart_syscall \ - test_thread_flag(TIF_IA32) ? __NR_ia32_restart_syscall : __NR_restart_syscall -#endif /* CONFIG_X86_32 */ +static inline unsigned long get_nr_restart_syscall(const struct pt_regs *regs) +{ +#if defined(CONFIG_X86_32) || !defined(CONFIG_X86_64) + return __NR_restart_syscall; +#else /* !CONFIG_X86_32 && CONFIG_X86_64 */ + return test_thread_flag(TIF_IA32) ? __NR_ia32_restart_syscall : + __NR_restart_syscall | (regs->orig_ax & __X32_SYSCALL_BIT); +#endif /* CONFIG_X86_32 || !CONFIG_X86_64 */ +} /* * Note that 'init' is a special process: it doesn't get signals it doesn't @@ -724,7 +727,7 @@ void do_signal(struct pt_regs *regs) break; case -ERESTART_RESTARTBLOCK: - regs->ax = NR_restart_syscall; + regs->ax = get_nr_restart_syscall(regs); regs->ip -= 2; break; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/