From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968251AbdIZInj (ORCPT ); Tue, 26 Sep 2017 04:43:39 -0400 Received: from terminus.zytor.com ([65.50.211.136]:45295 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965021AbdIZInf (ORCPT ); Tue, 26 Sep 2017 04:43:35 -0400 Date: Tue, 26 Sep 2017 01:34:46 -0700 From: tip-bot for Eric Biggers Message-ID: Cc: bp@alien8.de, ebiggers3@gmail.com, akpm@linux-foundation.org, dave.hansen@linux.intel.com, dvyukov@google.com, tglx@linutronix.de, ebiggers@google.com, fenghua.yu@intel.com, mhalcrow@google.com, haokexin@gmail.com, wanpeng.li@hotmail.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, luto@kernel.org, oleg@redhat.com, hpa@zytor.com, keescook@chromium.org, mingo@kernel.org, yu-cheng.yu@intel.com, riel@redhat.com, peterz@infradead.org, luto@amacapital.net Reply-To: luto@kernel.org, torvalds@linux-foundation.org, hpa@zytor.com, oleg@redhat.com, ebiggers@google.com, fenghua.yu@intel.com, linux-kernel@vger.kernel.org, wanpeng.li@hotmail.com, mhalcrow@google.com, haokexin@gmail.com, yu-cheng.yu@intel.com, riel@redhat.com, mingo@kernel.org, peterz@infradead.org, luto@amacapital.net, keescook@chromium.org, dave.hansen@linux.intel.com, dvyukov@google.com, akpm@linux-foundation.org, bp@alien8.de, ebiggers3@gmail.com, tglx@linutronix.de In-Reply-To: <20170924105913.9157-3-mingo@kernel.org> References: <20170924105913.9157-3-mingo@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/fpu] x86/fpu: Use validate_xstate_header() to validate the xstate_header in xstateregs_set() Git-Commit-ID: cf9df81b139b6ebaec188d73758f02ca3b2110e4 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: cf9df81b139b6ebaec188d73758f02ca3b2110e4 Gitweb: http://git.kernel.org/tip/cf9df81b139b6ebaec188d73758f02ca3b2110e4 Author: Eric Biggers AuthorDate: Sun, 24 Sep 2017 12:59:05 +0200 Committer: Ingo Molnar CommitDate: Tue, 26 Sep 2017 09:43:45 +0200 x86/fpu: Use validate_xstate_header() to validate the xstate_header in xstateregs_set() Tighten the checks in xstateregs_set(). Signed-off-by: Eric Biggers Cc: Andrew Morton Cc: Andy Lutomirski Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Dave Hansen Cc: Dmitry Vyukov Cc: Eric Biggers Cc: Fenghua Yu Cc: Kees Cook Cc: Kevin Hao Cc: Linus Torvalds Cc: Michael Halcrow Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Rik van Riel Cc: Thomas Gleixner Cc: Wanpeng Li Cc: Yu-cheng Yu Cc: kernel-hardening@lists.openwall.com Link: http://lkml.kernel.org/r/20170924105913.9157-3-mingo@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/kernel/fpu/regset.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/arch/x86/kernel/fpu/regset.c b/arch/x86/kernel/fpu/regset.c index ee8d2f0..b831d5b 100644 --- a/arch/x86/kernel/fpu/regset.c +++ b/arch/x86/kernel/fpu/regset.c @@ -141,27 +141,20 @@ int xstateregs_set(struct task_struct *target, const struct user_regset *regset, ret = copy_user_to_xstate(xsave, ubuf); } else { ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, xsave, 0, -1); - - /* xcomp_bv must be 0 when using uncompacted format */ - if (!ret && xsave->header.xcomp_bv) - ret = -EINVAL; + if (!ret) + ret = validate_xstate_header(&xsave->header); } /* - * In case of failure, mark all states as init: - */ - if (ret) - fpstate_init(&fpu->state); - - /* * mxcsr reserved bits must be masked to zero for security reasons. */ xsave->i387.mxcsr &= mxcsr_feature_mask; - xsave->header.xfeatures &= xfeatures_mask; + /* - * These bits must be zero. + * In case of failure, mark all states as init: */ - memset(&xsave->header.reserved, 0, 48); + if (ret) + fpstate_init(&fpu->state); return ret; }