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

Add a lock to protect the critical region in UEFI Boot Service API: Exit() and UnloadImage from re-entrance from different TPL level.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2437 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qwang12 2007-03-12 06:26:10 +00:00
parent 87c40bc89d
commit d126eaecb0
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
EdkModulePkg/Core/Dxe/Image/Image.c
View File

@ -1,6 +1,6 @@
/*++ /*++
Copyright (c) 2006, Intel Corporation Copyright (c) 2006 - 2007, Intel Corporation
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -24,6 +24,9 @@ Abstract:
// Module Globals // Module Globals
// //
EFI_LOCK mBsExitLock = EFI_INITIALIZE_LOCK_VARIABLE(EFI_TPL_NOTIFY);
EFI_LOCK mBsUnloadImageLock = EFI_INITIALIZE_LOCK_VARIABLE(EFI_TPL_NOTIFY);
LOADED_IMAGE_PRIVATE_DATA *mCurrentImage = NULL; LOADED_IMAGE_PRIVATE_DATA *mCurrentImage = NULL;
LOAD_PE32_IMAGE_PRIVATE_DATA mLoadPe32PrivateData = { LOAD_PE32_IMAGE_PRIVATE_DATA mLoadPe32PrivateData = {
@ -1219,9 +1222,12 @@ Returns:
{ {
LOADED_IMAGE_PRIVATE_DATA *Image; LOADED_IMAGE_PRIVATE_DATA *Image;
EfiAcquireLock (&mBsExitLock);
Image = CoreLoadedImageInfo (ImageHandle); Image = CoreLoadedImageInfo (ImageHandle);
if (Image == NULL_HANDLE) { if (Image == NULL_HANDLE) {
return EFI_INVALID_PARAMETER; Status = EFI_INVALID_PARAMETER;
goto Done;
} }
if (!Image->Started) { if (!Image->Started) {
@ -1229,7 +1235,8 @@ Returns:
// The image has not been started so just free its resources // The image has not been started so just free its resources
// //
CoreUnloadAndCloseImage (Image, TRUE); CoreUnloadAndCloseImage (Image, TRUE);
return EFI_SUCCESS; Status = EFI_SUCCESS;
goto Done;
} }
// //
@ -1237,7 +1244,8 @@ Returns:
// //
if (Image != mCurrentImage) { if (Image != mCurrentImage) {
DEBUG ((EFI_D_LOAD|EFI_D_ERROR, "Exit: Image is not exitable image\n")); DEBUG ((EFI_D_LOAD|EFI_D_ERROR, "Exit: Image is not exitable image\n"));
return EFI_INVALID_PARAMETER; Status = EFI_INVALID_PARAMETER;
goto Done;
} }
// //
@ -1252,11 +1260,13 @@ Returns:
Image->ExitDataSize = ExitDataSize; Image->ExitDataSize = ExitDataSize;
Image->ExitData = CoreAllocateBootServicesPool (Image->ExitDataSize); Image->ExitData = CoreAllocateBootServicesPool (Image->ExitDataSize);
if (Image->ExitData == NULL) { if (Image->ExitData == NULL) {
return EFI_OUT_OF_RESOURCES; Status = EFI_OUT_OF_RESOURCES;
goto Done;
} }
CopyMem (Image->ExitData, ExitData, Image->ExitDataSize); CopyMem (Image->ExitData, ExitData, Image->ExitDataSize);
} }
EfiReleaseLock (&mBsExitLock);
// //
// return to StartImage // return to StartImage
// //
@ -1266,7 +1276,10 @@ Returns:
// If we return from LongJump, then it is an error // If we return from LongJump, then it is an error
// //
ASSERT (FALSE); ASSERT (FALSE);
return EFI_ACCESS_DENIED; Status = EFI_ACCESS_DENIED;
Done:
EfiReleaseLock (&mBsExitLock);
return Status;
} }
@ -1297,12 +1310,15 @@ Returns:
EFI_STATUS Status; EFI_STATUS Status;
LOADED_IMAGE_PRIVATE_DATA *Image; LOADED_IMAGE_PRIVATE_DATA *Image;
EfiAcquireLock (&mBsUnloadImageLock);
Image = CoreLoadedImageInfo (ImageHandle); Image = CoreLoadedImageInfo (ImageHandle);
if (Image == NULL ) { if (Image == NULL ) {
// //
// The image handle is not valid // The image handle is not valid
// //
return EFI_INVALID_PARAMETER; Status = EFI_INVALID_PARAMETER;
goto Done;
} }
if (Image->Started) { if (Image->Started) {
@ -1329,6 +1345,8 @@ Returns:
CoreUnloadAndCloseImage (Image, TRUE); CoreUnloadAndCloseImage (Image, TRUE);
} }
Done:
EfiReleaseLock (&mBsUnloadImageLock);
return Status; return Status;
} }