CryptoPkg: Fix the pkcs7 get cert fuzz

Wenxing-hou · Wenxing-hou · commit 397fb1b1cf25 · 2024-03-19T14:43:00.000+08:00
Signed-off-by: Wenxing Hou &lt;wenxing.hou@intel.com&gt;
diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/Pk/CryptPkcs7VerifyCommon.c b/CryptoPkg/Library/BaseCryptLibMbedTls/Pk/CryptPkcs7VerifyCommon.c
@@ -470,6 +470,10 @@ Pkcs7GetSignedData (
     goto End;
   }
 
+  if (CertNum != 0) {
+    FreePool (MoreCert);
+  }
+
   LastCert = &(SignedData->Certificates);
 
   while (CertNum--) {
@@ -487,8 +491,10 @@ Pkcs7GetSignedData (
     Ret = MbedTlsPkcs7GetSignersInfoSet (&P, End, &SignedData->SignerInfos);
   }
 
+  return Ret;
+
 End:
-  if (MoreCert != NULL) {
+  if ((MoreCert != NULL) && (CertNum !=0)) {
     FreePool (MoreCert);
     MoreCert = NULL;
   }

Original file line number	Diff line number	Diff line change
`@@ -470,6 +470,10 @@ Pkcs7GetSignedData (`
`470`	`470`	`goto End;`
`471`	`471`	`}`
`472`	`472`
	`473`	`+ if (CertNum != 0) {`
	`474`	`+ FreePool (MoreCert);`
	`475`	`+ }`
	`476`	`+`
`473`	`477`	`LastCert = &(SignedData->Certificates);`
`474`	`478`
`475`	`479`	`while (CertNum--) {`
`@@ -487,8 +491,10 @@ Pkcs7GetSignedData (`
`487`	`491`	`Ret = MbedTlsPkcs7GetSignersInfoSet (&P, End, &SignedData->SignerInfos);`
`488`	`492`	`}`
`489`	`493`
	`494`	`+ return Ret;`
	`495`	`+`
`490`	`496`	`End:`
`491`		`- if (MoreCert != NULL) {`
	`497`	`+ if ((MoreCert != NULL) && (CertNum !=0)) {`
`492`	`498`	`FreePool (MoreCert);`
`493`	`499`	`MoreCert = NULL;`
`494`	`500`	`}`