Merged.
https://github.com/tianocore/edk2/pull/1147
githash: 21f984cedec1c613218480bc3eb5e92349a7a812
Thank you
Yao Jiewen
From: devel@edk2.groups.io <devel@edk2.groups.io>
On Behalf Of Yao, Jiewen
Sent: Tuesday, November 24, 2020 9:32 AM
To: devel@edk2.groups.io; gaoliming@byosoft.com.cn; 'Kun Qin' <kun.q@outlook.com>
Cc: Wang, Jian J <jian.j.wang@intel.com>; Lu, XiaoyuX <xiaoyux.lu@intel.com>; Jiang, Guomin <guomin.jiang@intel.com>
Subject: Re: [edk2-devel] [PATCH v1 1/1] CryptoPkg: BaseCryptLib: Fix buffer double free in CryptPkcs7VerifyEku
I saw Mike just announced “[edk2-devel] EDK II CI Status - Failed”.
Maybe that is the reason you saw some failure.
I will help to push, once this CI failure issue is resolved.
From: devel@edk2.groups.io <devel@edk2.groups.io>
On Behalf Of gaoliming
Sent: Tuesday, November 24, 2020 9:27 AM
To: 'Kun Qin' <kun.q@outlook.com>; Yao, Jiewen <jiewen.yao@intel.com>;
devel@edk2.groups.io
Cc: Wang, Jian J <jian.j.wang@intel.com>; Lu, XiaoyuX <xiaoyux.lu@intel.com>; Jiang, Guomin <guomin.jiang@intel.com>
Subject: 回复: [edk2-devel] [PATCH v1 1/1] CryptoPkg: BaseCryptLib: Fix buffer double free in CryptPkcs7VerifyEku
Kun:
I see the personal PR (https://github.com/tianocore/edk2/pull/1140 ) passed all checks. So, I think there is no issue for this
patch.
Thanks
Liming
发件人: Kun Qin <kun.q@outlook.com>
发送时间: 2020年11月24日 6:49
收件人: Yao, Jiewen <jiewen.yao@intel.com>; gaoliming <gaoliming@byosoft.com.cn>;
devel@edk2.groups.io
抄送: Wang, Jian J <jian.j.wang@intel.com>; Lu, XiaoyuX <xiaoyux.lu@intel.com>; Jiang, Guomin <guomin.jiang@intel.com>
主题: RE: [edk2-devel] [PATCH v1 1/1] CryptoPkg: BaseCryptLib: Fix buffer double free in CryptPkcs7VerifyEku
Hi Jiewen,
It looks like the v2 patch went through:
https://edk2.groups.io/g/devel/message/67823?p=,,,20,0,0,0::Created,,double+free,20,2,0,78456278
I also ran the CI build against the branch that has this patch, the PR seems to be closed after dependency analysis. But edk2 top of master CI build was failing as is. Please let me know how you would like to proceed.
Thanks,
Kun
From: Yao, Jiewen
Sent: Sunday, November 22, 2020 17:24
To: Kun Qin;
gaoliming; devel@edk2.groups.io
Cc: Wang, Jian J;
Lu, XiaoyuX; Jiang, Guomin
Subject: RE: [edk2-devel] [PATCH v1 1/1] CryptoPkg: BaseCryptLib: Fix buffer double free in CryptPkcs7VerifyEku
Sure. It seems Liming already approves it.
I will wait one more day to see if there is any other objection from the people in different time zone.
At mean time, I need your help to double confirm that, this patch can be merged without any CI error. So, please try Pull-Request by yourself and make sure it pass all CI checks.
I have some bad experience that CI error occurs finally, which prevent me from committing. Then we have to go back ask original submitter to fix and generate patch again. It may cause delay and miss the timeline.
Thank you
Yao Jiewen
From: Kun Qin <kun.q@outlook.com>
Sent: Monday, November 23, 2020 9:17 AM
To: Yao, Jiewen <jiewen.yao@intel.com>; gaoliming <gaoliming@byosoft.com.cn>;
devel@edk2.groups.io
Cc: Wang, Jian J <jian.j.wang@intel.com>; Lu, XiaoyuX <xiaoyux.lu@intel.com>; Jiang, Guomin <guomin.jiang@intel.com>
Subject: RE: [edk2-devel] [PATCH v1 1/1] CryptoPkg: BaseCryptLib: Fix buffer double free in CryptPkcs7VerifyEku
Hi Jiewen,
It will be great if you could help me merging in this fix. Please let me know if you need anything else from me to have it merged.
Thanks,
Kun
From: Yao, Jiewen
Sent: Sunday, November 22, 2020 04:25
To: Kun Qin;
gaoliming; devel@edk2.groups.io
Cc: Wang, Jian J;
Lu, XiaoyuX; Jiang, Guomin
Subject: RE: [edk2-devel] [PATCH v1 1/1] CryptoPkg: BaseCryptLib: Fix buffer double free in CryptPkcs7VerifyEku
I can help to merge if it is approved.
I will add reviewed-by tag when I merge it.
Thank you
Yao Jiewen
From: Kun Qin <kun.q@outlook.com>
Sent: Sunday, November 22, 2020 3:10 PM
To: gaoliming <gaoliming@byosoft.com.cn>;
devel@edk2.groups.io; Yao, Jiewen <jiewen.yao@intel.com>
Cc: Wang, Jian J <jian.j.wang@intel.com>; Lu, XiaoyuX <xiaoyux.lu@intel.com>; Jiang, Guomin <guomin.jiang@intel.com>
Subject: RE: [edk2-devel] [PATCH v1 1/1] CryptoPkg: BaseCryptLib: Fix buffer double free in CryptPkcs7VerifyEku
Hi Liming,
It will be great if we can get this in. But I have been having trouble sending a v2 patch that incorporates Jiewen’s “Reviewed-by” tag through git command line for the past week (no other changes). It kept giving me an error of "No host
provider available to service this request". Please let me know if you have any suggestions.
Thanks,
Kun
From: gaoliming
Sent: Thursday, November 19, 2020 9:39 PM
To: devel@edk2.groups.io;
jiewen.yao@intel.com; 'Kun Qin'
Cc: 'Wang, Jian J';
'Lu, XiaoyuX'; 'Jiang, Guomin'
Subject: 回复: [edk2-devel] [PATCH v1 1/1] CryptoPkg: BaseCryptLib: Fix buffer double free in CryptPkcs7VerifyEku
Kun:
This is a bug fix. It passed code review. Do you request to merge it for
this stable tag 202011?
Thanks
Liming
> -----邮件原件-----
> 发件人:
bounce+27952+67567+4905953+8761045@groups.io
> <bounce+27952+67567+4905953+8761045@groups.io>
代表 Yao, Jiewen
> 发送时间: 2020年11月14日
8:32
> 收件人: Kun Qin <kun.q@outlook.com>;
devel@edk2.groups.io
> 抄送: Wang, Jian J <jian.j.wang@intel.com>; Lu, XiaoyuX
> <xiaoyux.lu@intel.com>; Jiang, Guomin <guomin.jiang@intel.com>; Yao,
> Jiewen <jiewen.yao@intel.com>
> 主题: Re: [edk2-devel] [PATCH v1 1/1] CryptoPkg: BaseCryptLib: Fix buffer
> double free in CryptPkcs7VerifyEku
>
> Sorry, I missed this email.
>
> Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
>
>
> > -----Original Message-----
> > From: Kun Qin <kun.q@outlook.com>
> > Sent: Wednesday, October 21, 2020 10:32 AM
> > To: devel@edk2.groups.io
> > Cc: Wang, Jian J <jian.j.wang@intel.com>; Lu, XiaoyuX
> > <xiaoyux.lu@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>; Jiang,
> > Guomin <guomin.jiang@intel.com>
> > Subject: [PATCH v1 1/1] CryptoPkg: BaseCryptLib: Fix buffer double free
in
> > CryptPkcs7VerifyEku
> >
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2459
> >
> > SignerCert is part of Pkcs7 instance when both have valid content.
OpenSLL
> > PKCS7_free function will release the memory of SignerCert when
applicable.
> > Freeing SignerCert with X509_free again might cause page fault if use-
> > after-free guard is enabled.
> >
> > Cc: Jian J Wang <jian.j.wang@intel.com>
> > Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
> > Cc: Jiewen Yao <jiewen.yao@intel.com>
> > Cc: Guomin Jiang <guomin.jiang@intel.com>
> >
> > Signed-off-by: Kun Qin <kun.q@outlook.com>
> > ---
> > CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c | 4 ----
> > 1 file changed, 4 deletions(-)
> >
> > diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c
> > b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c
> > index c9fdb65b99d1..40cc39afe7dd 100644
> > --- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c
> > +++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c
> > @@ -508,10 +508,6 @@ Exit:
> > free (SignedData);
> >
> > }
> >
> >
> >
> > - if (SignerCert != NULL) {
> >
> > - X509_free (SignerCert);
> >
> > - }
> >
> > -
> >
> > if (Pkcs7 != NULL) {
> >
> > PKCS7_free (Pkcs7);
> >
> > }
> >
> > --
> > 2.28.0.windows.1
>
>
>
>
>