Commit 4e1b5a86 authored by Heiko Carstens's avatar Heiko Carstens Committed by Vasily Gorbik
Browse files

s390/uaccess: add missing EX_TABLE entries to __clear_user() 



For some exception types the instruction address points behind the
instruction that caused the exception. Take that into account and add
the missing exception table entries.

Cc: <stable@vger.kernel.org>
Reviewed-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent d6d9875e

arch/s390/lib/uaccess.c

+3 −3
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ unsigned long __clear_user(void __user *to, unsigned long size) 
	asm volatile(

		"   lr	  0,%[spec]\n"

		"0: mvcos 0(%1),0(%4),%0\n"

		"   jz	  4f\n"

		"6: jz	  4f\n"

		"1: algr  %0,%2\n"

		"   slgr  %1,%2\n"

		"   j	  0b\n"
@@ -167,11 +167,11 @@ unsigned long __clear_user(void __user *to, unsigned long size) 
		"   clgr  %0,%3\n"	/* copy crosses next page boundary? */

		"   jnh	  5f\n"

		"3: mvcos 0(%1),0(%4),%3\n"

		"   slgr  %0,%3\n"

		"7: slgr  %0,%3\n"

		"   j	  5f\n"

		"4: slgr  %0,%0\n"

		"5:\n"

		EX_TABLE(0b,2b) EX_TABLE(3b,5b)

		EX_TABLE(0b,2b) EX_TABLE(6b,2b) EX_TABLE(3b,5b) EX_TABLE(7b,5b)

		: "+a" (size), "+a" (to), "+a" (tmp1), "=a" (tmp2)

		: "a" (empty_zero_page), [spec] "d" (spec.val)

		: "cc", "memory", "0");