From: "Yao, Jiewen" <jiewen.yao@intel.com>
To: "Zhang, Shenglei" <shenglei.zhang@intel.com>,
"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: "Wang, Jian J" <jian.j.wang@intel.com>,
"Zhang, Chao B" <chao.b.zhang@intel.com>
Subject: Re: [PATCH v2] SecurityPkg/Tpm2Help.c: Add boundary check for array
Date: Mon, 16 Dec 2019 07:55:49 +0000 [thread overview]
Message-ID: <74D8A39837DF1E4DA445A8C0B3885C503F8A27E0@shsmsx102.ccr.corp.intel.com> (raw)
In-Reply-To: <20191216075241.13060-1-shenglei.zhang@intel.com>
I don't think it is good idea to *ignore* the error.
If you don't assert, please stop processor and return error.
> -----Original Message-----
> From: Zhang, Shenglei <shenglei.zhang@intel.com>
> Sent: Monday, December 16, 2019 3:53 PM
> To: devel@edk2.groups.io
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Wang, Jian J <jian.j.wang@intel.com>;
> Zhang, Chao B <chao.b.zhang@intel.com>
> Subject: [PATCH v2] SecurityPkg/Tpm2Help.c: Add boundary check for array
>
> Add 'Index < HASH_COUNT' to ensure things out of digests[]
> can not be visited.
>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Chao Zhang <chao.b.zhang@intel.com>
> Signed-off-by: Shenglei Zhang <shenglei.zhang@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
prev parent reply other threads:[~2019-12-16 7:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-16 7:52 [PATCH v2] SecurityPkg/Tpm2Help.c: Add boundary check for array Zhang, Shenglei
2019-12-16 7:55 ` Yao, Jiewen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=74D8A39837DF1E4DA445A8C0B3885C503F8A27E0@shsmsx102.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox