* [PATCH v2 0/1] tpm: fix error return code in tpm2_get_cc_attrs_tbl()
@ 2021-05-12 13:39 Zhen Lei
2021-05-12 13:39 ` [PATCH v2 1/1] " Zhen Lei
0 siblings, 1 reply; 3+ messages in thread
From: Zhen Lei @ 2021-05-12 13:39 UTC (permalink / raw)
To: Peter Huewe, Jarkko Sakkinen, Jason Gunthorpe, James Bottomley,
linux-integrity
Cc: Zhen Lei
v1 --> v2:
Revised the description to make it clearer.
Zhen Lei (1):
tpm: fix error return code in tpm2_get_cc_attrs_tbl()
drivers/char/tpm/tpm2-cmd.c | 1 +
1 file changed, 1 insertion(+)
--
2.26.0.106.g9fadedd
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2 1/1] tpm: fix error return code in tpm2_get_cc_attrs_tbl()
2021-05-12 13:39 [PATCH v2 0/1] tpm: fix error return code in tpm2_get_cc_attrs_tbl() Zhen Lei
@ 2021-05-12 13:39 ` Zhen Lei
2021-05-12 19:16 ` Jarkko Sakkinen
0 siblings, 1 reply; 3+ messages in thread
From: Zhen Lei @ 2021-05-12 13:39 UTC (permalink / raw)
To: Peter Huewe, Jarkko Sakkinen, Jason Gunthorpe, James Bottomley,
linux-integrity
Cc: Zhen Lei
If the total number of commands queried through TPM2_CAP_COMMANDS is
different from that queried through TPM2_CC_GET_CAPABILITY, it indicates
an unknown error. In this case, an appropriate error code -EFAULT should
be returned. However, we currently do not explicitly assign this error
code to 'rc'. As a result, 0 was incorrectly returned.
Fixes: 58472f5cd4f6("tpm: validate TPM 2.0 commands")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
---
drivers/char/tpm/tpm2-cmd.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c
index eff1f12d981ab27..c84d239512197aa 100644
--- a/drivers/char/tpm/tpm2-cmd.c
+++ b/drivers/char/tpm/tpm2-cmd.c
@@ -656,6 +656,7 @@ int tpm2_get_cc_attrs_tbl(struct tpm_chip *chip)
if (nr_commands !=
be32_to_cpup((__be32 *)&buf.data[TPM_HEADER_SIZE + 5])) {
+ rc = -EFAULT;
tpm_buf_destroy(&buf);
goto out;
}
--
2.26.0.106.g9fadedd
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2 1/1] tpm: fix error return code in tpm2_get_cc_attrs_tbl()
2021-05-12 13:39 ` [PATCH v2 1/1] " Zhen Lei
@ 2021-05-12 19:16 ` Jarkko Sakkinen
0 siblings, 0 replies; 3+ messages in thread
From: Jarkko Sakkinen @ 2021-05-12 19:16 UTC (permalink / raw)
To: Zhen Lei; +Cc: Peter Huewe, Jason Gunthorpe, James Bottomley, linux-integrity
On Wed, May 12, 2021 at 09:39:26PM +0800, Zhen Lei wrote:
> If the total number of commands queried through TPM2_CAP_COMMANDS is
> different from that queried through TPM2_CC_GET_CAPABILITY, it indicates
> an unknown error. In this case, an appropriate error code -EFAULT should
> be returned. However, we currently do not explicitly assign this error
> code to 'rc'. As a result, 0 was incorrectly returned.
>
> Fixes: 58472f5cd4f6("tpm: validate TPM 2.0 commands")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
> ---
> drivers/char/tpm/tpm2-cmd.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c
> index eff1f12d981ab27..c84d239512197aa 100644
> --- a/drivers/char/tpm/tpm2-cmd.c
> +++ b/drivers/char/tpm/tpm2-cmd.c
> @@ -656,6 +656,7 @@ int tpm2_get_cc_attrs_tbl(struct tpm_chip *chip)
>
> if (nr_commands !=
> be32_to_cpup((__be32 *)&buf.data[TPM_HEADER_SIZE + 5])) {
> + rc = -EFAULT;
> tpm_buf_destroy(&buf);
> goto out;
> }
> --
> 2.26.0.106.g9fadedd
>
>
>
Thank you.
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
/Jarkko
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-12 21:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-12 13:39 [PATCH v2 0/1] tpm: fix error return code in tpm2_get_cc_attrs_tbl() Zhen Lei
2021-05-12 13:39 ` [PATCH v2 1/1] " Zhen Lei
2021-05-12 19:16 ` Jarkko Sakkinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).