From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x225ps5KVrvqIDRQ75gkSI39K9ONfRO7xP8Rh9V0SacPXvLuE7mDpPx0VX5/mOKQi54b9MgQy ARC-Seal: i=1; a=rsa-sha256; t=1517855083; cv=none; d=google.com; s=arc-20160816; b=fXTlf8zHu7EdNkEncp2cVUpuGMGugVRrxB4ydrYwt8R2tdI8Ffyo4LG5lDFxuglC9/ xfYREkpU7U27LhQhjpoaGOsJwIwOuqzdO/qdH4yWlZFwdvFI0HEuDOWA4jEqO/f4zbSY EMtDuBhT+9s85NmYuQ6fmynujxRAonipNfUHO1MeuN23BU0OfUs1X4L8Vxi2v3/KYVK1 6orq6801JusjC+QOOJyoptnCM+Vrgk0yIQUrrNHxYiq4AI0m0sUOlgO6mTHfQbEleSwh Em52rH3l+tvnTlQCaCtXDTLGvqETU2/HlAh0e+v+gMtRQ4As3oipdhe2NMSYnRjFIwny np3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=gv3YsLBde5kO5fcOgG3nph0DxcXgKnXEQL/6Q7ntYTk=; b=l+MkMWBeO5iWjshKyoLVS+oN8ygJL0f90oupKJaN0Uua9mlKzJV3DPmG7F+8g3sSEj VtHLko7QKbNMbQLG3zubp6UYpTOLIke3OjpNssATvnf9R5jNFb3+wJZgVJRbmOKVdqf8 GCoJdsl0XJ3H/yfMwRolsNslxjEYO5jI4uvHpedxhPV1m/9pSiwunk+h0p0M4UMCXA8U mE41X8MVyjwzH+35GNgb9QZW4PzxuCRq8KbzIhPQwwoZVV8PWxwLVq4wDBgQm6Z2poNv 1+mkxUEQp4ymHy9S52eOfD/ewmNts5J4wMex0TD6XZ//guzhkTK5gTX3/A8r4bAufEAu Po7w== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 104.132.1.108 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 104.132.1.108 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ingo Molnar , Dan Williams , Thomas Gleixner , linux-arch@vger.kernel.org, Tom Lendacky , Kees Cook , kernel-hardening@lists.openwall.com, Al Viro , torvalds@linux-foundation.org, alan@linux.intel.com Subject: [PATCH 4.14 41/64] x86/usercopy: Replace open coded stac/clac with __uaccess_{begin, end} Date: Mon, 5 Feb 2018 10:23:00 -0800 Message-Id: <20180205182140.266128654@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180205182138.571333346@linuxfoundation.org> References: <20180205182138.571333346@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1591586412411529132?= X-GMAIL-MSGID: =?utf-8?q?1591586412411529132?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dan Williams dan.j.williams@intel.com commit b5c4ae4f35325d520b230bab6eb3310613b72ac1 In preparation for converting some __uaccess_begin() instances to __uacess_begin_nospec(), make sure all 'from user' uaccess paths are using the _begin(), _end() helpers rather than open-coded stac() and clac(). No functional changes. Suggested-by: Ingo Molnar Signed-off-by: Dan Williams Signed-off-by: Thomas Gleixner Cc: linux-arch@vger.kernel.org Cc: Tom Lendacky Cc: Kees Cook Cc: kernel-hardening@lists.openwall.com Cc: gregkh@linuxfoundation.org Cc: Al Viro Cc: torvalds@linux-foundation.org Cc: alan@linux.intel.com Link: https://lkml.kernel.org/r/151727416438.33451.17309465232057176966.stgit@dwillia2-desk3.amr.corp.intel.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/lib/usercopy_32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/arch/x86/lib/usercopy_32.c +++ b/arch/x86/lib/usercopy_32.c @@ -331,12 +331,12 @@ do { \ unsigned long __copy_user_ll(void *to, const void *from, unsigned long n) { - stac(); + __uaccess_begin(); if (movsl_is_ok(to, from, n)) __copy_user(to, from, n); else n = __copy_user_intel(to, from, n); - clac(); + __uaccess_end(); return n; } EXPORT_SYMBOL(__copy_user_ll); @@ -344,7 +344,7 @@ EXPORT_SYMBOL(__copy_user_ll); unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *from, unsigned long n) { - stac(); + __uaccess_begin(); #ifdef CONFIG_X86_INTEL_USERCOPY if (n > 64 && static_cpu_has(X86_FEATURE_XMM2)) n = __copy_user_intel_nocache(to, from, n); @@ -353,7 +353,7 @@ unsigned long __copy_from_user_ll_nocach #else __copy_user(to, from, n); #endif - clac(); + __uaccess_end(); return n; } EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);