summaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-19 13:18:31 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-19 13:18:31 -0800
commit1092b596a56b6ac5fa3154dc75bfcbb6f27ac757 (patch)
treea804de50bae89bba47aaa414e6a4fb033da0dd94 /arch/x86/include
parent88a57667f2990f00b019d46c8426441c9e516d51 (diff)
parent3fb2f4237bb452eb4e98f6a5dbd5a445b4fed9d0 (diff)
downloadlinux-1092b596a56b6ac5fa3154dc75bfcbb6f27ac757.tar.bz2
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Ingo Molnar: "This contains a single TLS ABI validation fix from Andy Lutomirski" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/tls: Don't validate lm in set_thread_area() after all
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/uapi/asm/ldt.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/include/uapi/asm/ldt.h b/arch/x86/include/uapi/asm/ldt.h
index 46727eb37bfe..6e1aaf73852a 100644
--- a/arch/x86/include/uapi/asm/ldt.h
+++ b/arch/x86/include/uapi/asm/ldt.h
@@ -28,6 +28,13 @@ struct user_desc {
unsigned int seg_not_present:1;
unsigned int useable:1;
#ifdef __x86_64__
+ /*
+ * Because this bit is not present in 32-bit user code, user
+ * programs can pass uninitialized values here. Therefore, in
+ * any context in which a user_desc comes from a 32-bit program,
+ * the kernel must act as though lm == 0, regardless of the
+ * actual value.
+ */
unsigned int lm:1;
#endif
};