MdeModulePkg: refine codes of iSCSI driver.

Add error handling logic in DriverBingingStop function,
it may return error status when invoking the
UninstallProtocolInterface.

Cc: Fu Siyuan <siyuan.fu@intel.com>
Cc: Ye Ting <ting.ye@intel.com>
Cc: Wu Jiaxin <jiaxin.wu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zhang Lubo <lubo.zhang@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Jiaxin Wu <jiaxin.wu@intel.com>

3 files changed, 40 insertions, 18 deletions

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
index e55bee8..5295d34 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
@@ -1,7 +1,7 @@
 /** @file

   The entry point of IScsi driver.

 

-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 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

@@ -339,6 +339,10 @@ ON_ERROR:
 

   @retval EFI_SUCCESS           The device was stopped.

   @retval EFI_DEVICE_ERROR      The device could not be stopped due to a device error.

+  @retval EFI_INVALID_PARAMETER Child handle is NULL.

+  @retval EFI_ACCESS_DENIED     The protocol could not be removed from the Handle

+                                because its interfaces are being used.

+

 **/

 EFI_STATUS

 EFIAPI

@@ -451,7 +455,10 @@ IScsiDriverBindingStop (
   IScsiPublishIbft ();

 

   IScsiSessionAbort (&Private->Session);

-  IScsiCleanDriverData (Private);

+  Status = IScsiCleanDriverData (Private);

+  if (EFI_ERROR (Status)) {

+    return Status;

+  }

 

   return EFI_SUCCESS;

 }

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
index ebd9f5b..bb48d8c 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
@@ -1,7 +1,7 @@
 /** @file

   Miscellaneous routines for iSCSI driver.

 

-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 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

@@ -587,34 +587,46 @@ IScsiCreateDriverData (
 /**

   Clean the iSCSI driver data.

 

-  @param[in]  Private The iSCSI driver data.

+  @param[in]              Private The iSCSI driver data.

+

+  @retval EFI_SUCCES      The clean operation is successful.

+  @retval Others          Other errors as indicated.

+

 **/

-VOID

+EFI_STATUS

 IScsiCleanDriverData (

   IN ISCSI_DRIVER_DATA  *Private

   )

 {

+  EFI_STATUS             Status;

+

   if (Private->DevicePath != NULL) {

-    gBS->UninstallProtocolInterface (

-          Private->ExtScsiPassThruHandle,

-          &gEfiDevicePathProtocolGuid,

-          Private->DevicePath

-          );

+    Status = gBS->UninstallProtocolInterface (

+                    Private->ExtScsiPassThruHandle,

+                    &gEfiDevicePathProtocolGuid,

+                    Private->DevicePath

+                    );

+    if (EFI_ERROR (Status)) {

+      goto EXIT;

+    }

 

     FreePool (Private->DevicePath);

   }

 

   if (Private->ExtScsiPassThruHandle != NULL) {

-    gBS->UninstallProtocolInterface (

-          Private->ExtScsiPassThruHandle,

-          &gEfiExtScsiPassThruProtocolGuid,

-          &Private->IScsiExtScsiPassThru

-          );

+    Status = gBS->UninstallProtocolInterface (

+                    Private->ExtScsiPassThruHandle,

+                    &gEfiExtScsiPassThruProtocolGuid,

+                    &Private->IScsiExtScsiPassThru

+                    );

   }

 

+EXIT:

+

   gBS->CloseEvent (Private->ExitBootServiceEvent);

 

   FreePool (Private);

+  return Status;

 }

 

 /**

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h
index 8a95493..0ab44d0 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h
@@ -1,7 +1,7 @@
 /** @file

   Miscellaneous definitions for iSCSI driver.

 

-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 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

@@ -219,9 +219,12 @@ IScsiCreateDriverData (
 /**

   Clean the iSCSI driver data.

 

-  @param[in]  Private The iSCSI driver data.

+  @param[in]               Private The iSCSI driver data.

+

+  @retval EFI_SUCCES       The clean operation is successful.

+  @retval Others           Other errors as indicated.

 **/

-VOID

+EFI_STATUS

 IScsiCleanDriverData (

   IN ISCSI_DRIVER_DATA  *Private

   );