mirror of
https://github.com/xcat2/xNBA.git
synced 2024-11-22 01:21:45 +00:00
[librm] Allow for the PIC interrupt vector offset to be changed
Some external code (observed with FreeBSD's bootloader) will continue to make INT 13 calls after reconfiguring the 8259 PIC to change the vector offsets for IRQs. If an IRQ (e.g. the timer IRQ) subsequently occurs while iPXE is in protected mode, this will cause a general protection fault since the corresponding IDT entry is empty. A general protection fault is INT 0x0d, which happens to overlap with the original IRQ5. We therefore do have an ISR set up to handle a general protection fault, but this ISR simply reflects the interrupt down to the real-mode INT 0x0d and then attempts to return. Since our ISR is expecting a hardware interrupt rather than a general protection fault, it doesn't remove the error code from the stack before issuing the iret instruction; it therefore attempts to return to a garbage address. Since the segment part of this address is likely to be invalid, a second general protection fault occurs. This cycle continues until we run out of stack space and triple fault. Fix by reflecting all INTs down to real mode. This actually reduces the code size by four bytes (but increases the bss size by almost 2kB). Reported-by: Brian Rak <dn@devicenull.org> Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
parent
7627f6c071
commit
f3d423b26b
@ -21,7 +21,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
|
||||
extern char interrupt_wrapper[];
|
||||
|
||||
/** The interrupt vectors */
|
||||
static struct interrupt_vector intr_vec[ IRQ_MAX + 1 ];
|
||||
static struct interrupt_vector intr_vec[NUM_INT];
|
||||
|
||||
/** The interrupt descriptor table */
|
||||
struct interrupt_descriptor idt[NUM_INT] __attribute__ (( aligned ( 16 ) ));
|
||||
@ -90,13 +90,11 @@ void set_interrupt_vector ( unsigned int intr, void *vector ) {
|
||||
*/
|
||||
void init_idt ( void ) {
|
||||
struct interrupt_vector *vec;
|
||||
unsigned int irq;
|
||||
unsigned int intr;
|
||||
|
||||
/* Initialise the interrupt descriptor table and interrupt vectors */
|
||||
for ( irq = 0 ; irq <= IRQ_MAX ; irq++ ) {
|
||||
intr = IRQ_INT ( irq );
|
||||
vec = &intr_vec[irq];
|
||||
for ( intr = 0 ; intr < NUM_INT ; intr++ ) {
|
||||
vec = &intr_vec[intr];
|
||||
vec->pushal = PUSHAL_INSN;
|
||||
vec->movb = MOVB_INSN;
|
||||
vec->intr = intr;
|
||||
@ -105,6 +103,9 @@ void init_idt ( void ) {
|
||||
( uint32_t ) vec->next );
|
||||
set_interrupt_vector ( intr, vec );
|
||||
}
|
||||
DBGC ( &intr_vec[0], "INTn vector at %p+%xn (phys %#lx+%xn)\n",
|
||||
intr_vec, sizeof ( intr_vec[0] ),
|
||||
virt_to_phys ( intr_vec ), sizeof ( intr_vec[0] ) );
|
||||
|
||||
/* Initialise the interrupt descriptor table register */
|
||||
idtr.base = virt_to_phys ( idt );
|
||||
|
Loading…
Reference in New Issue
Block a user