From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759043AbdCVJTm (ORCPT ); Wed, 22 Mar 2017 05:19:42 -0400 Received: from terminus.zytor.com ([65.50.211.136]:48337 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758795AbdCVJT1 (ORCPT ); Wed, 22 Mar 2017 05:19:27 -0400 Date: Wed, 22 Mar 2017 02:10:51 -0700 From: tip-bot for Tony Luck Message-ID: Cc: torvalds@linux-foundation.org, bp@alien8.de, mingo@kernel.org, hpa@zytor.com, luto@kernel.org, brgerst@gmail.com, peterz@infradead.org, tglx@linutronix.de, dvlasenk@redhat.com, stable@vger.kernel.org, jpoimboe@redhat.com, tony.luck@intel.com, linux-kernel@vger.kernel.org Reply-To: jpoimboe@redhat.com, linux-kernel@vger.kernel.org, tony.luck@intel.com, dvlasenk@redhat.com, stable@vger.kernel.org, tglx@linutronix.de, brgerst@gmail.com, peterz@infradead.org, torvalds@linux-foundation.org, luto@kernel.org, hpa@zytor.com, mingo@kernel.org, bp@alien8.de In-Reply-To: <1490046030-25862-1-git-send-email-tony.luck@intel.com> References: <1490046030-25862-1-git-send-email-tony.luck@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/mce: Fix copy/paste error in exception table entries Git-Commit-ID: 26a37ab319a26d330bab298770d692bb9c852aff 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: 26a37ab319a26d330bab298770d692bb9c852aff Gitweb: http://git.kernel.org/tip/26a37ab319a26d330bab298770d692bb9c852aff Author: Tony Luck AuthorDate: Mon, 20 Mar 2017 14:40:30 -0700 Committer: Ingo Molnar CommitDate: Wed, 22 Mar 2017 08:43:25 +0100 x86/mce: Fix copy/paste error in exception table entries Back in commit: 92b0729c34cab ("x86/mm, x86/mce: Add memcpy_mcsafe()") ... I made a copy/paste error setting up the exception table entries and ended up with two for label .L_cache_w3 and none for .L_cache_w2. This means that if we take a machine check on: .L_cache_w2: movq 2*8(%rsi), %r10 then we don't have an exception table entry for this instruction and we can't recover. Fix: s/3/2/ Signed-off-by: Tony Luck Cc: Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Fixes: 92b0729c34cab ("x86/mm, x86/mce: Add memcpy_mcsafe()") Link: http://lkml.kernel.org/r/1490046030-25862-1-git-send-email-tony.luck@intel.com Signed-off-by: Ingo Molnar --- arch/x86/lib/memcpy_64.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S index 779782f..9a53a06 100644 --- a/arch/x86/lib/memcpy_64.S +++ b/arch/x86/lib/memcpy_64.S @@ -290,7 +290,7 @@ EXPORT_SYMBOL_GPL(memcpy_mcsafe_unrolled) _ASM_EXTABLE_FAULT(.L_copy_leading_bytes, .L_memcpy_mcsafe_fail) _ASM_EXTABLE_FAULT(.L_cache_w0, .L_memcpy_mcsafe_fail) _ASM_EXTABLE_FAULT(.L_cache_w1, .L_memcpy_mcsafe_fail) - _ASM_EXTABLE_FAULT(.L_cache_w3, .L_memcpy_mcsafe_fail) + _ASM_EXTABLE_FAULT(.L_cache_w2, .L_memcpy_mcsafe_fail) _ASM_EXTABLE_FAULT(.L_cache_w3, .L_memcpy_mcsafe_fail) _ASM_EXTABLE_FAULT(.L_cache_w4, .L_memcpy_mcsafe_fail) _ASM_EXTABLE_FAULT(.L_cache_w5, .L_memcpy_mcsafe_fail)