summaryrefslogtreecommitdiff
path: root/MdeModulePkg/Bus
diff options
context:
space:
mode:
authorerictian <erictian@6f19259b-4bc3-4df7-8a09-765794883524>2011-05-19 09:40:42 +0000
committererictian <erictian@6f19259b-4bc3-4df7-8a09-765794883524>2011-05-19 09:40:42 +0000
commit3c063fedc4bd816ef427065003dca41ba1f885d2 (patch)
tree041fb443f0c88d12480ee9985992a433cd6909eb /MdeModulePkg/Bus
parent86d8e1994269161ae77ab46383415a4f0338b8df (diff)
downloadedk2-platforms-3c063fedc4bd816ef427065003dca41ba1f885d2.tar.xz
fix memory leak at AccessAtaDevice() of AtaBus.
Signed-off-by: ftian Reviewed-by: qouyang git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11679 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg/Bus')
-rw-r--r--MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c29
-rw-r--r--MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c153
2 files changed, 104 insertions, 78 deletions
diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
index 12af44dee3..cb6ee7ae32 100644
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
+++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
@@ -153,8 +153,8 @@ ReleaseAtaResources (
EFI_TPL OldTpl;
FreeUnicodeStringTable (AtaDevice->ControllerNameTable);
- FreeAlignedBuffer (AtaDevice->Asb, sizeof (*AtaDevice->Asb));
- FreeAlignedBuffer (AtaDevice->IdentifyData, sizeof (*AtaDevice->IdentifyData));
+ FreeAlignedBuffer (AtaDevice->Asb, sizeof (EFI_ATA_STATUS_BLOCK));
+ FreeAlignedBuffer (AtaDevice->IdentifyData, sizeof (ATA_IDENTIFY_DATA));
if (AtaDevice->DevicePath != NULL) {
FreePool (AtaDevice->DevicePath);
}
@@ -163,7 +163,7 @@ ReleaseAtaResources (
//
// Free the Subtask list.
//
- for(Entry = (&AtaDevice->AtaTaskList)->ForwardLink;
+ for(Entry = AtaDevice->AtaTaskList.ForwardLink;
Entry != (&AtaDevice->AtaTaskList);
) {
DelEntry = Entry;
@@ -243,7 +243,7 @@ RegisterAtaDevice (
//
// Allocate ATA device from the template.
//
- AtaDevice = AllocateCopyPool (sizeof (gAtaDeviceTemplate), &gAtaDeviceTemplate);
+ AtaDevice = AllocateCopyPool (sizeof (ATA_DEVICE), &gAtaDeviceTemplate);
if (AtaDevice == NULL) {
Status = EFI_OUT_OF_RESOURCES;
goto Done;
@@ -258,12 +258,12 @@ RegisterAtaDevice (
AtaDevice->DevicePath = DevicePath;
AtaDevice->Port = Port;
AtaDevice->PortMultiplierPort = PortMultiplierPort;
- AtaDevice->Asb = AllocateAlignedBuffer (AtaDevice, sizeof (*AtaDevice->Asb));
+ AtaDevice->Asb = AllocateAlignedBuffer (AtaDevice, sizeof (EFI_ATA_STATUS_BLOCK));
if (AtaDevice->Asb == NULL) {
Status = EFI_OUT_OF_RESOURCES;
goto Done;
}
- AtaDevice->IdentifyData = AllocateAlignedBuffer (AtaDevice, sizeof (*AtaDevice->IdentifyData));
+ AtaDevice->IdentifyData = AllocateAlignedBuffer (AtaDevice, sizeof (ATA_IDENTIFY_DATA));
if (AtaDevice->IdentifyData == NULL) {
Status = EFI_OUT_OF_RESOURCES;
goto Done;
@@ -501,7 +501,7 @@ UnregisterAtaDevice (
Handle,
EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER
);
- return Status;
+ return Status;
}
}
@@ -1239,7 +1239,7 @@ AtaBlockIoFlushBlocksEx (
)
{
//
- // Signla event and return directly.
+ // Signal event and return directly.
//
if (Token != NULL && Token->Event != NULL) {
Token->TransactionStatus = EFI_SUCCESS;
@@ -1307,11 +1307,11 @@ AtaDiskInfoIdentify (
AtaDevice = ATA_DEVICE_FROM_DISK_INFO (This);
Status = EFI_BUFFER_TOO_SMALL;
- if (*IdentifyDataSize >= sizeof (*AtaDevice->IdentifyData)) {
+ if (*IdentifyDataSize >= sizeof (ATA_IDENTIFY_DATA)) {
Status = EFI_SUCCESS;
- CopyMem (IdentifyData, AtaDevice->IdentifyData, sizeof (*AtaDevice->IdentifyData));
+ CopyMem (IdentifyData, AtaDevice->IdentifyData, sizeof (ATA_IDENTIFY_DATA));
}
- *IdentifyDataSize = sizeof (*AtaDevice->IdentifyData);
+ *IdentifyDataSize = sizeof (ATA_IDENTIFY_DATA);
return Status;
}
@@ -1462,6 +1462,7 @@ AtaStorageSecurityReceiveData (
{
EFI_STATUS Status;
ATA_DEVICE *Private;
+ EFI_TPL OldTpl;
DEBUG ((EFI_D_INFO, "EFI Storage Security Protocol - Read"));
if ((PayloadBuffer == NULL || PayloadTransferSize == NULL) && PayloadBufferSize != 0) {
@@ -1479,6 +1480,8 @@ AtaStorageSecurityReceiveData (
return EFI_NO_MEDIA;
}
+ OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
+
Status = TrustTransferAtaDevice (
Private,
PayloadBuffer,
@@ -1490,6 +1493,7 @@ AtaStorageSecurityReceiveData (
PayloadTransferSize
);
+ gBS->RestoreTPL (OldTpl);
return Status;
}
@@ -1568,6 +1572,7 @@ AtaStorageSecuritySendData (
{
EFI_STATUS Status;
ATA_DEVICE *Private;
+ EFI_TPL OldTpl;
DEBUG ((EFI_D_INFO, "EFI Storage Security Protocol - Send"));
if ((PayloadBuffer == NULL) && (PayloadBufferSize != 0)) {
@@ -1581,6 +1586,7 @@ AtaStorageSecuritySendData (
return EFI_MEDIA_CHANGED;
}
+ OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
Status = TrustTransferAtaDevice (
Private,
PayloadBuffer,
@@ -1592,6 +1598,7 @@ AtaStorageSecuritySendData (
NULL
);
+ gBS->RestoreTPL (OldTpl);
return Status;
}
diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
index 58a9117f5d..1b77324aa8 100644
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
+++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
@@ -5,9 +5,9 @@
It transforms the high level identity, read/write, reset command to ATA pass
through command and protocol.
- NOTE: This file aslo implements the StorageSecurityCommandProtocol(SSP). For input
+ NOTE: This file also implements the StorageSecurityCommandProtocol(SSP). For input
parameter SecurityProtocolSpecificData, ATA spec has no explicitly definition
- for Security Protocol Specific layout. This implementation uses big edian for
+ for Security Protocol Specific layout. This implementation uses big endian for
Cylinder register.
Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
@@ -132,9 +132,9 @@ AtaDevicePassThru (
//
if (TaskPacket != NULL) {
Packet = TaskPacket;
- Packet->Asb = AllocateAlignedBuffer (AtaDevice, sizeof (*AtaDevice->Asb));
- CopyMem (Packet->Asb, AtaDevice->Asb, sizeof (*AtaDevice->Asb));
- Packet->Acb = AllocateCopyPool(sizeof (EFI_ATA_COMMAND_BLOCK), &AtaDevice->Acb);
+ Packet->Asb = AllocateAlignedBuffer (AtaDevice, sizeof (EFI_ATA_STATUS_BLOCK));
+ CopyMem (Packet->Asb, AtaDevice->Asb, sizeof (EFI_ATA_STATUS_BLOCK));
+ Packet->Acb = AllocateCopyPool (sizeof (EFI_ATA_COMMAND_BLOCK), &AtaDevice->Acb);
} else {
Packet = &AtaDevice->Packet;
Packet->Asb = AtaDevice->Asb;
@@ -398,16 +398,16 @@ DiscoverAtaDevice (
//
// Prepare for ATA command block.
//
- Acb = ZeroMem (&AtaDevice->Acb, sizeof (*Acb));
+ Acb = ZeroMem (&AtaDevice->Acb, sizeof (EFI_ATA_COMMAND_BLOCK));
Acb->AtaCommand = ATA_CMD_IDENTIFY_DRIVE;
Acb->AtaDeviceHead = (UINT8) (BIT7 | BIT6 | BIT5 | (AtaDevice->PortMultiplierPort << 4));
//
// Prepare for ATA pass through packet.
//
- Packet = ZeroMem (&AtaDevice->Packet, sizeof (*Packet));
+ Packet = ZeroMem (&AtaDevice->Packet, sizeof (EFI_ATA_PASS_THRU_COMMAND_PACKET));
Packet->InDataBuffer = AtaDevice->IdentifyData;
- Packet->InTransferLength = sizeof (*AtaDevice->IdentifyData);
+ Packet->InTransferLength = sizeof (ATA_IDENTIFY_DATA);
Packet->Protocol = EFI_ATA_PASS_THRU_PROTOCOL_PIO_DATA_IN;
Packet->Length = EFI_ATA_PASS_THRU_LENGTH_BYTES | EFI_ATA_PASS_THRU_LENGTH_SECTOR_COUNT;
Packet->Timeout = ATA_TIMEOUT;
@@ -478,7 +478,7 @@ TransferAtaDevice (
//
// Prepare for ATA command block.
//
- Acb = ZeroMem (&AtaDevice->Acb, sizeof (*Acb));
+ Acb = ZeroMem (&AtaDevice->Acb, sizeof (EFI_ATA_COMMAND_BLOCK));
Acb->AtaCommand = mAtaCommands[AtaDevice->UdmaValid][AtaDevice->Lba48Bit][IsWrite];
Acb->AtaSectorNumber = (UINT8) StartLba;
Acb->AtaCylinderLow = (UINT8) RShiftU64 (StartLba, 8);
@@ -498,9 +498,9 @@ TransferAtaDevice (
// Prepare for ATA pass through packet.
//
if (TaskPacket != NULL) {
- Packet = ZeroMem (TaskPacket, sizeof (*Packet));
+ Packet = ZeroMem (TaskPacket, sizeof (EFI_ATA_PASS_THRU_COMMAND_PACKET));
} else {
- Packet = ZeroMem (&AtaDevice->Packet, sizeof (*Packet));
+ Packet = ZeroMem (&AtaDevice->Packet, sizeof (EFI_ATA_PASS_THRU_COMMAND_PACKET));
}
if (IsWrite) {
@@ -531,7 +531,7 @@ FreeAtaSubTask (
)
{
if (Task->Packet.Asb != NULL) {
- FreeAlignedBuffer (Task->Packet.Asb, sizeof (Task->Packet.Asb));
+ FreeAlignedBuffer (Task->Packet.Asb, sizeof (EFI_ATA_STATUS_BLOCK));
}
if (Task->Packet.Acb != NULL) {
FreePool (Task->Packet.Acb);
@@ -544,7 +544,7 @@ FreeAtaSubTask (
Call back funtion when the event is signaled.
@param[in] Event The Event this notify function registered to.
- @param[in] Context Pointer to the context data registerd to the
+ @param[in] Context Pointer to the context data registered to the
Event.
**/
@@ -566,7 +566,7 @@ AtaNonBlockingCallBack (
// should be returned to the caller directly, so here the Task->Token may already
// be deleted by the caller and no need to update the status.
//
- if ((!(*Task->IsError)) && (Task->Packet.Asb->AtaStatus & 0x01) == 0x01) {
+ if ((!(*Task->IsError)) && ((Task->Packet.Asb->AtaStatus & 0x01) == 0x01)) {
Task->Token->TransactionStatus = EFI_DEVICE_ERROR;
}
DEBUG ((
@@ -579,7 +579,7 @@ AtaNonBlockingCallBack (
// Reduce the SubEventCount, till it comes to zero.
//
(*Task->UnsignalledEventCount) --;
- DEBUG ((DEBUG_INFO, "UnsignalledEventCount = %x\n", *Task->UnsignalledEventCount));
+ DEBUG ((DEBUG_INFO, "UnsignalledEventCount = %d\n", *Task->UnsignalledEventCount));
//
// Remove the SubTask from the Task list.
@@ -587,7 +587,7 @@ AtaNonBlockingCallBack (
RemoveEntryList (&Task->TaskEntry);
if ((*Task->UnsignalledEventCount) == 0) {
//
- // All Sub tasks are done, then signal the upper layyer event.
+ // All Sub tasks are done, then signal the upper layer event.
// Except there is error during the sub task source allocation.
//
if (!(*Task->IsError)) {
@@ -655,27 +655,14 @@ AccessAtaDevice(
BOOLEAN *IsError;
EFI_TPL OldTpl;
- SubEvent = NULL;
- TempCount = 0;
- Status = EFI_SUCCESS;
+ TempCount = 0;
+ Status = EFI_SUCCESS;
+ EventCount = NULL;
+ IsError = NULL;
+ Index = 0;
+ Task = NULL;
+ SubEvent = NULL;
- EventCount = AllocateZeroPool (sizeof (UINTN));
- if (EventCount == NULL) {
- return EFI_OUT_OF_RESOURCES;
- }
-
- IsError = AllocateZeroPool (sizeof (BOOLEAN));
- if (IsError == NULL) {
- goto EXIT;
- }
- *IsError = FALSE;
-
- //
- // Initial the return status for Non Blocking.
- //
- if (Token != NULL && Token->Event != NULL) {
- Token->TransactionStatus = EFI_SUCCESS;
- }
//
// Ensure AtaDevice->Lba48Bit is a valid boolean value
//
@@ -683,9 +670,27 @@ AccessAtaDevice(
MaxTransferBlockNumber = mMaxTransferBlockNumber[AtaDevice->Lba48Bit];
BlockSize = AtaDevice->BlockMedia.BlockSize;
- TempCount = (NumberOfBlocks + MaxTransferBlockNumber - 1) / MaxTransferBlockNumber;
- *EventCount = TempCount;
- Index = 0;
+ //
+ // Initial the return status and shared account for Non Blocking.
+ //
+ if ((Token != NULL) && (Token->Event != NULL)) {
+ Token->TransactionStatus = EFI_SUCCESS;
+
+ EventCount = AllocateZeroPool (sizeof (UINTN));
+ if (EventCount == NULL) {
+ return EFI_OUT_OF_RESOURCES;
+ }
+
+ IsError = AllocateZeroPool (sizeof (BOOLEAN));
+ if (IsError == NULL) {
+ FreePool (EventCount);
+ return EFI_OUT_OF_RESOURCES;
+ }
+ *IsError = FALSE;
+
+ TempCount = (NumberOfBlocks + MaxTransferBlockNumber - 1) / MaxTransferBlockNumber;
+ *EventCount = TempCount;
+ }
do {
if (NumberOfBlocks > MaxTransferBlockNumber) {
@@ -693,33 +698,28 @@ AccessAtaDevice(
NumberOfBlocks -= MaxTransferBlockNumber;
} else {
TransferBlockNumber = NumberOfBlocks;
- NumberOfBlocks = 0;
+ NumberOfBlocks = 0;
}
//
- // Create sub event for the sub Ata task. Non-Blocking Mode.
+ // Create sub event for the sub ata task. Non-blocking mode.
//
- if (Token != NULL && Token->Event != NULL) {
- OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
- Task = AllocateZeroPool (sizeof (ATA_BUS_ASYN_TASK));
+ if ((Token != NULL) && (Token->Event != NULL)) {
+ Task = NULL;
+ SubEvent = NULL;
+
+ Task = AllocateZeroPool (sizeof (ATA_BUS_ASYN_TASK));
if (Task == NULL) {
- //
- // If resource allocation fail, reduce the total sub event counts.
- //
- *EventCount = (*EventCount) - (TempCount - Index);
- *IsError = TRUE;
- Token->TransactionStatus = EFI_OUT_OF_RESOURCES;
- Status = EFI_OUT_OF_RESOURCES;
-
- gBS->RestoreTPL (OldTpl);
+ Status = EFI_OUT_OF_RESOURCES;
goto EXIT;
}
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
Task->UnsignalledEventCount = EventCount;
Task->Token = Token;
Task->IsError = IsError;
-
InsertTailList (&AtaDevice->AtaTaskList, &Task->TaskEntry);
+ gBS->RestoreTPL (OldTpl);
Status = gBS->CreateEvent (
EVT_NOTIFY_SIGNAL,
@@ -733,13 +733,9 @@ AccessAtaDevice(
// the original one minus the unassigned subtasks number.
//
if (EFI_ERROR (Status)) {
- *EventCount = (*EventCount) - (TempCount - Index);
- *IsError = TRUE;
- gBS->RestoreTPL (OldTpl);
+ Status = EFI_OUT_OF_RESOURCES;
goto EXIT;
}
- Index++;
- gBS->RestoreTPL (OldTpl);
DEBUG ((EFI_D_INFO, "NON-BLOCKING SET EVENT START: WRITE = %d\n", IsWrite));
Status = TransferAtaDevice (AtaDevice, &Task->Packet, Buffer, StartLba, (UINT32) TransferBlockNumber, IsWrite, SubEvent);
@@ -750,7 +746,7 @@ AccessAtaDevice(
TransferBlockNumber,
Status
));
- }else {
+ } else {
//
// Blocking Mode.
//
@@ -769,16 +765,39 @@ AccessAtaDevice(
goto EXIT;
}
+ Index++;
StartLba += TransferBlockNumber;
Buffer += TransferBlockNumber * BlockSize;
} while (NumberOfBlocks > 0);
EXIT:
+ if ((Token != NULL) && (Token->Event != NULL)) {
+ //
+ // Release resource at non-blocking mode.
+ //
+ if (EFI_ERROR (Status)) {
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
+ Token->TransactionStatus = Status;
+ *EventCount = (*EventCount) - (TempCount - Index);
+ *IsError = TRUE;
+
+ if (*EventCount == 0) {
+ FreePool (EventCount);
+ FreePool (IsError);
+ }
+
+ if (Task != NULL) {
+ RemoveEntryList (&Task->TaskEntry);
+ FreeAtaSubTask (Task);
+ }
- if (*EventCount == 0) {
- FreePool (EventCount);
- FreePool (IsError);
- }
+ if (SubEvent != NULL) {
+ gBS->CloseEvent (SubEvent);
+ }
+
+ gBS->RestoreTPL (OldTpl);
+ }
+ }
return Status;
}
@@ -839,7 +858,7 @@ TrustTransferAtaDevice (
//
// Prepare for ATA command block.
//
- Acb = ZeroMem (&AtaDevice->Acb, sizeof (*Acb));
+ Acb = ZeroMem (&AtaDevice->Acb, sizeof (EFI_ATA_COMMAND_BLOCK));
if (TransferLength == 0) {
Acb->AtaCommand = ATA_CMD_TRUST_NON_DATA;
} else {
@@ -850,7 +869,7 @@ TrustTransferAtaDevice (
Acb->AtaSectorNumber = (UINT8) ((TransferLength / 512) >> 8);
//
// NOTE: ATA Spec has no explicitly definition for Security Protocol Specific layout.
- // Here use big edian for Cylinder register.
+ // Here use big endian for Cylinder register.
//
Acb->AtaCylinderHigh = (UINT8) SecurityProtocolSpecificData;
Acb->AtaCylinderLow = (UINT8) (SecurityProtocolSpecificData >> 8);
@@ -859,7 +878,7 @@ TrustTransferAtaDevice (
//
// Prepare for ATA pass through packet.
//
- Packet = ZeroMem (&AtaDevice->Packet, sizeof (*Packet));
+ Packet = ZeroMem (&AtaDevice->Packet, sizeof (EFI_ATA_PASS_THRU_COMMAND_PACKET));
if (TransferLength == 0) {
Packet->InTransferLength = 0;
Packet->OutTransferLength = 0;