1 files changed, 45 insertions, 0 deletions

diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
index f7fec09e3e3a..3e551eee87b9 100644
--- a/arch/x86/kernel/tls.c
+++ b/arch/x86/kernel/tls.c
@@ -27,6 +27,43 @@ static int get_free_idx(void)
         return -ESRCH;
 }
 
+static bool tls_desc_okay(const struct user_desc *info)
+{
+        if (LDT_empty(info))
+                return true;
+
+        /*
+         * espfix is required for 16-bit data segments, but espfix
+         * only works for LDT segments.
+         */
+        if (!info->seg_32bit)
+                return false;
+
+        /* Only allow data segments in the TLS array. */
+        if (info->contents > 1)
+                return false;
+
+        /*
+         * Non-present segments with DPL 3 present an interesting attack
+         * surface.  The kernel should handle such segments correctly,
+         * but TLS is very difficult to protect in a sandbox, so prevent
+         * such segments from being created.
+         *
+         * If userspace needs to remove a TLS entry, it can still delete
+         * it outright.
+         */
+        if (info->seg_not_present)
+                return false;
+
+#ifdef CONFIG_X86_64
+        /* The L bit makes no sense for data. */
+        if (info->lm)
+                return false;
+#endif
+
+        return true;
+}
+
 static void set_tls_desc(struct task_struct *p, int idx,
                          const struct user_desc *info, int n)
 {
@@ -66,6 +103,9 @@ int do_set_thread_area(struct task_struct *p, int idx,
         if (copy_from_user(&info, u_info, sizeof(info)))
                 return -EFAULT;
 
+        if (!tls_desc_okay(&info))
+                return -EINVAL;
+
         if (idx == -1)
                 idx = info.entry_number;
 
@@ -192,6 +232,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
 {
         struct user_desc infobuf[GDT_ENTRY_TLS_ENTRIES];
         const struct user_desc *info;
+        int i;
 
         if (pos >= GDT_ENTRY_TLS_ENTRIES * sizeof(struct user_desc) ||
             (pos % sizeof(struct user_desc)) != 0 ||
@@ -205,6 +246,10 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
         else
                 info = infobuf;
 
+        for (i = 0; i < count / sizeof(struct user_desc); i++)
+                if (!tls_desc_okay(info + i))
+                        return -EINVAL;
+
         set_tls_desc(target,
                      GDT_ENTRY_TLS_MIN + (pos / sizeof(struct user_desc)),
                      info, count / sizeof(struct user_desc));