From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937082AbdIZIrF (ORCPT ); Tue, 26 Sep 2017 04:47:05 -0400 Received: from terminus.zytor.com ([65.50.211.136]:35073 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936810AbdIZIrA (ORCPT ); Tue, 26 Sep 2017 04:47:00 -0400 Date: Tue, 26 Sep 2017 01:37:06 -0700 From: tip-bot for Eric Biggers Message-ID: Cc: luto@kernel.org, torvalds@linux-foundation.org, yu-cheng.yu@intel.com, linux-kernel@vger.kernel.org, haokexin@gmail.com, dvyukov@google.com, luto@amacapital.net, wanpeng.li@hotmail.com, dave.hansen@linux.intel.com, ebiggers@google.com, akpm@linux-foundation.org, bp@alien8.de, fenghua.yu@intel.com, keescook@chromium.org, peterz@infradead.org, ebiggers3@gmail.com, tglx@linutronix.de, riel@redhat.com, mhalcrow@google.com, oleg@redhat.com, hpa@zytor.com, mingo@kernel.org Reply-To: mingo@kernel.org, oleg@redhat.com, hpa@zytor.com, keescook@chromium.org, peterz@infradead.org, ebiggers3@gmail.com, tglx@linutronix.de, mhalcrow@google.com, riel@redhat.com, luto@amacapital.net, haokexin@gmail.com, dvyukov@google.com, wanpeng.li@hotmail.com, dave.hansen@linux.intel.com, ebiggers@google.com, akpm@linux-foundation.org, bp@alien8.de, fenghua.yu@intel.com, luto@kernel.org, torvalds@linux-foundation.org, yu-cheng.yu@intel.com, linux-kernel@vger.kernel.org In-Reply-To: <20170924105913.9157-9-mingo@kernel.org> References: <20170924105913.9157-9-mingo@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/fpu] x86/fpu: Eliminate the 'xfeatures' local variable in copy_user_to_xstate() Git-Commit-ID: 3d703477bcfe8bb57079d97198cf1e342fe1fef9 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: 3d703477bcfe8bb57079d97198cf1e342fe1fef9 Gitweb: http://git.kernel.org/tip/3d703477bcfe8bb57079d97198cf1e342fe1fef9 Author: Eric Biggers AuthorDate: Sun, 24 Sep 2017 12:59:11 +0200 Committer: Ingo Molnar CommitDate: Tue, 26 Sep 2017 09:43:48 +0200 x86/fpu: Eliminate the 'xfeatures' local variable in copy_user_to_xstate() We now have this field in hdr.xfeatures. 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-9-mingo@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/kernel/fpu/xstate.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c index 0cd7b73..b6d78b7 100644 --- a/arch/x86/kernel/fpu/xstate.c +++ b/arch/x86/kernel/fpu/xstate.c @@ -1197,7 +1197,6 @@ int copy_user_to_xstate(struct xregs_state *xsave, const void __user *ubuf) { unsigned int offset, size; int i; - u64 xfeatures; u64 allowed_features; struct xstate_header hdr; @@ -1207,20 +1206,18 @@ int copy_user_to_xstate(struct xregs_state *xsave, const void __user *ubuf) if (__copy_from_user(&hdr, ubuf + offset, size)) return -EFAULT; - xfeatures = hdr.xfeatures; - /* * Reject if the user sets any disabled or supervisor features: */ allowed_features = xfeatures_mask & ~XFEATURE_MASK_SUPERVISOR; - if (xfeatures & ~allowed_features) + if (hdr.xfeatures & ~allowed_features) return -EINVAL; for (i = 0; i < XFEATURE_MAX; i++) { u64 mask = ((u64)1 << i); - if (xfeatures & mask) { + if (hdr.xfeatures & mask) { void *dst = __raw_xsave_addr(xsave, 1 << i); offset = xstate_offsets[i]; @@ -1231,7 +1228,7 @@ int copy_user_to_xstate(struct xregs_state *xsave, const void __user *ubuf) } } - if (xfeatures_mxcsr_quirk(xfeatures)) { + if (xfeatures_mxcsr_quirk(hdr.xfeatures)) { offset = offsetof(struct fxregs_state, mxcsr); size = MXCSR_AND_FLAGS_SIZE; if (__copy_from_user(&xsave->i387.mxcsr, ubuf + offset, size)) @@ -1247,7 +1244,7 @@ int copy_user_to_xstate(struct xregs_state *xsave, const void __user *ubuf) /* * Add back in the features that came in from userspace: */ - xsave->header.xfeatures |= xfeatures; + xsave->header.xfeatures |= hdr.xfeatures; return 0; }