diff options
| author | Jeff Fan <jeff.fan@intel.com> | 2014-03-20 03:10:17 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-03-20 03:10:17 +0000 |
| commit | 5a11e17a9ee39a7571507892cd76d51338803098 (patch) | |
| tree | 269ecb089594674f183995188c129d8997067e89 | |
| parent | 2decc0ad6f2de1c8646b7317679b4a4407cde0c1 (diff) | |
| download | edk2-5a11e17a9ee39a7571507892cd76d51338803098.zip edk2-5a11e17a9ee39a7571507892cd76d51338803098.tar.gz edk2-5a11e17a9ee39a7571507892cd76d51338803098.tar.bz2 | |
Sync patch r15328 from main trunk.
Remove ASSERT when failed to Get/Set "AttemptOrder" and "ClientId" variable.
Removes RT attribute for "AttemptOrder?" variable.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2010.SR1@15345 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c | 7 | ||||
| -rw-r--r-- | NetworkPkg/IScsiDxe/IScsiConfig.c | 9 | ||||
| -rw-r--r-- | 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 32247c9..7591bf5 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 2073f33..1d648f7 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 2d30769..16edca5 100644 --- a/NetworkPkg/IScsiDxe/IScsiDriver.c +++ b/NetworkPkg/IScsiDxe/IScsiDriver.c @@ -645,7 +645,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) {
@@ -683,7 +685,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.
|