From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968276AbdIZIpr (ORCPT ); Tue, 26 Sep 2017 04:45:47 -0400 Received: from terminus.zytor.com ([65.50.211.136]:52551 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965430AbdIZIpp (ORCPT ); Tue, 26 Sep 2017 04:45:45 -0400 Date: Tue, 26 Sep 2017 01:35:57 -0700 From: tip-bot for Eric Biggers Message-ID: Cc: hpa@zytor.com, luto@kernel.org, dvyukov@google.com, luto@amacapital.net, mingo@kernel.org, linux-kernel@vger.kernel.org, yu-cheng.yu@intel.com, keescook@chromium.org, ebiggers3@gmail.com, fenghua.yu@intel.com, riel@redhat.com, dave.hansen@linux.intel.com, oleg@redhat.com, mhalcrow@google.com, haokexin@gmail.com, akpm@linux-foundation.org, tglx@linutronix.de, bp@alien8.de, wanpeng.li@hotmail.com, peterz@infradead.org, ebiggers@google.com, torvalds@linux-foundation.org Reply-To: peterz@infradead.org, ebiggers@google.com, bp@alien8.de, wanpeng.li@hotmail.com, torvalds@linux-foundation.org, oleg@redhat.com, mhalcrow@google.com, akpm@linux-foundation.org, haokexin@gmail.com, tglx@linutronix.de, fenghua.yu@intel.com, ebiggers3@gmail.com, riel@redhat.com, dave.hansen@linux.intel.com, luto@kernel.org, hpa@zytor.com, luto@amacapital.net, dvyukov@google.com, linux-kernel@vger.kernel.org, mingo@kernel.org, yu-cheng.yu@intel.com, keescook@chromium.org In-Reply-To: <20170924105913.9157-6-mingo@kernel.org> References: <20170924105913.9157-6-mingo@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/fpu] x86/fpu: Eliminate the 'xfeatures' local variable in copy_kernel_to_xstate() Git-Commit-ID: b89eda482d7849a1c146b6d0a42f4e76369bb08e 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: b89eda482d7849a1c146b6d0a42f4e76369bb08e Gitweb: http://git.kernel.org/tip/b89eda482d7849a1c146b6d0a42f4e76369bb08e Author: Eric Biggers AuthorDate: Sun, 24 Sep 2017 12:59:08 +0200 Committer: Ingo Molnar CommitDate: Tue, 26 Sep 2017 09:43:46 +0200 x86/fpu: Eliminate the 'xfeatures' local variable in copy_kernel_to_xstate() We have this information in the xstate_header. 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-6-mingo@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/kernel/fpu/xstate.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c index 02591b96..c97c4a9 100644 --- a/arch/x86/kernel/fpu/xstate.c +++ b/arch/x86/kernel/fpu/xstate.c @@ -1146,7 +1146,6 @@ int copy_kernel_to_xstate(struct xregs_state *xsave, const void *kbuf) { unsigned int offset, size; int i; - u64 xfeatures; u64 allowed_features; struct xstate_header hdr; @@ -1154,20 +1153,19 @@ int copy_kernel_to_xstate(struct xregs_state *xsave, const void *kbuf) size = sizeof(hdr); memcpy(&hdr, kbuf + offset, size); - 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]; @@ -1177,7 +1175,7 @@ int copy_kernel_to_xstate(struct xregs_state *xsave, const void *kbuf) } } - if (xfeatures_mxcsr_quirk(xfeatures)) { + if (xfeatures_mxcsr_quirk(hdr.xfeatures)) { offset = offsetof(struct fxregs_state, mxcsr); size = MXCSR_AND_FLAGS_SIZE; memcpy(&xsave->i387.mxcsr, kbuf + offset, size); @@ -1192,7 +1190,7 @@ int copy_kernel_to_xstate(struct xregs_state *xsave, const void *kbuf) /* * Add back in the features that came in from userspace: */ - xsave->header.xfeatures |= xfeatures; + xsave->header.xfeatures |= hdr.xfeatures; return 0; }