tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-31 01:24:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

CryptoPkg: Fix the dereferenced pointer issue

Browse Source 
This patch is to fix one dereferenced pointer issue in new
Pkcs7GetAttachedContent API, and add the memory allocation
failure check.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Qin Long <qin.long@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17731 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Qin Long 2015-06-30 03:27:23 +00:00 committed by qlong
parent e75390f029
commit 2aabd14630
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7Verify.c
View File

@ -719,11 +719,6 @@ Pkcs7GetAttachedContent (
CONST UINT8 *Temp; CONST UINT8 *Temp;
ASN1_OCTET_STRING *OctStr; ASN1_OCTET_STRING *OctStr;
*Content = NULL;
Pkcs7 = NULL;
SignedData = NULL;
OctStr = NULL;
// //
// Check input parameter. // Check input parameter.
// //
@ -731,6 +726,11 @@ Pkcs7GetAttachedContent (
return FALSE; return FALSE;
} }
*Content = NULL;
Pkcs7 = NULL;
SignedData = NULL;
OctStr = NULL;
Status = WrapPkcs7Data (P7Data, P7Length, &Wrapped, &SignedData, &SignedDataSize); Status = WrapPkcs7Data (P7Data, P7Length, &Wrapped, &SignedData, &SignedDataSize);
if (!Status || (SignedDataSize > INT_MAX)) { if (!Status || (SignedDataSize > INT_MAX)) {
goto _Exit; goto _Exit;
@ -771,6 +771,10 @@ Pkcs7GetAttachedContent (
if ((OctStr->length > 0) && (OctStr->data != NULL)) { if ((OctStr->length > 0) && (OctStr->data != NULL)) {
*ContentSize = OctStr->length; *ContentSize = OctStr->length;
*Content = malloc (*ContentSize); *Content = malloc (*ContentSize);
if (*Content == NULL) {
*ContentSize = 0;
goto _Exit;
}
CopyMem (*Content, OctStr->data, *ContentSize); CopyMem (*Content, OctStr->data, *ContentSize);
} }
} }