Patch "x86/mce: Fix copy/paste error in exception table entries" has been added to the 4.9-stable tree

This is a note to let you know that I've just added the patch titled

x86/mce: Fix copy/paste error in exception table entries

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
x86-mce-fix-copy-paste-error-in-exception-table-entries.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Tony Luck <[email protected]>
Date: Mon, 20 Mar 2017 14:40:30 -0700
Subject: x86/mce: Fix copy/paste error in exception table entries

From: Tony Luck <[email protected]>

commit 26a37ab319a26d330bab298770d692bb9c852aff upstream.

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/

---
 arch/x86/lib/memcpy_64.S |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

@@ -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)

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/x86-mce-fix-copy-paste-error-in-exception-table-entries.patch