[edk2-devel] [PATCH v2] SecurityPkg/Tpm2Help.c: Add boundary check for array
Zhang, Shenglei
shenglei.zhang at intel.com
Mon Dec 16 07:52:41 UTC 2019
Add 'Index < HASH_COUNT' to ensure things out of digests[]
can not be visited.
Cc: Jiewen Yao <jiewen.yao at intel.com>
Cc: Jian J Wang <jian.j.wang at intel.com>
Cc: Chao Zhang <chao.b.zhang at intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang at intel.com>
---
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/Library/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;
TotalSize = sizeof(DigestList->count);
- for (Index = 0; Index < DigestList->count; Index++) {
+ for (Index = 0; Index < DigestList->count && Index < HASH_COUNT; Index++) {
DigestSize = GetHashSizeFromAlgo (DigestList->digests[Index].hashAlg);
TotalSize += sizeof(DigestList->digests[Index].hashAlg) + DigestSize;
}
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
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/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list