[staging/FmpDevicePkg-master][PATCH] FmpDevicePkg FmpDxe: Add NULL check to return Value from GetVariable2

[staging/FmpDevicePkg-master][PATCH] FmpDevicePkg FmpDxe: Add NULL check to return Value from GetVariable2

[Star Zeng]

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>
---
 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 c15178d09914..6a4330ad6a83 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.7.0.windows.1

Re: [staging/FmpDevicePkg-master][PATCH] FmpDevicePkg FmpDxe: Add NULL check to return Value from GetVariable2

[Kinney, Michael D]

Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>

Mike

> -----Original Message-----
> From: Zeng, Star
> Sent: Friday, July 27, 2018 6:19 PM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star <star.zeng@intel.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>
> Subject: [staging/FmpDevicePkg-master][PATCH]
> FmpDevicePkg FmpDxe: Add NULL check to return Value
> from GetVariable2
> 
> 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>
> ---
>  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 c15178d09914..6a4330ad6a83 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.7.0.windows.1