Fix a security hole in shell binaries:

[mirror_edk2.git] / PcAtChipsetPkg / 8259InterruptControllerDxe / 8259.c

diff --git a/PcAtChipsetPkg/8259InterruptControllerDxe/8259.c b/PcAtChipsetPkg/8259InterruptControllerDxe/8259.c
index 7d33f847e7212ced5069ac146d799d8af232e35a..22d03c8e38090014f07bed3436ace52a513f1f6b 100644 (file)
--- a/PcAtChipsetPkg/8259InterruptControllerDxe/8259.c
+++ b/PcAtChipsetPkg/8259InterruptControllerDxe/8259.c
@@ -38,9 +38,9 @@ UINT8                     mMasterBase             = 0xff;
 UINT8                     mSlaveBase              = 0xff;\r
 EFI_8259_MODE             mMode                   = Efi8259ProtectedMode;\r
 UINT16                    mProtectedModeMask      = 0xffff;\r
-UINT16                    mLegacyModeMask         = 0x06b8;\r
+UINT16                    mLegacyModeMask         = FixedPcdGet16(Pcd8259LegacyModeMask);\r
 UINT16                    mProtectedModeEdgeLevel = 0x0000;\r
-UINT16                    mLegacyModeEdgeLevel    = 0x0000;\r
+UINT16                    mLegacyModeEdgeLevel    = FixedPcdGet16(Pcd8259LegacyModeEdgeLevel);\r
 \r
 //\r
 // Worker Functions\r
@@ -209,8 +209,8 @@ Interrupt8259SetVectorBase (
     IoWrite8 (LEGACY_8259_MASK_REGISTER_MASTER, Mask);\r
   }\r
 \r
-  IoWrite8 (LEGACY_8259_CONTROL_REGISTER_SLAVE, 0x20);\r
-  IoWrite8 (LEGACY_8259_CONTROL_REGISTER_MASTER, 0x20);\r
+  IoWrite8 (LEGACY_8259_CONTROL_REGISTER_SLAVE, LEGACY_8259_EOI);\r
+  IoWrite8 (LEGACY_8259_CONTROL_REGISTER_MASTER, LEGACY_8259_EOI);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -351,11 +351,6 @@ Interrupt8259SetMode (
     //\r
     // Write new legacy mode mask/trigger level\r
     //\r
-    Interrupt8259SetVectorBase (This, LEGACY_MODE_BASE_VECTOR_MASTER, LEGACY_MODE_BASE_VECTOR_SLAVE);\r
-\r
-    //\r
-    // Enable Interrupts\r
-    //\r
     Interrupt8259WriteMask (mLegacyModeMask, mLegacyModeEdgeLevel);\r
 \r
     return EFI_SUCCESS;\r
@@ -391,11 +386,6 @@ Interrupt8259SetMode (
     //\r
     // Write new protected mode mask/trigger level\r
     //\r
-    Interrupt8259SetVectorBase (This, PROTECTED_MODE_BASE_VECTOR_MASTER, PROTECTED_MODE_BASE_VECTOR_SLAVE);\r
-\r
-    //\r
-    // Enable Interrupts\r
-    //\r
     Interrupt8259WriteMask (mProtectedModeMask, mProtectedModeEdgeLevel);\r
 \r
     return EFI_SUCCESS;\r
@@ -519,7 +509,33 @@ Interrupt8259GetInterruptLine (
   OUT UINT8                     *Vector\r
   )\r
 {\r
-  return EFI_UNSUPPORTED;\r
+  EFI_PCI_IO_PROTOCOL *PciIo;\r
+  UINT8               InterruptLine;\r
+  EFI_STATUS          Status;\r
+\r
+  Status = gBS->HandleProtocol (\r
+                  PciHandle,\r
+                  &gEfiPciIoProtocolGuid,\r
+                  (VOID **) &PciIo\r
+                  );\r
+  if (EFI_ERROR (Status)) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
+\r
+  PciIo->Pci.Read (\r
+               PciIo,\r
+               EfiPciIoWidthUint8,\r
+               PCI_INT_LINE_OFFSET,\r
+               1,\r
+               &InterruptLine\r
+               );\r
+  //\r
+  // Interrupt line is same location for standard PCI cards, standard\r
+  // bridge and CardBus bridge.\r
+  //\r
+  *Vector = InterruptLine;\r
+\r
+  return EFI_SUCCESS;\r
 }\r
 \r
 /**\r