1. Patchew
  2. EDK2
  3. View series

[edk2] [Patch] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to void use null pointer.

Eric Dong posted 1 patch 7 years, 2 months ago
Failed in applying to current master (apply log)
UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c | 5 +++++
1 file changed, 5 insertions(+)
[edk2] [Patch] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to void use null pointer.
Posted by Eric Dong 7 years, 2 months ago 
Current code logic not check the pointer before use it. This may
has potential issue, this patch add code to check it.

Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Eric Dong <eric.dong@intel.com>
---
 UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
index ef72b9b..2c1dc82 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
@@ -226,12 +226,17 @@ SetProcessorRegister (
   CPU_REGISTER_TABLE        *RegisterTable;
 
   InitApicId = GetInitialApicId ();
+  RegisterTable = NULL;
   for (Index = 0; Index < RegisterTableCount; Index++) {
     if (RegisterTables[Index].InitialApicId == InitApicId) {
       RegisterTable =  &RegisterTables[Index];
       break;
     }
   }
+  ASSERT (RegisterTable != NULL);
+  if (RegisterTable == NULL) {
+    return;
+  }
 
   //
   // Traverse Register Table of this logical processor
-- 
2.7.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to void use null pointer.
Posted by Ni, Ruiyu 7 years, 2 months ago 
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

Thanks/Ray

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Eric
> Dong
> Sent: Monday, October 9, 2017 11:18 AM
> To: edk2-devel@lists.01.org
> Cc: Ni, Ruiyu <ruiyu.ni@intel.com>
> Subject: [edk2] [Patch] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to void use
> null pointer.
> 
> Current code logic not check the pointer before use it. This may has potential
> issue, this patch add code to check it.
> 
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Eric Dong <eric.dong@intel.com>
> ---
>  UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
> b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
> index ef72b9b..2c1dc82 100644
> --- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
> +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
> @@ -226,12 +226,17 @@ SetProcessorRegister (
>    CPU_REGISTER_TABLE        *RegisterTable;
> 
>    InitApicId = GetInitialApicId ();
> +  RegisterTable = NULL;
>    for (Index = 0; Index < RegisterTableCount; Index++) {
>      if (RegisterTables[Index].InitialApicId == InitApicId) {
>        RegisterTable =  &RegisterTables[Index];
>        break;
>      }
>    }
> +  ASSERT (RegisterTable != NULL);
> +  if (RegisterTable == NULL) {
> +    return;
> +  }
> 
>    //
>    // Traverse Register Table of this logical processor
> --
> 2.7.0.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to void use null pointer.
Posted by Wu, Hao A 7 years, 2 months ago 
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Eric
> Dong
> Sent: Monday, October 09, 2017 11:18 AM
> To: edk2-devel@lists.01.org
> Cc: Ni, Ruiyu
> Subject: [edk2] [Patch] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to void use
> null pointer.
> 
> Current code logic not check the pointer before use it. This may
> has potential issue, this patch add code to check it.
> 
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Eric Dong <eric.dong@intel.com>
> ---
>  UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
> b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
> index ef72b9b..2c1dc82 100644
> --- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
> +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
> @@ -226,12 +226,17 @@ SetProcessorRegister (
>    CPU_REGISTER_TABLE        *RegisterTable;
> 
>    InitApicId = GetInitialApicId ();
> +  RegisterTable = NULL;
>    for (Index = 0; Index < RegisterTableCount; Index++) {
>      if (RegisterTables[Index].InitialApicId == InitApicId) {
>        RegisterTable =  &RegisterTables[Index];
>        break;
>      }
>    }
> +  ASSERT (RegisterTable != NULL);
> +  if (RegisterTable == NULL) {
> +    return;
> +  }

Hi Eric,

If "RegisterTable == NULL" is a case that should never occur, my thought
is that using "ASSERT" merely is enough. The 'if' statement above seems
can be removed for me.


Best Regards,
Hao Wu

> 
>    //
>    // Traverse Register Table of this logical processor
> --
> 2.7.0.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to void use null pointer.
Posted by Dong, Eric 7 years, 2 months ago 
Hao,

Agree with your suggestion, I will remove the if code when I merge the change.

Thanks,
Eric

-----Original Message-----
From: Wu, Hao A 
Sent: Monday, October 9, 2017 11:39 AM
To: Dong, Eric <eric.dong@intel.com>; edk2-devel@lists.01.org
Cc: Ni, Ruiyu <ruiyu.ni@intel.com>
Subject: RE: [edk2] [Patch] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to void use null pointer.

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of 
> Eric Dong
> Sent: Monday, October 09, 2017 11:18 AM
> To: edk2-devel@lists.01.org
> Cc: Ni, Ruiyu
> Subject: [edk2] [Patch] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to void 
> use null pointer.
> 
> Current code logic not check the pointer before use it. This may has 
> potential issue, this patch add code to check it.
> 
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Eric Dong <eric.dong@intel.com>
> ---
>  UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
> b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
> index ef72b9b..2c1dc82 100644
> --- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
> +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
> @@ -226,12 +226,17 @@ SetProcessorRegister (
>    CPU_REGISTER_TABLE        *RegisterTable;
> 
>    InitApicId = GetInitialApicId ();
> +  RegisterTable = NULL;
>    for (Index = 0; Index < RegisterTableCount; Index++) {
>      if (RegisterTables[Index].InitialApicId == InitApicId) {
>        RegisterTable =  &RegisterTables[Index];
>        break;
>      }
>    }
> +  ASSERT (RegisterTable != NULL);
> +  if (RegisterTable == NULL) {
> +    return;
> +  }

Hi Eric,

If "RegisterTable == NULL" is a case that should never occur, my thought is that using "ASSERT" merely is enough. The 'if' statement above seems can be removed for me.


Best Regards,
Hao Wu

> 
>    //
>    // Traverse Register Table of this logical processor
> --
> 2.7.0.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patchew 2.1-devel-8c64711

© 2016 - 2024 Red Hat, Inc.