From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8E2C881D66 for ; Thu, 3 Nov 2016 00:23:21 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP; 03 Nov 2016 00:23:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,585,1473145200"; d="scan'208";a="897185064" Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.34]) by orsmga003.jf.intel.com with ESMTP; 03 Nov 2016 00:23:22 -0700 From: Hao Wu To: edk2-devel@lists.01.org Cc: Hao Wu , Liming Gao , Yonghong Zhu Date: Thu, 3 Nov 2016 15:22:18 +0800 Message-Id: <1478157783-9368-9-git-send-email-hao.a.wu@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.0 In-Reply-To: <1478157783-9368-1-git-send-email-hao.a.wu@intel.com> References: <1478157783-9368-1-git-send-email-hao.a.wu@intel.com> Subject: [PATCH v2 08/53] BaseTools/GenVtf: Avoid possible NULL pointer dereference X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Nov 2016 07:23:21 -0000 Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu --- BaseTools/Source/C/GenVtf/GenVtf.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/BaseTools/Source/C/GenVtf/GenVtf.c b/BaseTools/Source/C/GenVtf/GenVtf.c index f6765dd..b68d86a 100644 --- a/BaseTools/Source/C/GenVtf/GenVtf.c +++ b/BaseTools/Source/C/GenVtf/GenVtf.c @@ -1125,6 +1125,7 @@ Returns: EFI_ABORTED - Aborted due to one of the many reasons like: (a) Component Size greater than the specified size. (b) Error opening files. + (c) Fail to get the FIT table address. EFI_INVALID_PARAMETER Value returned from call to UpdateEntryPoint() EFI_OUT_OF_RESOURCES Memory allocation failure. @@ -1240,6 +1241,10 @@ Returns: } GetNextAvailableFitPtr (&CompFitPtr); + if (CompFitPtr == NULL) { + free (Buffer); + return EFI_ABORTED; + } CompFitPtr->CompAddress = CompStartAddress | IPF_CACHE_BIT; if ((FileSize % 16) != 0) { @@ -2652,6 +2657,7 @@ Returns: } SymFileName = VTF_SYM_FILE; } else { + assert (OutFileName1); INTN OutFileNameLen = strlen(OutFileName1); INTN NewIndex; @@ -2665,6 +2671,10 @@ Returns: } else { INTN SymFileNameLen = NewIndex + 1 + strlen(VTF_SYM_FILE); SymFileName = malloc(SymFileNameLen + 1); + if (SymFileName == NULL) { + Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!"); + goto ERROR; + } memcpy(SymFileName, OutFileName1, NewIndex + 1); memcpy(SymFileName + NewIndex + 1, VTF_SYM_FILE, strlen(VTF_SYM_FILE)); SymFileName[SymFileNameLen] = '\0'; -- 1.9.5.msysgit.0