[PATCH] SecurityPkg/OpalPassword: Add NULL pointer check before using it

[PATCH] SecurityPkg/OpalPassword: Add NULL pointer check before using it

[Maggie Chu]

https://bugzilla.tianocore.org/show_bug.cgi?id=1503
A pointer variable should be checked if it is NULL or Valid before using it.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Maggie Chu <maggie.chu@intel.com>
Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
---
 SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c
index 734c5f06ff..f79f9f7282 100644
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c
@@ -436,6 +436,9 @@ BuildOpalDeviceInfoAta (
 
   DevInfoAta = AllocateZeroPool (DevInfoLengthAta);
   ASSERT (DevInfoAta != NULL);
+  if (DevInfoAta == NULL) {
+    return;
+  }
 
   TempDevInfoAta = DevInfoAta;
   TmpDev = mOpalDriver.DeviceList;
@@ -527,6 +530,9 @@ BuildOpalDeviceInfoNvme (
 
   DevInfoNvme = AllocateZeroPool (DevInfoLengthNvme);
   ASSERT (DevInfoNvme != NULL);
+  if (DevInfoNvme == NULL) {
+    return;
+  }
 
   TempDevInfoNvme = DevInfoNvme;
   TmpDev = mOpalDriver.DeviceList;
-- 
2.16.2.windows.1

Re: [PATCH] SecurityPkg/OpalPassword: Add NULL pointer check before using it

[Dong, Eric]

Hi Maggie,

Thanks for your contribution.

Reviewed-by: Eric Dong <eric.dong@intel.com>

Pushed: d72d8561fbe03a64e01c2ad57a93777de4b9ae2f

Thanks,
Eric

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Maggie Chu
> Sent: Friday, February 1, 2019 6:44 PM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Dong, Eric <eric.dong@intel.com>;
> Zhang, Chao B <chao.b.zhang@intel.com>
> Subject: [edk2] [PATCH] SecurityPkg/OpalPassword: Add NULL pointer check
> before using it
> 
> https://bugzilla.tianocore.org/show_bug.cgi?id=1503
> A pointer variable should be checked if it is NULL or Valid before using it.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Maggie Chu <maggie.chu@intel.com>
> Cc: Chao Zhang <chao.b.zhang@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> ---
>  SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c
> b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c
> index 734c5f06ff..f79f9f7282 100644
> --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c
> +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c
> @@ -436,6 +436,9 @@ BuildOpalDeviceInfoAta (
> 
>    DevInfoAta = AllocateZeroPool (DevInfoLengthAta);
>    ASSERT (DevInfoAta != NULL);
> +  if (DevInfoAta == NULL) {
> +    return;
> +  }
> 
>    TempDevInfoAta = DevInfoAta;
>    TmpDev = mOpalDriver.DeviceList;
> @@ -527,6 +530,9 @@ BuildOpalDeviceInfoNvme (
> 
>    DevInfoNvme = AllocateZeroPool (DevInfoLengthNvme);
>    ASSERT (DevInfoNvme != NULL);
> +  if (DevInfoNvme == NULL) {
> +    return;
> +  }
> 
>    TempDevInfoNvme = DevInfoNvme;
>    TmpDev = mOpalDriver.DeviceList;
> --
> 2.16.2.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel