From 6fe39780140f9f429c97a71ca3bfa4e16e779793 Mon Sep 17 00:00:00 2001 From: Hao Wu Date: Fri, 26 Aug 2016 14:39:37 +0800 Subject: MdeModulePkg NvmExpressDxe: Avoid crashing 'Mode' during OpenProtocol 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 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu Reviewed-by: Feng Tian --- MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'MdeModulePkg') diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c index cb25b3e08d..255fa2ba5a 100644 --- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c +++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c @@ -76,6 +76,7 @@ EnumerateNvmeDevNamespace ( UINT32 LbaFmtIdx; UINT8 Sn[21]; UINT8 Mn[41]; + VOID *DummyInterface; NewDevicePathNode = NULL; DevicePath = NULL; @@ -264,7 +265,7 @@ EnumerateNvmeDevNamespace ( gBS->OpenProtocol ( Private->ControllerHandle, &gEfiNvmExpressPassThruProtocolGuid, - (VOID **) &Private->Passthru, + (VOID **) &DummyInterface, Private->DriverBindingHandle, Device->DeviceHandle, EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER @@ -392,10 +393,10 @@ UnregisterNvmeNamespace ( EFI_STATUS Status; EFI_BLOCK_IO_PROTOCOL *BlockIo; NVME_DEVICE_PRIVATE_DATA *Device; - NVME_CONTROLLER_PRIVATE_DATA *Private; EFI_STORAGE_SECURITY_COMMAND_PROTOCOL *StorageSecurity; BOOLEAN IsEmpty; EFI_TPL OldTpl; + VOID *DummyInterface; BlockIo = NULL; @@ -412,7 +413,6 @@ UnregisterNvmeNamespace ( } Device = NVME_DEVICE_PRIVATE_DATA_FROM_BLOCK_IO (BlockIo); - Private = Device->Controller; // // Wait for the device's asynchronous I/O queue to become empty. @@ -460,7 +460,7 @@ UnregisterNvmeNamespace ( gBS->OpenProtocol ( Controller, &gEfiNvmExpressPassThruProtocolGuid, - (VOID **) &Private->Passthru, + (VOID **) &DummyInterface, This->DriverBindingHandle, Handle, EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER @@ -490,7 +490,7 @@ UnregisterNvmeNamespace ( gBS->OpenProtocol ( Controller, &gEfiNvmExpressPassThruProtocolGuid, - (VOID **) &Private->Passthru, + (VOID **) &DummyInterface, This->DriverBindingHandle, Handle, EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER -- cgit v1.2.3