tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-20 20:24:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix the potential illegal EBC opcode issue.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7500 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qhuang8 2009-02-11 06:01:07 +00:00
parent 4798ea5b2a
commit ead7e7dc74
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
MdeModulePkg/Universal/EbcDxe/EbcExecute.c
View File

@ -1330,7 +1330,13 @@ CONST VM_TABLE_ENTRY mVmOpcodeTable[] = {
{ ExecutePOPn }, // opcode 0x36 { ExecutePOPn }, // opcode 0x36
{ ExecuteMOVI }, // opcode 0x37 - mov immediate data { ExecuteMOVI }, // opcode 0x37 - mov immediate data
{ ExecuteMOVIn }, // opcode 0x38 - mov immediate natural { ExecuteMOVIn }, // opcode 0x38 - mov immediate natural
{ ExecuteMOVREL } // opcode 0x39 - move data relative to PC { ExecuteMOVREL }, // opcode 0x39 - move data relative to PC
{ NULL }, // opcode 0x3a
{ NULL }, // opcode 0x3b
{ NULL }, // opcode 0x3c
{ NULL }, // opcode 0x3d
{ NULL }, // opcode 0x3e
{ NULL } // opcode 0x3f
}; };
// //
@ -1370,11 +1376,6 @@ EbcExecuteInstructions (
UINTN InstructionsLeft; UINTN InstructionsLeft;
UINTN SavedInstructionCount; UINTN SavedInstructionCount;
if ((*VmPtr->Ip & 0x3F) >= sizeof(mVmOpcodeTable)/sizeof(mVmOpcodeTable[0])) {
EbcDebugSignalException (EXCEPT_EBC_INVALID_OPCODE, EXCEPTION_FLAG_FATAL, VmPtr);
return EFI_UNSUPPORTED;
}
Status = EFI_SUCCESS; Status = EFI_SUCCESS;
if (*InstructionCount == 0) { if (*InstructionCount == 0) {
@ -1392,12 +1393,12 @@ EbcExecuteInstructions (
// call it if it's not null. // call it if it's not null.
// //
while (InstructionsLeft != 0) { while (InstructionsLeft != 0) {
ExecFunc = (UINTN) mVmOpcodeTable[(*VmPtr->Ip & 0x3F)].ExecuteFunction; ExecFunc = (UINTN) mVmOpcodeTable[(*VmPtr->Ip & OPCODE_M_OPCODE)].ExecuteFunction;
if (ExecFunc == (UINTN) NULL) { if (ExecFunc == (UINTN) NULL) {
EbcDebugSignalException (EXCEPT_EBC_INVALID_OPCODE, EXCEPTION_FLAG_FATAL, VmPtr); EbcDebugSignalException (EXCEPT_EBC_INVALID_OPCODE, EXCEPTION_FLAG_FATAL, VmPtr);
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} else { } else {
mVmOpcodeTable[(*VmPtr->Ip & 0x3F)].ExecuteFunction (VmPtr); mVmOpcodeTable[(*VmPtr->Ip & OPCODE_M_OPCODE)].ExecuteFunction (VmPtr);
*InstructionCount = *InstructionCount + 1; *InstructionCount = *InstructionCount + 1;
} }
@ -1482,14 +1483,6 @@ EbcExecute (
} }
DEBUG_CODE_END (); DEBUG_CODE_END ();
//
// Verify the opcode is in range. Otherwise generate an exception.
//
if ((*VmPtr->Ip & OPCODE_M_OPCODE) >= (sizeof (mVmOpcodeTable) / sizeof (mVmOpcodeTable[0]))) {
EbcDebugSignalException (EXCEPT_EBC_INVALID_OPCODE, EXCEPTION_FLAG_FATAL, VmPtr);
Status = EFI_UNSUPPORTED;
goto Done;
}
// //
// Use the opcode bits to index into the opcode dispatch table. If the // Use the opcode bits to index into the opcode dispatch table. If the
// function pointer is null then generate an exception. // function pointer is null then generate an exception.
@ -4139,6 +4132,7 @@ ExecuteDataManip (
UINT8 Size; UINT8 Size;
UINT64 Op1; UINT64 Op1;
UINT64 Op2; UINT64 Op2;
INTN DataManipDispatchTableIndex;
// //
// Get opcode and operands // Get opcode and operands
@ -4220,9 +4214,9 @@ ExecuteDataManip (
// //
// Dispatch to the computation function // Dispatch to the computation function
// //
if (((Opcode & OPCODE_M_OPCODE) - OPCODE_NOT) >= DataManipDispatchTableIndex = (Opcode & OPCODE_M_OPCODE) - OPCODE_NOT;
(sizeof (mDataManipDispatchTable) / sizeof (mDataManipDispatchTable[0])) if ((DataManipDispatchTableIndex < 0) ||
) { (DataManipDispatchTableIndex >= sizeof (mDataManipDispatchTable) / sizeof (mDataManipDispatchTable[0]))) {
EbcDebugSignalException ( EbcDebugSignalException (
EXCEPT_EBC_INVALID_OPCODE, EXCEPT_EBC_INVALID_OPCODE,
EXCEPTION_FLAG_ERROR, EXCEPTION_FLAG_ERROR,
@ -4234,7 +4228,7 @@ ExecuteDataManip (
VmPtr->Ip += Size; VmPtr->Ip += Size;
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} else { } else {
Op2 = mDataManipDispatchTable[(Opcode & OPCODE_M_OPCODE) - OPCODE_NOT](VmPtr, Op1, Op2); Op2 = mDataManipDispatchTable[DataManipDispatchTableIndex](VmPtr, Op1, Op2);
} }
// //
// Write back the result. // Write back the result.

4
MdeModulePkg/Universal/EbcDxe/EbcInt.h
View File

@ -106,7 +106,7 @@ EbcCreateThunks (
/** /**
Add a thunk to our list of thunks for a given image handle. Add a thunk to our list of thunks for a given image handle.
Also flush the instruction cache since we have written thunk code Also flush the instruction cache since we've written thunk code
to memory that will be executed eventually. to memory that will be executed eventually.
@param ImageHandle The image handle to which the thunk is tied. @param ImageHandle The image handle to which the thunk is tied.
@ -249,7 +249,7 @@ EbcLLGetReturnValue (
); );
/** /**
Returns the stack index and buffer associated with the Handle parameter. Returns the stack index and buffer assosicated with the Handle parameter.
@param Handle The EFI handle as the index to the EBC stack. @param Handle The EFI handle as the index to the EBC stack.
@param StackBuffer A pointer to hold the returned stack buffer. @param StackBuffer A pointer to hold the returned stack buffer.