diff options
| author | Zhen Lei <thunder.leizhen@huawei.com> | 2021-05-12 21:39:26 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-19 10:08:20 +0200 |
| commit | 0a60d4be38f0229225dfd448a0fd06ef0a917fd1 (patch) | |
| tree | e8daccb158bbd20e7ca740bf2681027e77521038 /drivers/char | |
| parent | b82e5721a17325739adef83a029340a63b53d4ad (diff) | |
| download | linux-stable-0a60d4be38f0229225dfd448a0fd06ef0a917fd1.tar.gz linux-stable-0a60d4be38f0229225dfd448a0fd06ef0a917fd1.tar.bz2 linux-stable-0a60d4be38f0229225dfd448a0fd06ef0a917fd1.zip | |
tpm: fix error return code in tpm2_get_cc_attrs_tbl()
commit 1df83992d977355177810c2b711afc30546c81ce upstream.
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.
Cc: stable@vger.kernel.org
Fixes: 58472f5cd4f6("tpm: validate TPM 2.0 commands")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/tpm/tpm2-cmd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c index 2f8026b71933..1385c2c0acbe 100644 --- a/drivers/char/tpm/tpm2-cmd.c +++ b/drivers/char/tpm/tpm2-cmd.c @@ -962,6 +962,7 @@ static 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; } |