* [PATCH] SecurityPkg: Initailize variable Status before it is consumed.
@ 2020-08-31 8:15 Zhiguang Liu
2020-08-31 15:46 ` [edk2-devel] " Laszlo Ersek
0 siblings, 1 reply; 6+ messages in thread
From: Zhiguang Liu @ 2020-08-31 8:15 UTC (permalink / raw)
To: devel; +Cc: Jiewen Yao, Jian J Wang, Qi Zhang, Rahul Kumar
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2945
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Qi Zhang <qi1.zhang@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
---
SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
index 0e770f4485..5e883f0cc5 100644
--- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
+++ b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
@@ -449,6 +449,7 @@ HashLogExtendEvent (
EFI_STATUS Status;
TPML_DIGEST_VALUES DigestList;
+ Status = EFI_SUCCESS;
if (GetFirstGuidHob (&gTpmErrorHobGuid) != NULL) {
return EFI_DEVICE_ERROR;
}
--
2.25.1.windows.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [edk2-devel] [PATCH] SecurityPkg: Initailize variable Status before it is consumed.
[not found] <16304C4E5952DEC7.30845@groups.io>
@ 2020-08-31 8:51 ` Zhiguang Liu
0 siblings, 0 replies; 6+ messages in thread
From: Zhiguang Liu @ 2020-08-31 8:51 UTC (permalink / raw)
To: devel@edk2.groups.io, Liu, Zhiguang, Liming Gao
Cc: Yao, Jiewen, Wang, Jian J, Zhang, Qi1, Kumar, Rahul1
Hi Liming,
This is a small bug fix, and I want to catch the stable tag.
Thanks
Zhiguang
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Zhiguang
> Liu
> Sent: Monday, August 31, 2020 4:16 PM
> To: devel@edk2.groups.io
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Wang, Jian J <jian.j.wang@intel.com>;
> Zhang, Qi1 <qi1.zhang@intel.com>; Kumar, Rahul1 <rahul1.kumar@intel.com>
> Subject: [edk2-devel] [PATCH] SecurityPkg: Initailize variable Status before it is
> consumed.
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2945
>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Qi Zhang <qi1.zhang@intel.com>
> Cc: Rahul Kumar <rahul1.kumar@intel.com>
> Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
> ---
> SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
> b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
> index 0e770f4485..5e883f0cc5 100644
> --- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
> +++ b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
> @@ -449,6 +449,7 @@ HashLogExtendEvent (
> EFI_STATUS Status;
>
> TPML_DIGEST_VALUES DigestList;
>
>
>
> + Status = EFI_SUCCESS;
>
> if (GetFirstGuidHob (&gTpmErrorHobGuid) != NULL) {
>
> return EFI_DEVICE_ERROR;
>
> }
>
> --
> 2.25.1.windows.1
>
>
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
>
> View/Reply Online (#64819): https://edk2.groups.io/g/devel/message/64819
> Mute This Topic: https://groups.io/mt/76530112/1779286
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub [zhiguang.liu@intel.com]
> -=-=-=-=-=-=
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [edk2-devel] [PATCH] SecurityPkg: Initailize variable Status before it is consumed.
2020-08-31 8:15 [PATCH] SecurityPkg: Initailize variable Status before it is consumed Zhiguang Liu
@ 2020-08-31 15:46 ` Laszlo Ersek
2020-08-31 15:56 ` Yao, Jiewen
0 siblings, 1 reply; 6+ messages in thread
From: Laszlo Ersek @ 2020-08-31 15:46 UTC (permalink / raw)
To: devel, zhiguang.liu; +Cc: Jiewen Yao, Jian J Wang, Qi Zhang, Rahul Kumar
On 08/31/20 10:15, Zhiguang Liu wrote:
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2945
>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Qi Zhang <qi1.zhang@intel.com>
> Cc: Rahul Kumar <rahul1.kumar@intel.com>
> Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
> ---
> SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
> index 0e770f4485..5e883f0cc5 100644
> --- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
> +++ b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
> @@ -449,6 +449,7 @@ HashLogExtendEvent (
> EFI_STATUS Status;
> TPML_DIGEST_VALUES DigestList;
>
> + Status = EFI_SUCCESS;
> if (GetFirstGuidHob (&gTpmErrorHobGuid) != NULL) {
> return EFI_DEVICE_ERROR;
> }
>
I agree that there is a path in the code where Status is read without
having been set.
It seems that using EFI_SUCCESS as default value makes sense (assuming
the LogHashEvent() call is the important one). I'll let SecurityPkg
maintainers decide about this.
I think it would be nicer to set Status to EFI_SUCCESS either on the
(currently missing) "else" branch, or else just before the
EDKII_TCG_PRE_HASH check. In particular, setting Status so early that we
may still exit with EFI_DEVICE_ERROR is wasteful. So at least I'd move
the assignment past the "return EFI_DEVICE_ERROR" statement.
But... it's late. I agree that this patch qualifies for the stable tag.
So I'm not asking for a repost. I just wish more thought had been given
to the placement of the assignment.
Laszlo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [edk2-devel] [PATCH] SecurityPkg: Initailize variable Status before it is consumed.
2020-08-31 15:46 ` [edk2-devel] " Laszlo Ersek
@ 2020-08-31 15:56 ` Yao, Jiewen
0 siblings, 0 replies; 6+ messages in thread
From: Yao, Jiewen @ 2020-08-31 15:56 UTC (permalink / raw)
To: Laszlo Ersek, devel@edk2.groups.io, Liu, Zhiguang
Cc: Wang, Jian J, Zhang, Qi1, Kumar, Rahul1
Agree with Laszlo.
I prefer to move "Status = EFI_SUCCESS;" before the EDKII_TCG_PRE_HASH check.
With that moving, reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Thank you
Yao Jiewen
> -----Original Message-----
> From: Laszlo Ersek <lersek@redhat.com>
> Sent: Monday, August 31, 2020 11:46 PM
> To: devel@edk2.groups.io; Liu, Zhiguang <zhiguang.liu@intel.com>
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Wang, Jian J <jian.j.wang@intel.com>;
> Zhang, Qi1 <qi1.zhang@intel.com>; Kumar, Rahul1 <rahul1.kumar@intel.com>
> Subject: Re: [edk2-devel] [PATCH] SecurityPkg: Initailize variable Status before it
> is consumed.
>
> On 08/31/20 10:15, Zhiguang Liu wrote:
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2945
> >
> > Cc: Jiewen Yao <jiewen.yao@intel.com>
> > Cc: Jian J Wang <jian.j.wang@intel.com>
> > Cc: Qi Zhang <qi1.zhang@intel.com>
> > Cc: Rahul Kumar <rahul1.kumar@intel.com>
> > Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
> > ---
> > SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
> b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
> > index 0e770f4485..5e883f0cc5 100644
> > --- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
> > +++ b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
> > @@ -449,6 +449,7 @@ HashLogExtendEvent (
> > EFI_STATUS Status;
> > TPML_DIGEST_VALUES DigestList;
> >
> > + Status = EFI_SUCCESS;
> > if (GetFirstGuidHob (&gTpmErrorHobGuid) != NULL) {
> > return EFI_DEVICE_ERROR;
> > }
> >
>
> I agree that there is a path in the code where Status is read without
> having been set.
>
> It seems that using EFI_SUCCESS as default value makes sense (assuming
> the LogHashEvent() call is the important one). I'll let SecurityPkg
> maintainers decide about this.
>
> I think it would be nicer to set Status to EFI_SUCCESS either on the
> (currently missing) "else" branch, or else just before the
> EDKII_TCG_PRE_HASH check. In particular, setting Status so early that we
> may still exit with EFI_DEVICE_ERROR is wasteful. So at least I'd move
> the assignment past the "return EFI_DEVICE_ERROR" statement.
>
> But... it's late. I agree that this patch qualifies for the stable tag.
> So I'm not asking for a repost. I just wish more thought had been given
> to the placement of the assignment.
>
> Laszlo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [edk2-devel] [PATCH] SecurityPkg: Initailize variable Status before it is consumed.
[not found] <163082D6E46F54DD.9345@groups.io>
@ 2020-09-01 7:15 ` Zhiguang Liu
0 siblings, 0 replies; 6+ messages in thread
From: Zhiguang Liu @ 2020-09-01 7:15 UTC (permalink / raw)
To: devel@edk2.groups.io, Liu, Zhiguang, Liming Gao
Cc: Yao, Jiewen, Wang, Jian J, Zhang, Qi1, Kumar, Rahul1,
Laszlo Ersek
Hi Liming,
Can this patch check in before this stable tag?
Thanks
Zhiguang
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Zhiguang
> Liu
> Sent: Tuesday, September 1, 2020 8:55 AM
> To: devel@edk2.groups.io
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Wang, Jian J <jian.j.wang@intel.com>;
> Zhang, Qi1 <qi1.zhang@intel.com>; Kumar, Rahul1 <rahul1.kumar@intel.com>;
> Laszlo Ersek <lersek@redhat.com>
> Subject: [edk2-devel] [PATCH] SecurityPkg: Initailize variable Status before it is
> consumed.
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2945
>
> V2: Move "Status = EFI_SUCCESS;" before the EDKII_TCG_PRE_HASH check.
>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Qi Zhang <qi1.zhang@intel.com>
> Cc: Rahul Kumar <rahul1.kumar@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
> Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
> ---
> SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
> b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
> index 0e770f4485..93a8803ff6 100644
> --- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
> +++ b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
> @@ -456,6 +456,7 @@ HashLogExtendEvent (
> if ((Flags & EDKII_TCG_PRE_HASH) != 0 || (Flags &
> EDKII_TCG_PRE_HASH_LOG_ONLY) != 0) {
>
> ZeroMem (&DigestList, sizeof(DigestList));
>
> CopyMem (&DigestList, HashData, sizeof(DigestList));
>
> + Status = EFI_SUCCESS;
>
> if ((Flags & EDKII_TCG_PRE_HASH) !=0 ) {
>
> Status = Tpm2PcrExtend (
>
> NewEventHdr->PCRIndex,
>
> --
> 2.25.1.windows.1
>
>
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
>
> View/Reply Online (#64865): https://edk2.groups.io/g/devel/message/64865
> Mute This Topic: https://groups.io/mt/76530112/1779286
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub [zhiguang.liu@intel.com]
> -=-=-=-=-=-=
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [edk2-devel] [PATCH] SecurityPkg: Initailize variable Status before it is consumed.
2020-09-01 7:02 ` Laszlo Ersek
@ 2020-09-01 17:14 ` Laszlo Ersek
0 siblings, 0 replies; 6+ messages in thread
From: Laszlo Ersek @ 2020-09-01 17:14 UTC (permalink / raw)
To: Zhiguang Liu, devel; +Cc: Jiewen Yao, Jian J Wang, Qi Zhang, Rahul Kumar
On 09/01/20 09:02, Laszlo Ersek wrote:
> On 09/01/20 02:55, Zhiguang Liu wrote:
>> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2945
>>
>> V2: Move "Status = EFI_SUCCESS;" before the EDKII_TCG_PRE_HASH check.
>>
>> Cc: Jiewen Yao <jiewen.yao@intel.com>
>> Cc: Jian J Wang <jian.j.wang@intel.com>
>> Cc: Qi Zhang <qi1.zhang@intel.com>
>> Cc: Rahul Kumar <rahul1.kumar@intel.com>
>> Cc: Laszlo Ersek <lersek@redhat.com>
>> Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
>> Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
>> ---
>> SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
>> index 0e770f4485..93a8803ff6 100644
>> --- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
>> +++ b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
>> @@ -456,6 +456,7 @@ HashLogExtendEvent (
>> if ((Flags & EDKII_TCG_PRE_HASH) != 0 || (Flags & EDKII_TCG_PRE_HASH_LOG_ONLY) != 0) {
>> ZeroMem (&DigestList, sizeof(DigestList));
>> CopyMem (&DigestList, HashData, sizeof(DigestList));
>> + Status = EFI_SUCCESS;
>> if ((Flags & EDKII_TCG_PRE_HASH) !=0 ) {
>> Status = Tpm2PcrExtend (
>> NewEventHdr->PCRIndex,
>>
>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>
> I'll let Jiewen or Jian merge this.
>
> Please change the status of TianoCore#2945 to IN_PROGRESS, and link both
> versions of this patch into the ticket as well (in a new comment).
Merged as commit 46db105b7b77, via
<https://github.com/tianocore/edk2/pull/909>.
BZ updated.
Thanks
Laszlo
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-09-01 17:14 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-31 8:15 [PATCH] SecurityPkg: Initailize variable Status before it is consumed Zhiguang Liu
2020-08-31 15:46 ` [edk2-devel] " Laszlo Ersek
2020-08-31 15:56 ` Yao, Jiewen
[not found] <16304C4E5952DEC7.30845@groups.io>
2020-08-31 8:51 ` Zhiguang Liu
-- strict thread matches above, loose matches on Subject: below --
2020-09-01 0:55 Zhiguang Liu
2020-09-01 7:02 ` Laszlo Ersek
2020-09-01 17:14 ` [edk2-devel] " Laszlo Ersek
[not found] <163082D6E46F54DD.9345@groups.io>
2020-09-01 7:15 ` Zhiguang Liu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox