From 3dae09ee1fb2ce7d62b2f28b8d7945aad320ea6a Mon Sep 17 00:00:00 2001 From: Brian Maly Date: Thu, 30 Mar 2017 16:42:17 -0400 Subject: [PATCH] Revert "fix minor infoleak in get_user_ex()" Orabug: 25790370 CVE: CVE-2016-9644 This reverts commit fc2cba1c03dc9da0668d1719a6ad47b39c26b574. --- arch/x86/include/asm/uaccess.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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) \ -- 2.50.1