From nobody Fri May 3 10:42:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+92343+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+92343+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1660200344; cv=none; d=zohomail.com; s=zohoarc; b=nP91U08u1VuRKgRpdEoM2CUeZHmMH+IP8CyF8qTFZMK8Fr0xhDY1c0YGFMf9X4CBbR2YZcEclev/t9iPiN7/f19twxU+B5XF44ZKzQnMq1qH58QvomvKDl5jHHKepCEEeev9OkJFvOpgjmFzK+XshHmIfEurt503sjkJrwBLL3E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660200344; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=RgDyJTLa4fu4iiVv8VpKPHeBzuOB/2NK4oev/WfH9zo=; b=L/nwFK/El65v0SUtSwWtQ0WwXOv1Mhkd89fhHHgm2l24gCf/ra92TCqY2zm03QjtLEZAOX0/QH84smGpu1JfXN0XtGCfNibdJR7MSVEVGgwYkRZNGhLOaZoGUXcJWr70AudQ/m1CJJlM56QyIdlR3bfwAHAR46Y4Briw6vf05mw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+92343+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1660200344076168.02074000718517; Wed, 10 Aug 2022 23:45:44 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ABQdYY1788612xWliEJlQr7w; Wed, 10 Aug 2022 23:45:43 -0700 X-Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web11.3597.1660200342379391853 for ; Wed, 10 Aug 2022 23:45:42 -0700 X-IronPort-AV: E=McAfee;i="6400,9594,10435"; a="288841444" X-IronPort-AV: E=Sophos;i="5.93,228,1654585200"; d="scan'208";a="288841444" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Aug 2022 23:45:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,228,1654585200"; d="scan'208";a="933200495" X-Received: from chinghux-desk.gar.corp.intel.com ([10.5.215.36]) by fmsmga005.fm.intel.com with ESMTP; 10 Aug 2022 23:45:39 -0700 From: "GregX Yeh" To: devel@edk2.groups.io Cc: Gregx Yeh , Guo Dong , Ray Ni Subject: [edk2-devel] [PATCH] UefiPayloadPkg: Fix Coverity report defect Date: Thu, 11 Aug 2022 14:45:35 +0800 Message-Id: <20220811064535.3059-1-gregx.yeh@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,gregx.yeh@intel.com X-Gm-Message-State: rIGVEyaunWlrDtRE6STN1pbmx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1660200343; bh=7pb4ojQ19C88t7hPsxTTqBZm6NJXhZ3/JGHN6AH0OUg=; h=Cc:Date:From:Reply-To:Subject:To; b=kQlmzTMLazZAprRv6Qu1ffHcA6EvVaWMumeogq0e/oaFyOXEipuNHOwg18GXlpNkzXx wFw/PAVPS9+2hLQPj+QLGVAJtNVNYR6bM8b4lD1UQSYGhJP2X6L4rafeexbpmMjFpelAd v4+OztAwTDUyGMbiDMKVpMvm21b/kBKf9eg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1660200344610100001 Content-Type: text/plain; charset="utf-8" From: Gregx Yeh https://bugzilla.tianocore.org/show_bug.cgi?id=3D4018 Coverity report FORWARD_NULL and OVERFLOW_BEFORE_WIDEN potential defect in UefiPayloadPkg. Signed-off-by: Gregx Yeh Cc: Guo Dong Cc: Ray Ni Reviewed-by: Guo Dong --- UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c | 4 ++-- UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLib.c | 2 +- UefiPayloadPkg/UefiPayloadEntry/X64/VirtualMemory.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c b/U= efiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c index 9847063d3d..790e6109c0 100644 --- a/UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c +++ b/UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c @@ -232,11 +232,11 @@ PciHostBridgeFreeRootBridges ( UINTN Count ) { - if ((Bridges =3D=3D NULL) && (Count =3D=3D 0)) { + if ((Bridges =3D=3D NULL) || (Count =3D=3D 0)) { return; } =20 - ASSERT (Bridges !=3D NULL && Count > 0); + ASSERT (Bridges !=3D NULL || Count > 0); =20 do { --Count; diff --git a/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLib.c b/UefiPayload= Pkg/PayloadLoaderPeim/ElfLib/ElfLib.c index 2a6305c67b..a9bf6f3223 100644 --- a/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLib.c +++ b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLib.c @@ -149,7 +149,7 @@ CalculateElfFileSize ( FileSize2 =3D Elf32Hdr->e_shoff + Elf32Hdr->e_shentsize * Elf32Hdr->e_= shnum; } else if (ElfCt->EiClass =3D=3D ELFCLASS64) { Elf64Hdr =3D (Elf64_Ehdr *)ElfCt->FileBase; - FileSize2 =3D (UINTN)(Elf64Hdr->e_shoff + Elf64Hdr->e_shentsize * Elf6= 4Hdr->e_shnum); + FileSize2 =3D ((UINTN)Elf64Hdr->e_shoff + (UINTN)(Elf64Hdr->e_shentsiz= e * Elf64Hdr->e_shnum)); } =20 *FileSize =3D MAX (FileSize1, FileSize2); diff --git a/UefiPayloadPkg/UefiPayloadEntry/X64/VirtualMemory.c b/UefiPayl= oadPkg/UefiPayloadEntry/X64/VirtualMemory.c index 74b667a62a..8d8a9d0ca8 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/X64/VirtualMemory.c +++ b/UefiPayloadPkg/UefiPayloadEntry/X64/VirtualMemory.c @@ -783,9 +783,9 @@ CreateIdentityMappingPageTables ( // Pre-allocate big pages to avoid later allocations. // if (!Page1GSupport) { - TotalPagesNum =3D ((NumberOfPdpEntriesNeeded + 1) * NumberOfPml4Entrie= sNeeded + 1) * NumberOfPml5EntriesNeeded + 1; + TotalPagesNum =3D (UINTN)((NumberOfPdpEntriesNeeded + 1) * NumberOfPml= 4EntriesNeeded + 1) * NumberOfPml5EntriesNeeded + 1; } else { - TotalPagesNum =3D (NumberOfPml4EntriesNeeded + 1) * NumberOfPml5Entrie= sNeeded + 1; + TotalPagesNum =3D (UINTN)(NumberOfPml4EntriesNeeded + 1) * NumberOfPml= 5EntriesNeeded + 1; } =20 // --=20 2.26.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#92343): https://edk2.groups.io/g/devel/message/92343 Mute This Topic: https://groups.io/mt/92953360/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-