From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030913AbcGKQN1 (ORCPT ); Mon, 11 Jul 2016 12:13:27 -0400 Received: from terminus.zytor.com ([198.137.202.10]:50184 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030843AbcGKQNZ (ORCPT ); Mon, 11 Jul 2016 12:13:25 -0400 Date: Mon, 11 Jul 2016 09:12:53 -0700 From: tip-bot for Yu-cheng Yu Message-ID: Cc: h.peter.anvin@intel.com, mingo@kernel.org, torvalds@linux-foundation.org, hpa@zytor.com, dave.hansen@intel.com, yu-cheng.yu@intel.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, peterz@infradead.org, ravi.v.shankar@intel.com, fenghua.yu@intel.com Reply-To: yu-cheng.yu@intel.com, dave.hansen@intel.com, peterz@infradead.org, fenghua.yu@intel.com, ravi.v.shankar@intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, h.peter.anvin@intel.com, torvalds@linux-foundation.org, hpa@zytor.com, mingo@kernel.org In-Reply-To: <1468253937-40008-2-git-send-email-fenghua.yu@intel.com> References: <1468253937-40008-2-git-send-email-fenghua.yu@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/fpu] x86/fpu/xstate: Fix __fpu_restore_sig() for XSAVES Git-Commit-ID: 1fc2b67b43d5001b92b3a002b988884ad0137e99 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: 1fc2b67b43d5001b92b3a002b988884ad0137e99 Gitweb: http://git.kernel.org/tip/1fc2b67b43d5001b92b3a002b988884ad0137e99 Author: Yu-cheng Yu AuthorDate: Mon, 11 Jul 2016 09:18:54 -0700 Committer: Ingo Molnar CommitDate: Mon, 11 Jul 2016 16:43:59 +0200 x86/fpu/xstate: Fix __fpu_restore_sig() for XSAVES When the kernel is using XSAVES compacted format, we cannot do __copy_from_user() from a signal frame, which has standard-format data. Fix it by using copyin_to_xsaves(), which converts between formats and filters out all supervisor states that we do not allow userspace to write. Signed-off-by: Yu-cheng Yu Signed-off-by: Fenghua Yu Reviewed-by: Dave Hansen Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Ravi V Shankar Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1468253937-40008-2-git-send-email-fenghua.yu@intel.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/fpu/signal.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/fpu/signal.c b/arch/x86/kernel/fpu/signal.c index 8aa96cb..9e231d8 100644 --- a/arch/x86/kernel/fpu/signal.c +++ b/arch/x86/kernel/fpu/signal.c @@ -323,8 +323,15 @@ static int __fpu__restore_sig(void __user *buf, void __user *buf_fx, int size) */ fpu__drop(fpu); - if (__copy_from_user(&fpu->state.xsave, buf_fx, state_size) || - __copy_from_user(&env, buf, sizeof(env))) { + if (using_compacted_format()) { + err = copyin_to_xsaves(NULL, buf_fx, + &fpu->state.xsave); + } else { + err = __copy_from_user(&fpu->state.xsave, + buf_fx, state_size); + } + + if (err || __copy_from_user(&env, buf, sizeof(env))) { fpstate_init(&fpu->state); trace_x86_fpu_init_state(fpu); err = -1;