Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6.git] / arch / x86 / kernel / tls.c
index 5291596..9d9d2f9 100644 (file)
@@ -2,13 +2,16 @@
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/user.h>
+#include <linux/regset.h>
 
 #include <asm/uaccess.h>
 #include <asm/desc.h>
-#include <asm/system.h>
 #include <asm/ldt.h>
 #include <asm/processor.h>
 #include <asm/proto.h>
+#include <asm/syscalls.h>
+
+#include "tls.h"
 
 /*
  * sys_alloc_thread_area: get a yet unused TLS descriptor index.
@@ -19,31 +22,58 @@ static int get_free_idx(void)
        int idx;
 
        for (idx = 0; idx < GDT_ENTRY_TLS_ENTRIES; idx++)
-               if (desc_empty((struct n_desc_struct *)(t->tls_array) + idx))
+               if (desc_empty(&t->tls_array[idx]))
                        return idx + GDT_ENTRY_TLS_MIN;
        return -ESRCH;
 }
 
+static void set_tls_desc(struct task_struct *p, int idx,
+                        const struct user_desc *info, int n)
+{
+       struct thread_struct *t = &p->thread;
+       struct desc_struct *desc = &t->tls_array[idx - GDT_ENTRY_TLS_MIN];
+       int cpu;
+
+       /*
+        * We must not get preempted while modifying the TLS.
+        */
+       cpu = get_cpu();
+
+       while (n-- > 0) {
+               if (LDT_empty(info))
+                       desc->a = desc->b = 0;
+               else
+                       fill_ldt(desc, info);
+               ++info;
+               ++desc;
+       }
+
+       if (t == &current->thread)
+               load_TLS(t, cpu);
+
+       put_cpu();
+}
+
 /*
  * Set a given TLS descriptor:
- * When you want addresses > 32bit use arch_prctl()
  */
-int do_set_thread_area(struct thread_struct *t, struct user_desc __user *u_info)
+int do_set_thread_area(struct task_struct *p, int idx,
+                      struct user_desc __user *u_info,
+                      int can_allocate)
 {
        struct user_desc info;
-       struct n_desc_struct *desc;
-       int cpu, idx;
 
        if (copy_from_user(&info, u_info, sizeof(info)))
                return -EFAULT;
 
-       idx = info.entry_number;
+       if (idx == -1)
+               idx = info.entry_number;
 
        /*
         * index -1 means the kernel should try to find and
         * allocate an empty descriptor:
         */
-       if (idx == -1) {
+       if (idx == -1 && can_allocate) {
                idx = get_free_idx();
                if (idx < 0)
                        return idx;
@@ -54,30 +84,16 @@ int do_set_thread_area(struct thread_struct *t, struct user_desc __user *u_info)
        if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
                return -EINVAL;
 
-       desc = ((struct n_desc_struct *)t->tls_array) + idx - GDT_ENTRY_TLS_MIN;
-
-       /*
-        * We must not get preempted while modifying the TLS.
-        */
-       cpu = get_cpu();
-
-       if (LDT_empty(&info)) {
-               desc->a = 0;
-               desc->b = 0;
-       } else {
-               desc->a = LDT_entry_a(&info);
-               desc->b = LDT_entry_b(&info);
-       }
-       if (t == &current->thread)
-               load_TLS(t, cpu);
+       set_tls_desc(p, idx, &info, 1);
 
-       put_cpu();
        return 0;
 }
 
-asmlinkage long sys32_set_thread_area(struct user_desc __user *u_info)
+asmlinkage int sys_set_thread_area(struct user_desc __user *u_info)
 {
-       return do_set_thread_area(&current->thread, u_info);
+       int ret = do_set_thread_area(current, -1, u_info, 1);
+       asmlinkage_protect(1, ret, u_info);
+       return ret;
 }
 
 
@@ -85,74 +101,117 @@ asmlinkage long sys32_set_thread_area(struct user_desc __user *u_info)
  * Get the current Thread-Local Storage area:
  */
 
-#define GET_LIMIT(desc) ( \
-       ((desc)->a & 0x0ffff) | \
-        ((desc)->b & 0xf0000) )
+static void fill_user_desc(struct user_desc *info, int idx,
+                          const struct desc_struct *desc)
 
-#define GET_32BIT(desc)                (((desc)->b >> 22) & 1)
-#define GET_CONTENTS(desc)     (((desc)->b >> 10) & 3)
-#define GET_WRITABLE(desc)     (((desc)->b >>  9) & 1)
-#define GET_LIMIT_PAGES(desc)  (((desc)->b >> 23) & 1)
-#define GET_PRESENT(desc)      (((desc)->b >> 15) & 1)
-#define GET_USEABLE(desc)      (((desc)->b >> 20) & 1)
-#define GET_LONGMODE(desc)     (((desc)->b >> 21) & 1)
+{
+       memset(info, 0, sizeof(*info));
+       info->entry_number = idx;
+       info->base_addr = get_desc_base(desc);
+       info->limit = get_desc_limit(desc);
+       info->seg_32bit = desc->d;
+       info->contents = desc->type >> 2;
+       info->read_exec_only = !(desc->type & 2);
+       info->limit_in_pages = desc->g;
+       info->seg_not_present = !desc->p;
+       info->useable = desc->avl;
+#ifdef CONFIG_X86_64
+       info->lm = desc->l;
+#endif
+}
 
-int do_get_thread_area(struct thread_struct *t, struct user_desc __user *u_info)
+int do_get_thread_area(struct task_struct *p, int idx,
+                      struct user_desc __user *u_info)
 {
        struct user_desc info;
-       struct n_desc_struct *desc;
-       int idx;
 
-       if (get_user(idx, &u_info->entry_number))
+       if (idx == -1 && get_user(idx, &u_info->entry_number))
                return -EFAULT;
+
        if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
                return -EINVAL;
 
-       desc = ((struct n_desc_struct *)t->tls_array) + idx - GDT_ENTRY_TLS_MIN;
-
-       memset(&info, 0, sizeof(struct user_desc));
-       info.entry_number = idx;
-       info.base_addr = get_desc_base(desc);
-       info.limit = GET_LIMIT(desc);
-       info.seg_32bit = GET_32BIT(desc);
-       info.contents = GET_CONTENTS(desc);
-       info.read_exec_only = !GET_WRITABLE(desc);
-       info.limit_in_pages = GET_LIMIT_PAGES(desc);
-       info.seg_not_present = !GET_PRESENT(desc);
-       info.useable = GET_USEABLE(desc);
-       info.lm = GET_LONGMODE(desc);
+       fill_user_desc(&info, idx,
+                      &p->thread.tls_array[idx - GDT_ENTRY_TLS_MIN]);
 
        if (copy_to_user(u_info, &info, sizeof(info)))
                return -EFAULT;
        return 0;
 }
 
-asmlinkage long sys32_get_thread_area(struct user_desc __user *u_info)
+asmlinkage int sys_get_thread_area(struct user_desc __user *u_info)
 {
-       return do_get_thread_area(&current->thread, u_info);
+       int ret = do_get_thread_area(current, -1, u_info);
+       asmlinkage_protect(1, ret, u_info);
+       return ret;
 }
 
+int regset_tls_active(struct task_struct *target,
+                     const struct user_regset *regset)
+{
+       struct thread_struct *t = &target->thread;
+       int n = GDT_ENTRY_TLS_ENTRIES;
+       while (n > 0 && desc_empty(&t->tls_array[n - 1]))
+               --n;
+       return n;
+}
 
-int ia32_child_tls(struct task_struct *p, struct pt_regs *childregs)
+int regset_tls_get(struct task_struct *target, const struct user_regset *regset,
+                  unsigned int pos, unsigned int count,
+                  void *kbuf, void __user *ubuf)
 {
-       struct n_desc_struct *desc;
-       struct user_desc info;
-       struct user_desc __user *cp;
-       int idx;
+       const struct desc_struct *tls;
 
-       cp = (void __user *)childregs->rsi;
-       if (copy_from_user(&info, cp, sizeof(info)))
-               return -EFAULT;
-       if (LDT_empty(&info))
+       if (pos >= GDT_ENTRY_TLS_ENTRIES * sizeof(struct user_desc) ||
+           (pos % sizeof(struct user_desc)) != 0 ||
+           (count % sizeof(struct user_desc)) != 0)
                return -EINVAL;
 
-       idx = info.entry_number;
-       if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
+       pos /= sizeof(struct user_desc);
+       count /= sizeof(struct user_desc);
+
+       tls = &target->thread.tls_array[pos];
+
+       if (kbuf) {
+               struct user_desc *info = kbuf;
+               while (count-- > 0)
+                       fill_user_desc(info++, GDT_ENTRY_TLS_MIN + pos++,
+                                      tls++);
+       } else {
+               struct user_desc __user *u_info = ubuf;
+               while (count-- > 0) {
+                       struct user_desc info;
+                       fill_user_desc(&info, GDT_ENTRY_TLS_MIN + pos++, tls++);
+                       if (__copy_to_user(u_info++, &info, sizeof(info)))
+                               return -EFAULT;
+               }
+       }
+
+       return 0;
+}
+
+int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
+                  unsigned int pos, unsigned int count,
+                  const void *kbuf, const void __user *ubuf)
+{
+       struct user_desc infobuf[GDT_ENTRY_TLS_ENTRIES];
+       const struct user_desc *info;
+
+       if (pos >= GDT_ENTRY_TLS_ENTRIES * sizeof(struct user_desc) ||
+           (pos % sizeof(struct user_desc)) != 0 ||
+           (count % sizeof(struct user_desc)) != 0)
                return -EINVAL;
 
-       desc = (struct n_desc_struct *)(p->thread.tls_array) + idx - GDT_ENTRY_TLS_MIN;
-       desc->a = LDT_entry_a(&info);
-       desc->b = LDT_entry_b(&info);
+       if (kbuf)
+               info = kbuf;
+       else if (__copy_from_user(infobuf, ubuf, count))
+               return -EFAULT;
+       else
+               info = infobuf;
+
+       set_tls_desc(target,
+                    GDT_ENTRY_TLS_MIN + (pos / sizeof(struct user_desc)),
+                    info, count / sizeof(struct user_desc));
 
        return 0;
 }