From 9c12f2d77fe8ac958e6da4ceb92378227dd6c676 Mon Sep 17 00:00:00 2001
From: Fu Siyuan <siyuan.fu@intel.com>
Date: Mon, 17 Mar 2014 05:32:32 +0000
Subject: [PATCH] =?utf8?q?Remove=20ASSERT=20when=20failed=20to=20Get/Set?=
 =?utf8?q?=20=E2=80=9CAttemptOrder=E2=80=9D=20and=20=E2=80=9CClientId?=
 =?utf8?q?=E2=80=9D=20variable.=20Removes=20RT=20attribute=20for=20?=
 =?utf8?q?=E2=80=9CAttemptOrder=E2=80=9D=20variable.=20Signed-off-by:=20Fu?=
 =?utf8?q?=20Siyuan=20<siyuan.fu@intel.com>=20Reviewed-by:=20Dong,=20Guo?=
 =?utf8?q?=20<guo.dong@intel.com>=20Reviewed-by:=20Yao,=20Jiewen=20<jiewen?=
 =?utf8?q?.yao@intel.com>=20Contributed-under:=20TianoCore=20Contribution?=
 =?utf8?q?=20Agreement=201.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15328 6f19259b-4bc3-4df7-8a09-765794883524
---
 NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c | 7 +++++--
 NetworkPkg/IScsiDxe/IScsiConfig.c  | 9 ++++-----
 NetworkPkg/IScsiDxe/IScsiDriver.c  | 8 ++++++--
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c b/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c
index 32247c927b..7591bf56ba 100644
--- a/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c
+++ b/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c
@@ -1,7 +1,7 @@
 /** @file
   Dhcp6 support functions implementation.
 
-  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2014, 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
@@ -157,7 +157,10 @@ Dhcp6GenerateClientId (
                   Duid->Length + 2,
                   (VOID *) Duid
                   );
-  ASSERT_EFI_ERROR (Status);
+  if (EFI_ERROR (Status)) {
+    FreePool (Duid);
+    return NULL;
+  }
 
   return Duid;
 }
diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.c b/NetworkPkg/IScsiDxe/IScsiConfig.c
index 2073f33191..1d648f78bd 100644
--- a/NetworkPkg/IScsiDxe/IScsiConfig.c
+++ b/NetworkPkg/IScsiDxe/IScsiConfig.c
@@ -1,7 +1,7 @@
 /** @file
   Helper functions for configuring or getting the parameters relating to iSCSI.
 
-Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2014, 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
@@ -784,7 +784,7 @@ IScsiConvertIfrNvDataToAttemptConfigData (
     Status = gRT->SetVariable (
                     L"AttemptOrder",
                     &gIScsiConfigGuid,
-                    EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,
+                    EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,
                     AttemptConfigOrderSize,
                     AttemptConfigOrder
                     );
@@ -1246,8 +1246,7 @@ IScsiConfigDeleteAttempts (
     }
   }
 
-  Attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS
-              | EFI_VARIABLE_NON_VOLATILE;
+  Attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE;
 
   //
   // Update AttemptOrder in NVR.
@@ -1558,7 +1557,7 @@ IScsiConfigOrderAttempts (
   Status = gRT->SetVariable (
                   L"AttemptOrder",
                   &gIScsiConfigGuid,
-                  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,
+                  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,
                   AttemptConfigOrderSize,
                   AttemptConfigOrderTmp
                   );
diff --git a/NetworkPkg/IScsiDxe/IScsiDriver.c b/NetworkPkg/IScsiDxe/IScsiDriver.c
index 42ac8f0fe7..8d1742455c 100644
--- a/NetworkPkg/IScsiDxe/IScsiDriver.c
+++ b/NetworkPkg/IScsiDxe/IScsiDriver.c
@@ -651,7 +651,9 @@ IScsiStart (
                            &gIScsiConfigGuid,
                            &AttemptConfigOrderSize
                            );
-    ASSERT (AttemptConfigOrder != NULL);
+    if (AttemptConfigOrder == NULL) {
+      goto ON_ERROR;
+    }
     for (Index = 0; Index < AttemptConfigOrderSize / sizeof (UINT8); Index++) {
       if (AttemptConfigOrder[Index] == mPrivate->BootSelectedIndex ||
           AttemptConfigOrder[Index] == BootSelected) {
@@ -689,7 +691,9 @@ IScsiStart (
 
         goto ON_EXIT;
       } else {
-        ASSERT (AttemptConfigOrder[Index] == BootSelected);
+        if (AttemptConfigOrder[Index] != BootSelected) {
+          goto ON_ERROR;
+        }
         mPrivate->BootSelectedIndex = BootSelected;
         //
         // Clear the resource in ExistPrivate.
-- 
2.39.2