vserver 1.9.3

[linux-2.6.git] / arch / x86_64 / kernel / ioport.c

diff --git a/arch/x86_64/kernel/ioport.c b/arch/x86_64/kernel/ioport.c
index 0a90fd0..cde0e86 100644 (file)
--- a/arch/x86_64/kernel/ioport.c
+++ b/arch/x86_64/kernel/ioport.c
@@ -28,12 +28,12 @@ static void set_bitmap(unsigned long *bitmap, unsigned int base, unsigned int ex
                        clear_bit(i, bitmap); 
 }
 
-
 /*
  * this changes the io permissions bitmap in the current task.
  */
 asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
 {
+       unsigned int i, max_long, bytes, bytes_updated;
        struct thread_struct * t = &current->thread;
        struct tss_struct * tss;
        unsigned long *bitmap;
@@ -59,16 +59,34 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
 
        /*
         * do it in the per-thread copy and in the TSS ...
+        *
+        * Disable preemption via get_cpu() - we must not switch away
+        * because the ->io_bitmap_max value must match the bitmap
+        * contents:
         */
+       tss = &per_cpu(init_tss, get_cpu());
+
        set_bitmap(t->io_bitmap_ptr, from, num, !turn_on);
-       tss = init_tss + get_cpu();
-       if (tss->io_bitmap_base == IO_BITMAP_OFFSET) { /* already active? */
-               set_bitmap(tss->io_bitmap, from, num, !turn_on);
-       } else {
-               memcpy(tss->io_bitmap, t->io_bitmap_ptr, IO_BITMAP_BYTES);
-               tss->io_bitmap_base = IO_BITMAP_OFFSET; /* Activate it in the TSS */
-       }
+
+       /*
+        * Search for a (possibly new) maximum. This is simple and stupid,
+        * to keep it obviously correct:
+        */
+       max_long = 0;
+       for (i = 0; i < IO_BITMAP_LONGS; i++)
+               if (t->io_bitmap_ptr[i] != ~0UL)
+                       max_long = i;
+
+       bytes = (max_long + 1) * sizeof(long);
+       bytes_updated = max(bytes, t->io_bitmap_max);
+
+       t->io_bitmap_max = bytes;
+
+       /* Update the TSS: */
+       memcpy(tss->io_bitmap, t->io_bitmap_ptr, bytes_updated);
+
        put_cpu();
+
        return 0;
 }
 
@@ -83,9 +101,9 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
  * code.
  */
 
-asmlinkage long sys_iopl(unsigned int level, struct pt_regs regs)
+asmlinkage long sys_iopl(unsigned int level, struct pt_regs *regs)
 {
-       unsigned int old = (regs.eflags >> 12) & 3;
+       unsigned int old = (regs->eflags >> 12) & 3;
 
        if (level > 3)
                return -EINVAL;
@@ -94,6 +112,6 @@ asmlinkage long sys_iopl(unsigned int level, struct pt_regs regs)
                if (!capable(CAP_SYS_RAWIO))
                        return -EPERM;
        }
-       regs.eflags = (regs.eflags &~ 0x3000UL) | (level << 12);
+       regs->eflags = (regs->eflags &~ 0x3000UL) | (level << 12);
        return 0;
 }