From: "Kinney, Michael D" <michael.d.kinney@intel.com>
To: edk2-devel@lists.01.org
Cc: Star Zeng <star.zeng@intel.com>,
Michael D Kinney <michael.d.kinney@intel.com>
Subject: [Patch v5 13/21] FmpDevicePkg FmpDxe: Add NULL check to return Value from GetVariable2
Date: Tue, 31 Jul 2018 23:55:13 -0700 [thread overview]
Message-ID: <20180801065722.9500-14-michael.d.kinney@intel.com> (raw)
In-Reply-To: <20180801065722.9500-1-michael.d.kinney@intel.com>
From: Star Zeng <star.zeng@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
---
FmpDevicePkg/FmpDxe/VariableSupport.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/FmpDevicePkg/FmpDxe/VariableSupport.c b/FmpDevicePkg/FmpDxe/VariableSupport.c
index c15178d099..6a4330ad6a 100644
--- a/FmpDevicePkg/FmpDxe/VariableSupport.c
+++ b/FmpDevicePkg/FmpDxe/VariableSupport.c
@@ -72,7 +72,7 @@ GetVersionFromVariable (
Version = DEFAULT_VERSION;
Status = GetVariable2 (VARNAME_VERSION, &gEfiCallerIdGuid, (VOID **)&Value, &Size);
- if (EFI_ERROR (Status)) {
+ if (EFI_ERROR (Status) || (Value == NULL)) {
DEBUG ((DEBUG_ERROR, "Failed to get the Version from variable. Status = %r\n", Status));
return Version;
}
@@ -125,7 +125,7 @@ GetLowestSupportedVersionFromVariable (
Version = DEFAULT_LOWESTSUPPORTEDVERSION;
Status = GetVariable2 (VARNAME_LSV, &gEfiCallerIdGuid, (VOID **)&Value, &Size);
- if (EFI_ERROR (Status)) {
+ if (EFI_ERROR (Status) || (Value == NULL)) {
DEBUG ((DEBUG_WARN, "Warning: Failed to get the Lowest Supported Version from variable. Status = %r\n", Status));
return Version;
}
@@ -177,7 +177,7 @@ GetLastAttemptStatusFromVariable (
LastAttemptStatus = DEFAULT_LASTATTEMPT;
Status = GetVariable2 (VARNAME_LASTATTEMPTSTATUS, &gEfiCallerIdGuid, (VOID **)&Value, &Size);
- if (EFI_ERROR (Status)) {
+ if (EFI_ERROR (Status) || (Value == NULL)) {
DEBUG ((DEBUG_WARN, "Warning: Failed to get the Last Attempt Status from variable. Status = %r\n", Status));
return LastAttemptStatus;
}
@@ -233,7 +233,7 @@ GetLastAttemptVersionFromVariable (
Version = DEFAULT_LASTATTEMPT;
Status = GetVariable2 (VARNAME_LASTATTEMPTVERSION, &gEfiCallerIdGuid, (VOID **)&Value, &Size);
- if (EFI_ERROR (Status)) {
+ if (EFI_ERROR (Status) || (Value == NULL)) {
DEBUG ((DEBUG_WARN, "Warning: Failed to get the Last Attempt Version from variable. Status = %r\n", Status));
return Version;
}
--
2.14.2.windows.3
next prev parent reply other threads:[~2018-08-01 6:57 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-01 6:55 [Patch v5 00/21] Add FmpDevicePkg Kinney, Michael D
2018-08-01 6:55 ` [Patch v5 01/21] FmpDevicePkg: Add package, library classes, and PCDs Kinney, Michael D
2018-08-01 7:50 ` Zeng, Star
2018-08-01 6:55 ` [Patch v5 02/21] FmpDevicePkg: Add library instances Kinney, Michael D
2018-08-01 7:50 ` Zeng, Star
2018-08-01 6:55 ` [Patch v5 03/21] FmpDevicePkg: Add FmpDxe module Kinney, Michael D
2018-08-01 7:50 ` Zeng, Star
2018-08-01 6:55 ` [Patch v5 04/21] FmpDevicePkg: Add DSC file to build all package components Kinney, Michael D
2018-08-01 7:50 ` Zeng, Star
2018-08-01 6:55 ` [Patch v5 05/21] FmpDevicePkg FmpDxe: Update function comment for FmpDxeEntryPoint Kinney, Michael D
2018-08-01 6:55 ` [Patch v5 06/21] FmpDevicePkg FmpDxe: Return 0 when LSV check is not required Kinney, Michael D
2018-08-01 6:55 ` [Patch v5 07/21] FmpDevicePkg: Remove IPF Kinney, Michael D
2018-08-01 6:55 ` [Patch v5 08/21] FmpDevicePkg: Add DISABLE_NEW_DEPRECATED_INTERFACES build options Kinney, Michael D
2018-08-01 6:55 ` [Patch v5 09/21] FmpDevicePkg FmpDxe: Check Progress!= NULL before calling Progress(100) Kinney, Michael D
2018-08-01 6:55 ` [Patch v5 10/21] FmpDevicePkg FmpDxe: Add EFI_ABORTED in retval of CheckTheImage() Kinney, Michael D
2018-08-01 6:55 ` [Patch v5 11/21] FmpDevicePkg FmpDxe: Fix typo "EFI_SECURITY_VIOLATIO" Kinney, Michael D
2018-08-01 6:55 ` [Patch v5 12/21] FmpDevicePkg: Remove DisplayUpdateProgressLib mapping for FmpDxe Kinney, Michael D
2018-08-01 6:55 ` Kinney, Michael D [this message]
2018-08-01 6:55 ` [Patch v5 14/21] FmpDevicePkg FmpDxe: Check ImageIndex first before Image/ImageSize Kinney, Michael D
2018-08-01 6:55 ` [Patch v5 15/21] FmpDevicePkg FmpDxe: Use Attributes to know whether reset is required Kinney, Michael D
2018-08-01 6:55 ` [Patch v5 16/21] FmpDevicePkg FmpDxe: Add comment in mFmpDeviceLocked's declaration Kinney, Michael D
2018-08-01 6:55 ` [Patch v5 17/21] FmpDevicePkg FmpDxe: Return UNSUPPORTED if device has been locked Kinney, Michael D
2018-08-01 6:55 ` [Patch v5 18/21] FmpDevicePkg FmpDxe: Initialize DeviceLibLowestSupportedVersion Kinney, Michael D
2018-08-01 6:55 ` [Patch v5 19/21] FmpDevicePkg: Fix code style issue Kinney, Michael D
2018-08-01 6:55 ` [Patch v5 20/21] FmpDevicePkg FmpDxe: Use local variable to store test key digest size Kinney, Michael D
2018-08-01 6:55 ` [Patch v5 21/21] MdeModulePkg/BdsDxe: Move display of test key usage into BDS module Kinney, Michael D
2018-08-01 7:53 ` Zeng, Star
2018-08-01 22:39 ` Kinney, Michael D
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180801065722.9500-14-michael.d.kinney@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox