[edk2-devel] [PATCH v1 1/1] SecurityPkg/Tpm2DeviceLibTcg2: Make mTcg2Protocol static

[edk2-devel] [PATCH v1 1/1] SecurityPkg/Tpm2DeviceLibTcg2: Make mTcg2Protocol static

[Michael Kubacki]

From: Michael Kubacki <michael.kubacki@microsoft.com>

The global variable has a common name that can conflict with other
TCG modules. For example, Tcg2Dxe has a similarly named global that
is of type EFI_TCG2_PROTOCOL instead of EFI_TCG2_PROTOCOL*.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
 SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c b/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c
index 3c8cf4fa117a..c792b1d67b06 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c
+++ b/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c
@@ -14,7 +14,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Protocol/Tcg2Protocol.h>
 #include <IndustryStandard/Tpm20.h>
 
-EFI_TCG2_PROTOCOL  *mTcg2Protocol = NULL;
+STATIC  EFI_TCG2_PROTOCOL  *mTcg2Protocol = NULL;
 
 /**
   This service enables the sending of commands to the TPM2.
-- 
2.41.0.windows.3



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107769): https://edk2.groups.io/g/devel/message/107769
Mute This Topic: https://groups.io/mt/100760659/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v1 1/1] SecurityPkg/Tpm2DeviceLibTcg2: Make mTcg2Protocol static

[Michael Kubacki]

Hello,

Can you please help review this change when you get a chance?

Thanks,
Michael

On 8/15/2023 11:50 AM, Michael Kubacki wrote:
> From: Michael Kubacki <michael.kubacki@microsoft.com>
> 
> The global variable has a common name that can conflict with other
> TCG modules. For example, Tcg2Dxe has a similarly named global that
> is of type EFI_TCG2_PROTOCOL instead of EFI_TCG2_PROTOCOL*.
> 
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> ---
>   SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c b/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c
> index 3c8cf4fa117a..c792b1d67b06 100644
> --- a/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c
> +++ b/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c
> @@ -14,7 +14,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>   #include <Protocol/Tcg2Protocol.h>
>   #include <IndustryStandard/Tpm20.h>
>   
> -EFI_TCG2_PROTOCOL  *mTcg2Protocol = NULL;
> +STATIC  EFI_TCG2_PROTOCOL  *mTcg2Protocol = NULL;
>   
>   /**
>     This service enables the sending of commands to the TPM2.


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#108101): https://edk2.groups.io/g/devel/message/108101
Mute This Topic: https://groups.io/mt/100760659/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v1 1/1] SecurityPkg/Tpm2DeviceLibTcg2: Make mTcg2Protocol static

[Yao, Jiewen]

Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>

> -----Original Message-----
> From: Michael Kubacki <mikuback@linux.microsoft.com>
> Sent: Wednesday, August 30, 2023 7:14 AM
> To: devel@edk2.groups.io; Yao, Jiewen <jiewen.yao@intel.com>; Wang, Jian J
> <jian.j.wang@intel.com>
> Subject: Re: [edk2-devel] [PATCH v1 1/1] SecurityPkg/Tpm2DeviceLibTcg2: Make
> mTcg2Protocol static
> 
> Hello,
> 
> Can you please help review this change when you get a chance?
> 
> Thanks,
> Michael
> 
> On 8/15/2023 11:50 AM, Michael Kubacki wrote:
> > From: Michael Kubacki <michael.kubacki@microsoft.com>
> >
> > The global variable has a common name that can conflict with other
> > TCG modules. For example, Tcg2Dxe has a similarly named global that
> > is of type EFI_TCG2_PROTOCOL instead of EFI_TCG2_PROTOCOL*.
> >
> > Cc: Jiewen Yao <jiewen.yao@intel.com>
> > Cc: Jian J Wang <jian.j.wang@intel.com>
> > Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> > ---
> >   SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c
> b/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c
> > index 3c8cf4fa117a..c792b1d67b06 100644
> > --- a/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c
> > +++ b/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c
> > @@ -14,7 +14,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> >   #include <Protocol/Tcg2Protocol.h>
> >   #include <IndustryStandard/Tpm20.h>
> >
> > -EFI_TCG2_PROTOCOL  *mTcg2Protocol = NULL;
> > +STATIC  EFI_TCG2_PROTOCOL  *mTcg2Protocol = NULL;
> >
> >   /**
> >     This service enables the sending of commands to the TPM2.


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#108103): https://edk2.groups.io/g/devel/message/108103
Mute This Topic: https://groups.io/mt/100760659/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v1 1/1] SecurityPkg/Tpm2DeviceLibTcg2: Make mTcg2Protocol static

[Yao, Jiewen]

Merged https://github.com/tianocore/edk2/pull/4770

> -----Original Message-----
> From: Michael Kubacki <mikuback@linux.microsoft.com>
> Sent: Wednesday, August 30, 2023 7:14 AM
> To: devel@edk2.groups.io; Yao, Jiewen <jiewen.yao@intel.com>; Wang, Jian J
> <jian.j.wang@intel.com>
> Subject: Re: [edk2-devel] [PATCH v1 1/1] SecurityPkg/Tpm2DeviceLibTcg2: Make
> mTcg2Protocol static
> 
> Hello,
> 
> Can you please help review this change when you get a chance?
> 
> Thanks,
> Michael
> 
> On 8/15/2023 11:50 AM, Michael Kubacki wrote:
> > From: Michael Kubacki <michael.kubacki@microsoft.com>
> >
> > The global variable has a common name that can conflict with other
> > TCG modules. For example, Tcg2Dxe has a similarly named global that
> > is of type EFI_TCG2_PROTOCOL instead of EFI_TCG2_PROTOCOL*.
> >
> > Cc: Jiewen Yao <jiewen.yao@intel.com>
> > Cc: Jian J Wang <jian.j.wang@intel.com>
> > Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> > ---
> >   SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c
> b/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c
> > index 3c8cf4fa117a..c792b1d67b06 100644
> > --- a/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c
> > +++ b/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c
> > @@ -14,7 +14,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> >   #include <Protocol/Tcg2Protocol.h>
> >   #include <IndustryStandard/Tpm20.h>
> >
> > -EFI_TCG2_PROTOCOL  *mTcg2Protocol = NULL;
> > +STATIC  EFI_TCG2_PROTOCOL  *mTcg2Protocol = NULL;
> >
> >   /**
> >     This service enables the sending of commands to the TPM2.


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#108113): https://edk2.groups.io/g/devel/message/108113
Mute This Topic: https://groups.io/mt/100760659/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-