From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.43; helo=mga05.intel.com; envelope-from=hao.a.wu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 90820221C1926 for ; Mon, 18 Dec 2017 19:24:49 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Dec 2017 19:29:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,424,1508828400"; d="scan'208";a="188196743" Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.10]) by fmsmga006.fm.intel.com with ESMTP; 18 Dec 2017 19:29:34 -0800 From: Hao Wu To: edk2-devel@lists.01.org Cc: Hao Wu , Liming Gao , Yonghong Zhu Date: Tue, 19 Dec 2017 11:29:08 +0800 Message-Id: <20171219032912.14404-14-hao.a.wu@intel.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20171219032912.14404-1-hao.a.wu@intel.com> References: <20171219032912.14404-1-hao.a.wu@intel.com> Subject: [PATCH 13/17] BaseTools/VfrCompile: Add/refine boundary checks for strcpy/strcat X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2017 03:24:49 -0000 Add checks to ensure when the destination string buffer is of fixed size, the strcpy/strcat functions calls will not access beyond the boundary. Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Hao Wu --- BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp index 0fe14b0d29..4866639aab 100644 --- a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp +++ b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp @@ -15,6 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "stdio.h" #include "stdlib.h" +#include "assert.h" #include "CommonLib.h" #include "VfrUtilityLib.h" #include "VfrFormPkg.h" @@ -842,7 +843,9 @@ CVfrVarDataTypeDB::InternalTypesListInit ( for (Index = 0; gInternalTypesTable[Index].mTypeName != NULL; Index++) { New = new SVfrDataType; if (New != NULL) { - strcpy (New->mTypeName, gInternalTypesTable[Index].mTypeName); + assert (strlen (gInternalTypesTable[Index].mTypeName) < MAX_NAME_LEN); + strncpy (New->mTypeName, gInternalTypesTable[Index].mTypeName, MAX_NAME_LEN - 1); + New->mTypeName[MAX_NAME_LEN - 1] = 0; New->mType = gInternalTypesTable[Index].mType; New->mAlign = gInternalTypesTable[Index].mAlign; New->mTotalSize = gInternalTypesTable[Index].mSize; @@ -1084,7 +1087,8 @@ CVfrVarDataTypeDB::SetNewTypeName ( } } - strcpy(mNewDataType->mTypeName, TypeName); + strncpy(mNewDataType->mTypeName, TypeName, MAX_NAME_LEN - 1); + mNewDataType->mTypeName[MAX_NAME_LEN - 1] = 0; return VFR_RETURN_SUCCESS; } @@ -1145,7 +1149,8 @@ CVfrVarDataTypeDB::DataTypeAddBitField ( MaxDataTypeSize = mNewDataType->mTotalSize; if (FieldName != NULL) { - strcpy (pNewField->mFieldName, FieldName); + strncpy (pNewField->mFieldName, FieldName, MAX_NAME_LEN - 1); + pNewField->mFieldName[MAX_NAME_LEN - 1] = 0; } pNewField->mFieldType = pFieldType; pNewField->mIsBitField = TRUE; @@ -1239,7 +1244,8 @@ CVfrVarDataTypeDB::DataTypeAddField ( if ((pNewField = new SVfrDataField) == NULL) { return VFR_RETURN_OUT_FOR_RESOURCES; } - strcpy (pNewField->mFieldName, FieldName); + strncpy (pNewField->mFieldName, FieldName, MAX_NAME_LEN - 1); + pNewField->mFieldName[MAX_NAME_LEN - 1] = 0; pNewField->mFieldType = pFieldType; pNewField->mArrayNum = ArrayNum; pNewField->mIsBitField = FALSE; -- 2.12.0.windows.1