From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=michael.d.kinney@intel.com; receiver=edk2-devel@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 05725210C42BE for ; Fri, 27 Jul 2018 22:55:48 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Jul 2018 22:55:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,412,1526367600"; d="scan'208";a="75258550" Received: from orsmsx110.amr.corp.intel.com ([10.22.240.8]) by fmsmga004.fm.intel.com with ESMTP; 27 Jul 2018 22:55:48 -0700 Received: from orsmsx113.amr.corp.intel.com ([169.254.9.96]) by ORSMSX110.amr.corp.intel.com ([169.254.10.244]) with mapi id 14.03.0319.002; Fri, 27 Jul 2018 22:55:48 -0700 From: "Kinney, Michael D" To: "Zeng, Star" , "edk2-devel@lists.01.org" , "Kinney, Michael D" Thread-Topic: [staging/FmpDevicePkg-master][PATCH] FmpDevicePkg FmpDxe: Add NULL check to return Value from GetVariable2 Thread-Index: AQHUJhD++d9PnfQT90SMH5YDoqfWzKSkIxVQ Date: Sat, 28 Jul 2018 05:55:48 +0000 Message-ID: References: <1532740735-14128-1-git-send-email-star.zeng@intel.com> In-Reply-To: <1532740735-14128-1-git-send-email-star.zeng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.22.254.138] MIME-Version: 1.0 Subject: Re: [staging/FmpDevicePkg-master][PATCH] FmpDevicePkg FmpDxe: Add NULL check to return Value from GetVariable2 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jul 2018 05:55:49 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Michael D Kinney Mike > -----Original Message----- > From: Zeng, Star > Sent: Friday, July 27, 2018 6:19 PM > To: edk2-devel@lists.01.org > Cc: Zeng, Star ; Kinney, Michael D > > Subject: [staging/FmpDevicePkg-master][PATCH] > FmpDevicePkg FmpDxe: Add NULL check to return Value > from GetVariable2 >=20 > Cc: Michael D Kinney > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Star Zeng > --- > FmpDevicePkg/FmpDxe/VariableSupport.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) >=20 > 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 =3D DEFAULT_VERSION; >=20 > Status =3D GetVariable2 (VARNAME_VERSION, > &gEfiCallerIdGuid, (VOID **)&Value, &Size); > - if (EFI_ERROR (Status)) { > + if (EFI_ERROR (Status) || (Value =3D=3D NULL)) { > DEBUG ((DEBUG_ERROR, "Failed to get the Version > from variable. Status =3D %r\n", Status)); > return Version; > } > @@ -125,7 +125,7 @@ > GetLowestSupportedVersionFromVariable ( > Version =3D DEFAULT_LOWESTSUPPORTEDVERSION; >=20 > Status =3D GetVariable2 (VARNAME_LSV, > &gEfiCallerIdGuid, (VOID **)&Value, &Size); > - if (EFI_ERROR (Status)) { > + if (EFI_ERROR (Status) || (Value =3D=3D NULL)) { > DEBUG ((DEBUG_WARN, "Warning: Failed to get the > Lowest Supported Version from variable. Status =3D > %r\n", Status)); > return Version; > } > @@ -177,7 +177,7 @@ GetLastAttemptStatusFromVariable ( > LastAttemptStatus =3D DEFAULT_LASTATTEMPT; >=20 > Status =3D GetVariable2 (VARNAME_LASTATTEMPTSTATUS, > &gEfiCallerIdGuid, (VOID **)&Value, &Size); > - if (EFI_ERROR (Status)) { > + if (EFI_ERROR (Status) || (Value =3D=3D NULL)) { > DEBUG ((DEBUG_WARN, "Warning: Failed to get the > Last Attempt Status from variable. Status =3D %r\n", > Status)); > return LastAttemptStatus; > } > @@ -233,7 +233,7 @@ GetLastAttemptVersionFromVariable ( > Version =3D DEFAULT_LASTATTEMPT; >=20 > Status =3D GetVariable2 (VARNAME_LASTATTEMPTVERSION, > &gEfiCallerIdGuid, (VOID **)&Value, &Size); > - if (EFI_ERROR (Status)) { > + if (EFI_ERROR (Status) || (Value =3D=3D NULL)) { > DEBUG ((DEBUG_WARN, "Warning: Failed to get the > Last Attempt Version from variable. Status =3D %r\n", > Status)); > return Version; > } > -- > 2.7.0.windows.1