]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Revert "fix minor infoleak in get_user_ex()"
authorJiri Slaby <jslaby@suse.cz>
Mon, 31 Oct 2016 19:30:43 +0000 (20:30 +0100)
committerJiri Slaby <jslaby@suse.cz>
Tue, 8 Nov 2016 15:38:29 +0000 (16:38 +0100)
This reverts commit d42924ab1ec523c0671f5560d51750996be31d3a which is
1c109fabbd51863475cd12ac206bdd249aee35af upstream.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
arch/x86/include/asm/uaccess.h

index 01635e4e187ae643290c21a6a978f6eba2a41d20..5838fa911aa03f25138e8996f755b0b4fde34e18 100644 (file)
@@ -383,11 +383,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)                       \