* [PATCH v2] CryptoPkg/BaseCryptLib: Eliminate extra buffer copy in Pkcs7Verify()
@ 2021-09-10 21:34 Bob Morgan
2021-09-11 15:30 ` Yao, Jiewen
0 siblings, 1 reply; 3+ messages in thread
From: Bob Morgan @ 2021-09-10 21:34 UTC (permalink / raw)
To: devel; +Cc: Bob Morgan, Jiewen Yao, Jian J Wang, Xiaoyu Lu, Guomin Jiang
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3617
Create a read-only openSSL BIO wrapper for the existing input
buffer passed to Pkcs7Verify() instead of copying the buffer
into an empty writable BIO which causes memory allocations
within openSSL.
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
Signed-off-by: Bob Morgan <bobm@nvidia.com>
---
CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c
index d99597d181..8eda98f7b2 100644
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c
@@ -864,15 +864,11 @@ Pkcs7Verify (
// For generic PKCS#7 handling, InData may be NULL if the content is present
// in PKCS#7 structure. So ignore NULL checking here.
//
- DataBio = BIO_new (BIO_s_mem ());
+ DataBio = BIO_new_mem_buf (InData, (int) DataLength);
if (DataBio == NULL) {
goto _Exit;
}
- if (BIO_write (DataBio, InData, (int) DataLength) <= 0) {
- goto _Exit;
- }
-
//
// Allow partial certificate chains, terminated by a non-self-signed but
// still trusted intermediate certificate. Also disable time checks.
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] CryptoPkg/BaseCryptLib: Eliminate extra buffer copy in Pkcs7Verify()
2021-09-10 21:34 [PATCH v2] CryptoPkg/BaseCryptLib: Eliminate extra buffer copy in Pkcs7Verify() Bob Morgan
@ 2021-09-11 15:30 ` Yao, Jiewen
2021-10-13 1:48 ` Yao, Jiewen
0 siblings, 1 reply; 3+ messages in thread
From: Yao, Jiewen @ 2021-09-11 15:30 UTC (permalink / raw)
To: Bob Morgan, devel@edk2.groups.io; +Cc: Wang, Jian J, Lu, XiaoyuX, Jiang, Guomin
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
> -----Original Message-----
> From: Bob Morgan <bobm@nvidia.com>
> Sent: Saturday, September 11, 2021 5:34 AM
> To: devel@edk2.groups.io
> Cc: Bob Morgan <bobm@nvidia.com>; Yao, Jiewen <jiewen.yao@intel.com>;
> Wang, Jian J <jian.j.wang@intel.com>; Lu, XiaoyuX <xiaoyux.lu@intel.com>;
> Jiang, Guomin <guomin.jiang@intel.com>
> Subject: [PATCH v2] CryptoPkg/BaseCryptLib: Eliminate extra buffer copy in
> Pkcs7Verify()
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3617
>
> Create a read-only openSSL BIO wrapper for the existing input
> buffer passed to Pkcs7Verify() instead of copying the buffer
> into an empty writable BIO which causes memory allocations
> within openSSL.
>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
> Cc: Guomin Jiang <guomin.jiang@intel.com>
> Signed-off-by: Bob Morgan <bobm@nvidia.com>
> ---
> CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c
> b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c
> index d99597d181..8eda98f7b2 100644
> --- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c
> +++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c
> @@ -864,15 +864,11 @@ Pkcs7Verify (
> // For generic PKCS#7 handling, InData may be NULL if the content is present
> // in PKCS#7 structure. So ignore NULL checking here.
> //
> - DataBio = BIO_new (BIO_s_mem ());
> + DataBio = BIO_new_mem_buf (InData, (int) DataLength);
> if (DataBio == NULL) {
> goto _Exit;
> }
>
> - if (BIO_write (DataBio, InData, (int) DataLength) <= 0) {
> - goto _Exit;
> - }
> -
> //
> // Allow partial certificate chains, terminated by a non-self-signed but
> // still trusted intermediate certificate. Also disable time checks.
> --
> 2.17.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] CryptoPkg/BaseCryptLib: Eliminate extra buffer copy in Pkcs7Verify()
2021-09-11 15:30 ` Yao, Jiewen
@ 2021-10-13 1:48 ` Yao, Jiewen
0 siblings, 0 replies; 3+ messages in thread
From: Yao, Jiewen @ 2021-10-13 1:48 UTC (permalink / raw)
To: Bob Morgan, devel@edk2.groups.io; +Cc: Wang, Jian J, Lu, XiaoyuX, Jiang, Guomin
https://github.com/tianocore/edk2/pull/2055
pushed:
https://github.com/tianocore/edk2/commit/f22feb0e3b3f08b95201b258b104c45a2acef71f
> -----Original Message-----
> From: Yao, Jiewen
> Sent: Saturday, September 11, 2021 11:30 PM
> To: Bob Morgan <bobm@nvidia.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: RE: [PATCH v2] CryptoPkg/BaseCryptLib: Eliminate extra buffer copy in
> Pkcs7Verify()
>
> Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
>
> > -----Original Message-----
> > From: Bob Morgan <bobm@nvidia.com>
> > Sent: Saturday, September 11, 2021 5:34 AM
> > To: devel@edk2.groups.io
> > Cc: Bob Morgan <bobm@nvidia.com>; Yao, Jiewen <jiewen.yao@intel.com>;
> > Wang, Jian J <jian.j.wang@intel.com>; Lu, XiaoyuX <xiaoyux.lu@intel.com>;
> > Jiang, Guomin <guomin.jiang@intel.com>
> > Subject: [PATCH v2] CryptoPkg/BaseCryptLib: Eliminate extra buffer copy in
> > Pkcs7Verify()
> >
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3617
> >
> > Create a read-only openSSL BIO wrapper for the existing input
> > buffer passed to Pkcs7Verify() instead of copying the buffer
> > into an empty writable BIO which causes memory allocations
> > within openSSL.
> >
> > Cc: Jiewen Yao <jiewen.yao@intel.com>
> > Cc: Jian J Wang <jian.j.wang@intel.com>
> > Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
> > Cc: Guomin Jiang <guomin.jiang@intel.com>
> > Signed-off-by: Bob Morgan <bobm@nvidia.com>
> > ---
> > CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c | 6 +-----
> > 1 file changed, 1 insertion(+), 5 deletions(-)
> >
> > diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c
> > b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c
> > index d99597d181..8eda98f7b2 100644
> > --- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c
> > +++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c
> > @@ -864,15 +864,11 @@ Pkcs7Verify (
> > // For generic PKCS#7 handling, InData may be NULL if the content is present
> > // in PKCS#7 structure. So ignore NULL checking here.
> > //
> > - DataBio = BIO_new (BIO_s_mem ());
> > + DataBio = BIO_new_mem_buf (InData, (int) DataLength);
> > if (DataBio == NULL) {
> > goto _Exit;
> > }
> >
> > - if (BIO_write (DataBio, InData, (int) DataLength) <= 0) {
> > - goto _Exit;
> > - }
> > -
> > //
> > // Allow partial certificate chains, terminated by a non-self-signed but
> > // still trusted intermediate certificate. Also disable time checks.
> > --
> > 2.17.1
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-13 1:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-10 21:34 [PATCH v2] CryptoPkg/BaseCryptLib: Eliminate extra buffer copy in Pkcs7Verify() Bob Morgan
2021-09-11 15:30 ` Yao, Jiewen
2021-10-13 1:48 ` Yao, Jiewen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox