Revert "fix minor infoleak in get_user_ex()"

Orabug: 25790370
CVE: CVE-2016-9644

This reverts commit fc2cba1c03dc9da0668d1719a6ad47b39c26b574.

diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
index d081e7e42fb31e37f6a1e56d33bc2cc04cb52229..ace9dec050b17b1a766899a946ab83d6bbe31641 100644 (file)
--- a/arch/x86/include/asm/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
@@ -391,11 +391,7 @@ do {                                                                       \
 #define __get_user_asm_ex(x, addr, itype, rtype, ltype)                        \
        asm volatile("1:        mov"itype" %1,%"rtype"0\n"              \
                     "2:\n"                                             \
-                    ".section .fixup,\"ax\"\n"                         \
-                     "3:xor"itype" %"rtype"0,%"rtype"0\n"              \
-                    "  jmp 2b\n"                                       \
-                    ".previous\n"                                      \
-                    _ASM_EXTABLE_EX(1b, 3b)                            \
+                    _ASM_EXTABLE_EX(1b, 2b)                            \
                     : ltype(x) : "m" (__m(addr)))
 
 #define __put_user_nocheck(x, ptr, size)                       \