Changeset e9e5b9ab in mainline

Timestamp:

2010-11-09T23:15:15Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

854bfa5

Parents:

da88a079

Message:

Disable access to I/O ports that are in the last byte of the I/O port access
map, but already outside of the enabled range.

Location:

kernel/arch

Files:

• amd64/src/ddi/ddi.c (modified) (1 diff)
• ia32/src/ddi/ddi.c (modified) (1 diff)

kernel/arch/amd64/src/ddi/ddi.c

@@ -126 +126 @@
                 bitmap_initialize(&iomap, CPU->arch.tss->iomap,
                     TSS_IOMAP_SIZE * 8);
-                bitmap_copy(&iomap, &TASK->arch.iomap, TASK->arch.iomap.bits);
+                bitmap_copy(&iomap, &TASK->arch.iomap, bits);
                 
+                /*
+                 * Set the trailing bits in the last byte of the map to disable
+                 * I/O access.
+                 */
+                bitmap_set_range(&iomap, bits, ALIGN_UP(bits, 8) - bits);
                 /*
                  * It is safe to set the trailing eight bits because of the
                  * extra convenience byte in TSS_IOMAP_SIZE.
                  */
-                bitmap_set_range(&iomap, ALIGN_UP(TASK->arch.iomap.bits, 8), 8);
+                bitmap_set_range(&iomap, ALIGN_UP(bits, 8), 8);
         }
         irq_spinlock_unlock(&TASK->lock, false);

kernel/arch/ia32/src/ddi/ddi.c

@@ -127 +127 @@
                 bitmap_initialize(&iomap, CPU->arch.tss->iomap,
                     TSS_IOMAP_SIZE * 8);
-                bitmap_copy(&iomap, &TASK->arch.iomap, TASK->arch.iomap.bits);
+                bitmap_copy(&iomap, &TASK->arch.iomap, bits);
                 
+                /*
+                 * Set the trailing bits in the last byte of the map to disable
+                 * I/O access.
+                 */
+                bitmap_set_range(&iomap, bits, ALIGN_UP(bits, 8) - bits);
                 /*
                  * It is safe to set the trailing eight bits because of the
                  * extra convenience byte in TSS_IOMAP_SIZE.
                  */
-                bitmap_set_range(&iomap, ALIGN_UP(TASK->arch.iomap.bits, 8), 8);
+                bitmap_set_range(&iomap, ALIGN_UP(bits, 8), 8);
         }
         irq_spinlock_unlock(&TASK->lock, false);