From: Brian Maly <brian.maly@oracle.com>
Date: Thu, 30 Mar 2017 20:42:17 +0000 (-0400)
Subject: Revert "fix minor infoleak in get_user_ex()"
X-Git-Tag: v4.1.12-102.0.20170529_2200~36
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3dae09ee1fb2ce7d62b2f28b8d7945aad320ea6a;p=users%2Fjedix%2Flinux-maple.git

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 d081e7e42fb3..ace9dec050b1 100644
--- 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)			\