From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web10.3667.1660345247674434286 for ; Fri, 12 Aug 2022 16:00:48 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=jkL3tctr; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: guo.dong@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1660345247; x=1691881247; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=zY7+d04BF4xbwg4d+jTs7pIEcu7Xx+u7XZ5vJiVUG5U=; b=jkL3tctrwRDq5hJ7BpfR9z3B0ey237qP85LzJ0OfHVN72frJWO06woSw NOP1GAzjQdsmfd6y8cFdgVb2bqQiSHtbPm4pCF51uugFab9cQrJw8wVWd /2jrrmzzcpSlv60UbTgy1TjOtXwlNul20+CZ/uk9vTp2ozQo2iFD/9ICO ce6GK+Q8XU3G1xUkSwOVXwDyPvr60kZLoTirEtwLrsni1eh2e8aN9/TXs fQcAdaXxsSQ6aU0P1T/WNgUBW3wrQYpGp1Yo/mZAuvwiBycWkN7xepIR5 BLX5Go8zNNQTtkVA9libAhUi5vCSRpeiL0MxZ0EI+R6+KKg6BJdfuvGwf Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10437"; a="292498803" X-IronPort-AV: E=Sophos;i="5.93,233,1654585200"; d="scan'208";a="292498803" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Aug 2022 16:00:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,233,1654585200"; d="scan'208";a="666004377" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by fmsmga008.fm.intel.com with ESMTP; 12 Aug 2022 16:00:47 -0700 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Fri, 12 Aug 2022 16:00:46 -0700 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Fri, 12 Aug 2022 16:00:46 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28 via Frontend Transport; Fri, 12 Aug 2022 16:00:46 -0700 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (104.47.56.46) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.28; Fri, 12 Aug 2022 16:00:45 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IEAhLB+Jsqx4lJoTKPVkZdmvO7GFPJQEuspXhYrfADsRjtY5V+h1q6SVrgvK9AJyd6lVpfj5CglAZNxqsFAdqycPMK4/DwaSTQiwGm53xYcE0vNnyXgQFPUG8OWIlHgV57D01LVY9KURcJhF/ug1MMyPkvxSIz4OuN7Vd4fZoNBH5B6WFu7a9j2loQW11stmJWE/S9QDpCtzyGbJVHYLB1P8oJjY5FmepnkjBPh2KhhCxBFvx530eoepDFyGRhBIWmv2x6Jd38kFl7KW+j7yufCsk0u4P5vZjHitjFgybMYlp1IipbQQk+fukL/GhEbPOFngngnYbiilWQzDOCL5Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WTqqfS7QN8Nvxt8AB6FCHlskM0E5LAhum4AmmLS4ia8=; b=JJRDqDv1PJ10UyBcNQnqme3Hv6gdzmbWe2iBpK0GXlLvd1WO1GIN4Ad8bSSqGGcTZtQrBpQD5EwAz09s6LXhOwrwzUTe1zlkhHoElFTqTJgyRgY28Jz6RpV8J+VP6mNE/LqSoKyvdqcjdEFGkigED/IQpA8wuYK8sgzLSHz7F2d1354jDBiUl63iEUADfXD2UWsZZge6z9jHPzf7s5AigeHdDImlrA1Yducbv9ZjtGvvwMEUBy8MwkfU5OK8QbzIB9RPWY8QScCfjs+Soun2XnFoV6n48n+R0L8EKWxQroOqKhzzxPGOnUPzQEOEF9Tm3zMIXzZC9saTJ1VwkDzm6g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from CY5PR11MB6260.namprd11.prod.outlook.com (2603:10b6:930:23::16) by BN6PR11MB1284.namprd11.prod.outlook.com (2603:10b6:404:49::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.10; Fri, 12 Aug 2022 23:00:44 +0000 Received: from CY5PR11MB6260.namprd11.prod.outlook.com ([fe80::d51:f743:8ca2:8160]) by CY5PR11MB6260.namprd11.prod.outlook.com ([fe80::d51:f743:8ca2:8160%7]) with mapi id 15.20.5525.011; Fri, 12 Aug 2022 23:00:44 +0000 From: "Guo Dong" To: "devel@edk2.groups.io" , "Yeh, GregX" CC: "Ni, Ray" Subject: Re: [edk2-devel] [PATCH] UefiPayloadPkg: Fix Coverity report defect Thread-Topic: [edk2-devel] [PATCH] UefiPayloadPkg: Fix Coverity report defect Thread-Index: AQHYrU4Nj74AvlLcMEG+xCfFnwLAkq2r5BDA Date: Fri, 12 Aug 2022 23:00:43 +0000 Message-ID: References: <20220811064535.3059-1-gregx.yeh@intel.com> In-Reply-To: <20220811064535.3059-1-gregx.yeh@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.6.500.17 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e127b7de-7faa-4369-de2e-08da7cb67c6f x-ms-traffictypediagnostic: BN6PR11MB1284:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 8dAAOohBDTbLqePGRHUHBFIm57osqLphBGjb8rffJxfidEPqg5Z4aTOZh3TvRef/bHlxz8Vwbdq5QRKWBbVfd052sBFnfRCYjLF2dUXS7WsyvhGQ5wLhWQW86PFnl1h4XvLQjnEp7FmoHNd2/bA/MMf0L+4FvZAJTRPR+3ewSgxFiKJNl1FIdBBBvPFwPNGQ85xpXJ4kIyre/A1pEVUyiZhAPmc1Lh6EvX/MGALQkVxYzoBA0E99aYR4XUpugQOQgoH6EMIt0eoKNEsmQ4tjxVsJHZvX6RHtcTbCnia295f41EI7YUgZH5/3w+QEfbt8e8fo3xk7LjKQ2B1WnMBmGGJfKc2tYGIhPHOs0EuOXUqsLvYSZhq5+8vNEJcdG5NkuDqBILUceRN+4sXhRJEUTeGPiRPthVCegnyWYf1OLMwVoorCFLIlFNv3Tx3L0Aumacu2HpJZaK0kv4b1uoS1NNC2bj0bPSgCV8uLq+dOiaPEXEdNOnHLjEVDF3xmrUCOFRcktL9g8oIKjcM/rUKnDPQhrKcM4jmeHRSOtubOSqgOus3OcUBIKsJik/PabyENEOtuHsOd9yNnfHnSXVMpY7gGUyEXVmcMxsUmtGmtrsd9vyltvEXOnG6rtdWuQETBjnqG10EJsMuR/U/RyIlOFmqiRhSZ6TBDRtmd9JwnKVkoNl+XGcoRw6w6eGC5rTvnfN669yUoK0sSSL0Ri6UGqTqMHnSIJzbKyfQXqvs1Grb/h2KcK2Yca2vGUxjJvP82wM9d3jgP9jxNc9VthDXaNAOb7jX39C7iDIoFwwTW6ATR1F0q6SwPbPCEPaHWOel174bjNugmYk/6KlNxg9e4dAAAkUvXUIb6gG62CKTk+COuk24LQflgbFki9VZMngfV x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CY5PR11MB6260.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(396003)(366004)(39860400002)(376002)(136003)(346002)(107886003)(186003)(82960400001)(83380400001)(55016003)(122000001)(38100700002)(478600001)(71200400001)(966005)(316002)(66556008)(19627235002)(41300700001)(76116006)(52536014)(5660300002)(38070700005)(6636002)(110136005)(2906002)(66446008)(8936002)(66946007)(64756008)(9686003)(8676002)(6506007)(53546011)(4326008)(33656002)(7696005)(66476007)(86362001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?rvax0nAQjcDcBy98uzEWAZCrx3jEgU9M7ixKvSxjg1M3+kDoHLt5bgntCO3z?= =?us-ascii?Q?Ru/+/o2rBUNWXWNQ0lWLb2PvioRj3S3dM/VClXoABMziJLspi767xo4YCglW?= =?us-ascii?Q?iuMdW6p6rs0p8QirB3sg1FhdLCzew4JTCyuRmeVO2Isg+W/nr8JTXn/mxx8y?= =?us-ascii?Q?0XEg09kztLxbVKorxs7m1dS18NEiM+lrAa2waLp0Hqp8BO1ONWXQgFz6zWjw?= =?us-ascii?Q?ZkXZ9w0J0/vYw1PirEa/hs/iP/Q8ifoGyq92H4j6TSHOSnRij1Zxr/AmtxPG?= =?us-ascii?Q?S/yCbkZHaDAttwbOnd+kx2x+gpKo8fK3lY3ED8/o2G+mMyZXhmK+SWJHxSLh?= =?us-ascii?Q?IHkYhTTbOKDbFiOBe5P4uT9GIKwGN+GObOZg3xOKNm4n0TKZCtxAu3M+2K8n?= =?us-ascii?Q?iBYGVLIdz4N5yvY1DAnqZpAUxM98ETNo62lhtOJcCVnOJkh9Gtwkt/I2Q8Fl?= =?us-ascii?Q?AACzHMknz3VED8xDT2km5bLxZZZhL1XVnhpMae5c/9vg8zCvexMvAWBs7NZZ?= =?us-ascii?Q?h72aDKvxBUhOZ0QQZtcrFSOVpFwiZMrLk1ySQm07WTqEbaDPyvVLjUAu/kps?= =?us-ascii?Q?YLPprkNglW2lm5m2FUS8X8E/w6PtEumkrkGHq/6NRvEN0Ary91C5qSKcW5RY?= =?us-ascii?Q?DE7mZKXDySIvyrZ6Dri0tbZxnbM3nyZ6eo6GGLRO5GD/5muTBbY3CcUoYi4B?= =?us-ascii?Q?Va0pDM9zVNb9wDzFq92cGUA2uCP29WkaUJriTi9qVx0oWD4G1LWuyix5PaH5?= =?us-ascii?Q?OVmGiF1Ha3KUvuoi765dT8uha5+1WKWWZVaLVmPBUZchfNkfgZA3TAxLoAcI?= =?us-ascii?Q?F3uVibEGMiW+qzFJcYW4Hj8xwzNUiV93Q/EV4gXPiR2WxMFxqPvuSjG6x5FP?= =?us-ascii?Q?tEiJHMSZFeU5ugEhZLiNm2EYnMI7z4+QTmKGNivsKXniA+cCAq/has5C2c52?= =?us-ascii?Q?trun5VmkR1gaViBFnHdB63NNT7tfwXhq0ysGIWlmVPJ1g92gaDoIBySiksjX?= =?us-ascii?Q?zIyDHyMhxIEs4gGr3HrpUClWolWt+P5XkEnC7iwo+ht8VM3/YSvZuZeO/GK8?= =?us-ascii?Q?OovJgBnzSebmg03hAZc7auSfQGvhiJ01v2/nXD2TNfzQX++ECd5/f7Xduo4M?= =?us-ascii?Q?l+KhwHudg/hwB547voMhlGy8tWRZ6dO3ooO/m0b8KxyuZ7Df3vt8iqlpMeY4?= =?us-ascii?Q?tIoEdf8/FFVY0Yv/JlHePRs2fxrlwi5KHpjmIFPIAhCsUGetChM8hgkm3N5v?= =?us-ascii?Q?/VPyRt3HyD4cZZ6yq3REM0GdX+2mh/qBS5W3pwHsxSbGIzXJ0NDDq2PAsj7l?= =?us-ascii?Q?1s4B5PdPFMWUjIEscDVLsYEqe0YCdYuYVisSKFQbsn7co6777XMe/8eQYDVh?= =?us-ascii?Q?fQFfcFvl+fHOcxcyMftGd9eZXNtRSatxsLhwK/wHGcasZfXPMvmrgZMV0MrK?= =?us-ascii?Q?9JEmbcjNP2Z5a+lSeXSZCMxWZ3hqAsRj2mXq+m/nRfZUS8HHhgn4Mbnvc/9F?= =?us-ascii?Q?GQyWFZZq0583N7ZwWMoC6wzL+NYe94vuz9ARhOfTy2Tz1TyiAN8anTDu/AlT?= =?us-ascii?Q?j8NPI8hIviJ8e1W9nLslqwRU1anPxUnkUNrcQ2iyy30+Dg5u6v/UMn7/3oyP?= =?us-ascii?Q?RwlxXKZcO/4U4n0H0sLYSY/TSG+AH/arKOzE9C4hLSdA?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CY5PR11MB6260.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e127b7de-7faa-4369-de2e-08da7cb67c6f X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Aug 2022 23:00:43.9632 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 0Ed0SW2vnNjqbPP1zXYDCfdzlwClvGO8d/xdNDpU3/UGkCizHNCpv3sxpVzwus5Xw0zPLoPGtXARvAQe7qt9jg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1284 Return-Path: guo.dong@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Guo Dong -----Original Message----- From: devel@edk2.groups.io On Behalf Of GregX Yeh Sent: Wednesday, August 10, 2022 11:46 PM To: devel@edk2.groups.io Cc: Yeh, GregX ; Dong, Guo ; Ni, R= ay Subject: [edk2-devel] [PATCH] UefiPayloadPkg: Fix Coverity report defect 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 --- 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; = } - ASSERT (Bridges !=3D NULL && Count > 0);+ ASSERT (Bridges !=3D NULL |= | Count > 0); do { --Count;diff --git a/UefiPayloadPkg/PayloadLoader= Peim/ElfLib/ElfLib.c b/UefiPayloadPkg/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 * Elf64Hdr->e_shnum);+ FileSize2 =3D ((UINTN)Elf6= 4Hdr->e_shoff + (UINTN)(Elf64Hdr->e_shentsize * Elf64Hdr->e_shnum)); } = *FileSize =3D MAX (FileSize1, FileSize2);diff --git a/UefiPayloadPkg/UefiP= ayloadEntry/X64/VirtualMemory.c b/UefiPayloadPkg/UefiPayloadEntry/X64/Virtu= alMemory.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 (!Page1G= Support) {- TotalPagesNum =3D ((NumberOfPdpEntriesNeeded + 1) * NumberOf= Pml4EntriesNeeded + 1) * NumberOfPml5EntriesNeeded + 1;+ TotalPagesNum = =3D (UINTN)((NumberOfPdpEntriesNeeded + 1) * NumberOfPml4EntriesNeeded + 1)= * NumberOfPml5EntriesNeeded + 1; } else {- TotalPagesNum =3D (NumberO= fPml4EntriesNeeded + 1) * NumberOfPml5EntriesNeeded + 1;+ TotalPagesNum = =3D (UINTN)(NumberOfPml4EntriesNeeded + 1) * NumberOfPml5EntriesNeeded + 1;= } //--=20 2.26.2.windows.1 -=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/1781375 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [guo.dong@intel.com] -=3D= -=3D-=3D-=3D-=3D-=3D