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

MdeModulePkg NvmExpressDxe: Avoid crashing 'Mode' during OpenProtocol

Browse Source 
The gBS->OpenProtocol() calls to open EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL
in NvmExpress.c will crash the data in 'Mode' field of
'Private->Passthru'.

The third parameter of gBS->OpenProtocol() is an output parameter that
stores the address where a pointer to the corresponding Protocol
Interface. The current code mistakenly pass '&Private->Passthru' (a
pointer of the EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL) as the third
parameter. This will crash the data in 'Mode' filed.

Cc: Feng Tian <feng.tian@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
This commit is contained in:
Hao Wu 2016-08-26 14:39:37 +08:00
parent bc54e50e0f
commit 6fe3978014
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c
View File

@ -76,6 +76,7 @@ EnumerateNvmeDevNamespace (
UINT32 LbaFmtIdx; UINT32 LbaFmtIdx;
UINT8 Sn[21]; UINT8 Sn[21];
UINT8 Mn[41]; UINT8 Mn[41];
VOID *DummyInterface;
NewDevicePathNode = NULL; NewDevicePathNode = NULL;
DevicePath = NULL; DevicePath = NULL;
@ -264,7 +265,7 @@ EnumerateNvmeDevNamespace (
gBS->OpenProtocol ( gBS->OpenProtocol (
Private->ControllerHandle, Private->ControllerHandle,
&gEfiNvmExpressPassThruProtocolGuid, &gEfiNvmExpressPassThruProtocolGuid,
(VOID **) &Private->Passthru, (VOID **) &DummyInterface,
Private->DriverBindingHandle, Private->DriverBindingHandle,
Device->DeviceHandle, Device->DeviceHandle,
EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER
@ -392,10 +393,10 @@ UnregisterNvmeNamespace (
EFI_STATUS Status; EFI_STATUS Status;
EFI_BLOCK_IO_PROTOCOL *BlockIo; EFI_BLOCK_IO_PROTOCOL *BlockIo;
NVME_DEVICE_PRIVATE_DATA *Device; NVME_DEVICE_PRIVATE_DATA *Device;
NVME_CONTROLLER_PRIVATE_DATA *Private;
EFI_STORAGE_SECURITY_COMMAND_PROTOCOL *StorageSecurity; EFI_STORAGE_SECURITY_COMMAND_PROTOCOL *StorageSecurity;
BOOLEAN IsEmpty; BOOLEAN IsEmpty;
EFI_TPL OldTpl; EFI_TPL OldTpl;
VOID *DummyInterface;
BlockIo = NULL; BlockIo = NULL;
@ -412,7 +413,6 @@ UnregisterNvmeNamespace (
} }
Device = NVME_DEVICE_PRIVATE_DATA_FROM_BLOCK_IO (BlockIo); Device = NVME_DEVICE_PRIVATE_DATA_FROM_BLOCK_IO (BlockIo);
Private = Device->Controller;
// //
// Wait for the device's asynchronous I/O queue to become empty. // Wait for the device's asynchronous I/O queue to become empty.
@ -460,7 +460,7 @@ UnregisterNvmeNamespace (
gBS->OpenProtocol ( gBS->OpenProtocol (
Controller, Controller,
&gEfiNvmExpressPassThruProtocolGuid, &gEfiNvmExpressPassThruProtocolGuid,
(VOID **) &Private->Passthru, (VOID **) &DummyInterface,
This->DriverBindingHandle, This->DriverBindingHandle,
Handle, Handle,
EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER
@ -490,7 +490,7 @@ UnregisterNvmeNamespace (
gBS->OpenProtocol ( gBS->OpenProtocol (
Controller, Controller,
&gEfiNvmExpressPassThruProtocolGuid, &gEfiNvmExpressPassThruProtocolGuid,
(VOID **) &Private->Passthru, (VOID **) &DummyInterface,
This->DriverBindingHandle, This->DriverBindingHandle,
Handle, Handle,
EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER