From nobody Mon May 6 14:04:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+52242+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+52242+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1576482770; cv=none; d=zohomail.com; s=zohoarc; b=ISegQ8ChuRNDe4zyj6GrUqVbwRwjWNvEeV8vKrPaG9ENLrP7fiq9spm7n15hOWjV6vKdurBoaTjk2Ib8ST8pPqe4rrD+bcC2V7ikKn9M2it1yHEjYXjfMa7AIjBlVOzJUdDHXXnitwBguj/O1tWtGqnqbF4+Zq4s7OZiALQiBL4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576482770; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=ORWfqFiaMDgQu0cc0R8LAoo5/Mi66h6n3ScTg6xksz0=; b=SQRWO12nWon7CvDEzQm3xNETf4h7YaexghX9/EVbJXWi43okLTHpJ9lW31/lFTOCsPxKx8OsWXBMr4lj3K9cMlt3E6qD6R8SqLRI3R9+aCqWHQxGVN70I8cwH+zaSNKj5qCPhAucwSLKmX3Yhc3q6p1JRD0HpFu5hkfdSyvWJvw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+52242+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 157648277006616.341366487176742; Sun, 15 Dec 2019 23:52:50 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 9ViCYY1788612xK6Riy6fq2H; Sun, 15 Dec 2019 23:52:49 -0800 X-Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web10.3943.1576482768864842752 for ; Sun, 15 Dec 2019 23:52:48 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Dec 2019 23:52:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,320,1571727600"; d="scan'208";a="217090930" X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga006.jf.intel.com with ESMTP; 15 Dec 2019 23:52:47 -0800 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Jiewen Yao , Jian J Wang , Chao Zhang Subject: [edk2-devel] [PATCH v2] SecurityPkg/Tpm2Help.c: Add boundary check for array Date: Mon, 16 Dec 2019 15:52:41 +0800 Message-Id: <20191216075241.13060-1-shenglei.zhang@intel.com> Precedence: Bulk List-Unsubscribe: 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,shenglei.zhang@intel.com X-Gm-Message-State: 3VwEnMZxQvEOr8nP1JuNEzItx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1576482769; bh=WgwBwJndhPIkdoGg/y6PFjGKWSvMqMORulkUeAe3Mz8=; h=Cc:Date:From:Reply-To:Subject:To; b=ATgJdKZ/YV7MzVqttErNVWLwS0qXQcfjCS6FCiX03F5XhpKoJUGL0Q/cEj0DUQIL/HE /eqyc4Oz9QGOWhlsq+dH0srSrfZskzRbNrnU2IDHPE7FBAjG73geCscC7RDkbnAAbnlzU /2XOJk6mJZEjp/Ev4f5MkLImTBDhLkv0I64= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add 'Index < HASH_COUNT' to ensure things out of digests[] can not be visited. Cc: Jiewen Yao Cc: Jian J Wang Cc: Chao Zhang Signed-off-by: Shenglei Zhang --- v2: Remove the comma operator and use &&. SecurityPkg/Library/Tpm2CommandLib/Tpm2Help.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Help.c b/SecurityPkg/Li= brary/Tpm2CommandLib/Tpm2Help.c index 36c240d1221c..d7bc94006003 100644 --- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Help.c +++ b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Help.c @@ -299,7 +299,7 @@ GetDigestListSize ( UINT32 TotalSize; =20 TotalSize =3D sizeof(DigestList->count); - for (Index =3D 0; Index < DigestList->count; Index++) { + for (Index =3D 0; Index < DigestList->count && Index < HASH_COUNT; Index= ++) { DigestSize =3D GetHashSizeFromAlgo (DigestList->digests[Index].hashAlg= ); TotalSize +=3D sizeof(DigestList->digests[Index].hashAlg) + DigestSize; } --=20 2.18.0.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 (#52242): https://edk2.groups.io/g/devel/message/52242 Mute This Topic: https://groups.io/mt/68718554/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-