Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.
Fixes: 58472f5cd4f6("tpm: validate TPM 2.0 commands")
Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Zhen Lei <[email protected]>
---
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 eff1f12d981a..c84d23951219 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.25.1
On Sat, May 08, 2021 at 10:54:44AM +0800, Zhen Lei wrote:
> Fix to return a negative error code from the error handling
> case instead of 0, as done elsewhere in this function.
>
> Fixes: 58472f5cd4f6("tpm: validate TPM 2.0 commands")
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Zhen Lei <[email protected]>
In the commit message:
1. Instead of writing "a negative error code", write -EFAULT.
2. Some explanation of the choice.
> ---
> 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 eff1f12d981a..c84d23951219 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.25.1
>
>
>
Other than that looks good.
/Jarkko
On 2021/5/10 4:41, Jarkko Sakkinen wrote:
> On Sat, May 08, 2021 at 10:54:44AM +0800, Zhen Lei wrote:
>> Fix to return a negative error code from the error handling
>> case instead of 0, as done elsewhere in this function.
>>
>> Fixes: 58472f5cd4f6("tpm: validate TPM 2.0 commands")
>> Reported-by: Hulk Robot <[email protected]>
>> Signed-off-by: Zhen Lei <[email protected]>
>
> In the commit message:
>
> 1. Instead of writing "a negative error code", write -EFAULT.
OK, I will change it.
> 2. Some explanation of the choice.
Do you mean why I choice error code -EFAULT? There's a similar one above this branch.
if (nr_commands > 0xFFFFF) {
rc = -EFAULT;
goto out;
}
>
>> ---
>> 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 eff1f12d981a..c84d23951219 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.25.1
>>
>>
>>
>
> Other than that looks good.
>
> /Jarkko
>
> .
>
On Wed, May 12, 2021 at 09:12:26AM +0800, Leizhen (ThunderTown) wrote:
>
>
> On 2021/5/10 4:41, Jarkko Sakkinen wrote:
> > On Sat, May 08, 2021 at 10:54:44AM +0800, Zhen Lei wrote:
> >> Fix to return a negative error code from the error handling
> >> case instead of 0, as done elsewhere in this function.
> >>
> >> Fixes: 58472f5cd4f6("tpm: validate TPM 2.0 commands")
> >> Reported-by: Hulk Robot <[email protected]>
> >> Signed-off-by: Zhen Lei <[email protected]>
> >
> > In the commit message:
> >
> > 1. Instead of writing "a negative error code", write -EFAULT.
> OK, I will change it.
>
> > 2. Some explanation of the choice.
> Do you mean why I choice error code -EFAULT? There's a similar one above this branch.
>
> if (nr_commands > 0xFFFFF) {
> rc = -EFAULT;
> goto out;
> }
I mean that the commit message must rationalize whatever the commit does,
and choices made.
/Jarkko