Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1516193
| From | Jiri Slaby <jslaby@suse.cz> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 3.12 69/72] Revert "fix minor infoleak in get_user_ex()" |
| Date | 2016-11-07 14:40 +0100 |
| Message-ID | <sASjv-3Kx-11@gated-at.bofh.it> (permalink) |
| References | <sASjv-3Kx-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
3.12-stable review patch. If anyone has any objections, please let me know.
===============
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 | 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 01635e4e187a..5838fa911aa0 100644
--- a/arch/x86/include/asm/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
@@ -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) \
--
2.10.2
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
[PATCH 3.12 69/72] Revert "fix minor infoleak in get_user_ex()" Jiri Slaby <jslaby@suse.cz> - 2016-11-07 14:40 +0100
Re: [PATCH 3.12 69/72] Revert "fix minor infoleak in get_user_ex()" Linus Torvalds <torvalds@linux-foundation.org> - 2016-11-07 18:10 +0100
Re: [PATCH 3.12 69/72] Revert "fix minor infoleak in get_user_ex()" Greg KH <greg@kroah.com> - 2016-11-08 11:40 +0100
csiph-web