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

commit 4e1b5a86a5edfbefc9396d41b0fc1a2ebd0101b6 upstream.

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: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/s390/lib/uaccess.c b/arch/s390/lib/uaccess.c
index d7b3b193d1088ca498d735f63e7a3b7bff744393..be0f1b62c33b3c7c5149b420bfe8519cb3239cb6 100644 (file)
--- a/arch/s390/lib/uaccess.c
+++ b/arch/s390/lib/uaccess.c
@@ -156,7 +156,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"
@@ -166,11 +166,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");