From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755379AbbIHO3Y (ORCPT ); Tue, 8 Sep 2015 10:29:24 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52034 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754573AbbIHO3V (ORCPT ); Tue, 8 Sep 2015 10:29:21 -0400 Date: Tue, 8 Sep 2015 07:28:14 -0700 From: tip-bot for Ingo Molnar Message-ID: Cc: oleg@redhat.com, mikko.rapeli@iki.fi, peterz@infradead.org, luto@amacapital.net, tglx@linutronix.de, torvalds@linux-foundation.org, brgerst@gmail.com, bp@alien8.de, linux-kernel@vger.kernel.org, hpa@zytor.com, dvlasenk@redhat.com, mingo@kernel.org Reply-To: peterz@infradead.org, luto@amacapital.net, tglx@linutronix.de, oleg@redhat.com, mikko.rapeli@iki.fi, brgerst@gmail.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, bp@alien8.de, dvlasenk@redhat.com, hpa@zytor.com, mingo@kernel.org In-Reply-To: <1441438363-9999-12-git-send-email-mingo@kernel.org> References: <1441438363-9999-12-git-send-email-mingo@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/headers] x86/headers: Make sigcontext pointers bit independent Git-Commit-ID: 530e5c827182a7a5322c55276b0617fd06874c24 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 Commit-ID: 530e5c827182a7a5322c55276b0617fd06874c24 Gitweb: http://git.kernel.org/tip/530e5c827182a7a5322c55276b0617fd06874c24 Author: Ingo Molnar AuthorDate: Sat, 5 Sep 2015 09:32:39 +0200 Committer: Ingo Molnar CommitDate: Tue, 8 Sep 2015 10:03:58 +0200 x86/headers: Make sigcontext pointers bit independent Before we can eliminate the duplication between 'struct sigcontext_32' and 'struct sigcontext_ia32', make the 'fpstate' pointer field in 'struct sigcontext_32' bit independent. Acked-by: Mikko Rapeli Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-kernel@vger.kernel.org Link: http://lkml.kernel.org/r/1441438363-9999-12-git-send-email-mingo@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/include/uapi/asm/sigcontext.h | 4 ++-- arch/x86/kernel/signal.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/uapi/asm/sigcontext.h b/arch/x86/include/uapi/asm/sigcontext.h index 3591cef..d0def25 100644 --- a/arch/x86/include/uapi/asm/sigcontext.h +++ b/arch/x86/include/uapi/asm/sigcontext.h @@ -218,7 +218,7 @@ struct sigcontext_32 { * of extended memory layout. See comments at the definition of * (struct _fpx_sw_bytes) */ - void __user *fpstate; /* Zero when no FPU/extended context */ + __u32 fpstate; /* Zero when no FPU/extended context */ __u32 oldmask; __u32 cr2; }; @@ -258,7 +258,7 @@ struct sigcontext_64 { * of extended memory layout. See comments at the definition of * (struct _fpx_sw_bytes) */ - void __user *fpstate; /* Zero when no FPU/extended context */ + __u64 fpstate; /* Zero when no FPU/extended context */ __u64 reserved1[8]; }; diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c index da52e6b..3724ff3 100644 --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c @@ -63,6 +63,7 @@ int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc) { + unsigned long buf_val; void __user *buf; unsigned int tmpflags; unsigned int err = 0; @@ -107,7 +108,8 @@ int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc) regs->flags = (regs->flags & ~FIX_EFLAGS) | (tmpflags & FIX_EFLAGS); regs->orig_ax = -1; /* disable syscall checks */ - get_user_ex(buf, &sc->fpstate); + get_user_ex(buf_val, &sc->fpstate); + buf = (void __user *)buf_val; } get_user_catch(err); err |= fpu__restore_sig(buf, config_enabled(CONFIG_X86_32));