| Message ID | 20200414114226.96691-1-tianjia.zhang@linux.alibaba.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tpm: fix wrong return value in tpm_pcr_extend | expand |
> -----Original Message----- > From: linux-integrity-owner@vger.kernel.org [mailto:linux-integrity- > owner@vger.kernel.org] On Behalf Of Tianjia Zhang > Sent: Tuesday, April 14, 2020 1:42 PM > To: peterhuewe@gmx.de; jarkko.sakkinen@linux.intel.com; jgg@ziepe.ca; > arnd@arndb.de; gregkh@linuxfoundation.org; zhang.jia@linux.alibaba.com > Cc: linux-integrity@vger.kernel.org; linux-kernel@vger.kernel.org; > tianjia.zhang@linux.alibaba.com > Subject: [PATCH] tpm: fix wrong return value in tpm_pcr_extend > > For the algorithm that does not match the bank, a positive > value EINVAL is returned here. I think this is a typo error. > It is necessary to return an error value. Yes, thanks. Reviewed-by: Roberto Sassu <roberto.sassu@huawei.com> Roberto HUAWEI TECHNOLOGIES Duesseldorf GmbH, HRB 56063 Managing Director: Li Peng, Li Jian, Shi Yanli > Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com> > --- > drivers/char/tpm/tpm-interface.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm- > interface.c > index a438b1206fcb..1621ce818705 100644 > --- a/drivers/char/tpm/tpm-interface.c > +++ b/drivers/char/tpm/tpm-interface.c > @@ -323,7 +323,7 @@ int tpm_pcr_extend(struct tpm_chip *chip, u32 > pcr_idx, > > for (i = 0; i < chip->nr_allocated_banks; i++) { > if (digests[i].alg_id != chip->allocated_banks[i].alg_id) { > - rc = EINVAL; > + rc = -EINVAL; > goto out; > } > } > -- > 2.17.1
On Tue, Apr 14, 2020 at 11:55:43AM +0000, Roberto Sassu wrote: > > -----Original Message----- > > From: linux-integrity-owner@vger.kernel.org [mailto:linux-integrity- > > owner@vger.kernel.org] On Behalf Of Tianjia Zhang > > Sent: Tuesday, April 14, 2020 1:42 PM > > To: peterhuewe@gmx.de; jarkko.sakkinen@linux.intel.com; jgg@ziepe.ca; > > arnd@arndb.de; gregkh@linuxfoundation.org; zhang.jia@linux.alibaba.com > > Cc: linux-integrity@vger.kernel.org; linux-kernel@vger.kernel.org; > > tianjia.zhang@linux.alibaba.com > > Subject: [PATCH] tpm: fix wrong return value in tpm_pcr_extend > > > > For the algorithm that does not match the bank, a positive > > value EINVAL is returned here. I think this is a typo error. > > It is necessary to return an error value. > > Yes, thanks. > > Reviewed-by: Roberto Sassu <roberto.sassu@huawei.com> Happen to have the commit ID at hand for fixes? Thanks. /Jarkko
On Tue Apr 14 20, Jarkko Sakkinen wrote: >On Tue, Apr 14, 2020 at 11:55:43AM +0000, Roberto Sassu wrote: >> > -----Original Message----- >> > From: linux-integrity-owner@vger.kernel.org [mailto:linux-integrity- >> > owner@vger.kernel.org] On Behalf Of Tianjia Zhang >> > Sent: Tuesday, April 14, 2020 1:42 PM >> > To: peterhuewe@gmx.de; jarkko.sakkinen@linux.intel.com; jgg@ziepe.ca; >> > arnd@arndb.de; gregkh@linuxfoundation.org; zhang.jia@linux.alibaba.com >> > Cc: linux-integrity@vger.kernel.org; linux-kernel@vger.kernel.org; >> > tianjia.zhang@linux.alibaba.com >> > Subject: [PATCH] tpm: fix wrong return value in tpm_pcr_extend >> > >> > For the algorithm that does not match the bank, a positive >> > value EINVAL is returned here. I think this is a typo error. >> > It is necessary to return an error value. >> >> Yes, thanks. >> >> Reviewed-by: Roberto Sassu <roberto.sassu@huawei.com> > >Happen to have the commit ID at hand for fixes? > >Thanks. > >/Jarkko > 9f75c8224631 ("KEYS: trusted: correctly initialize digests and fix locking issue")
On Tue Apr 14 20, Tianjia Zhang wrote: >For the algorithm that does not match the bank, a positive >value EINVAL is returned here. I think this is a typo error. >It is necessary to return an error value. > >Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com> Reviewed-by: Jerry Snitselaar <jsnitsel@redhat.com> >--- > drivers/char/tpm/tpm-interface.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c >index a438b1206fcb..1621ce818705 100644 >--- a/drivers/char/tpm/tpm-interface.c >+++ b/drivers/char/tpm/tpm-interface.c >@@ -323,7 +323,7 @@ int tpm_pcr_extend(struct tpm_chip *chip, u32 pcr_idx, > > for (i = 0; i < chip->nr_allocated_banks; i++) { > if (digests[i].alg_id != chip->allocated_banks[i].alg_id) { >- rc = EINVAL; >+ rc = -EINVAL; > goto out; > } > } >-- >2.17.1 >
On Tue, Apr 14, 2020 at 01:26:15PM -0700, Jerry Snitselaar wrote: > On Tue Apr 14 20, Jarkko Sakkinen wrote: > > On Tue, Apr 14, 2020 at 11:55:43AM +0000, Roberto Sassu wrote: > > > > -----Original Message----- > > > > From: linux-integrity-owner@vger.kernel.org [mailto:linux-integrity- > > > > owner@vger.kernel.org] On Behalf Of Tianjia Zhang > > > > Sent: Tuesday, April 14, 2020 1:42 PM > > > > To: peterhuewe@gmx.de; jarkko.sakkinen@linux.intel.com; jgg@ziepe.ca; > > > > arnd@arndb.de; gregkh@linuxfoundation.org; zhang.jia@linux.alibaba.com > > > > Cc: linux-integrity@vger.kernel.org; linux-kernel@vger.kernel.org; > > > > tianjia.zhang@linux.alibaba.com > > > > Subject: [PATCH] tpm: fix wrong return value in tpm_pcr_extend > > > > > > > > For the algorithm that does not match the bank, a positive > > > > value EINVAL is returned here. I think this is a typo error. > > > > It is necessary to return an error value. > > > > > > Yes, thanks. > > > > > > Reviewed-by: Roberto Sassu <roberto.sassu@huawei.com> > > > > Happen to have the commit ID at hand for fixes? > > > > Thanks. > > > > /Jarkko > > > > 9f75c8224631 ("KEYS: trusted: correctly initialize digests and fix locking issue") Thanks. Also added: Cc: stable@vger.kernel.org # 5.4.x /Jarkko
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index a438b1206fcb..1621ce818705 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -323,7 +323,7 @@ int tpm_pcr_extend(struct tpm_chip *chip, u32 pcr_idx, for (i = 0; i < chip->nr_allocated_banks; i++) { if (digests[i].alg_id != chip->allocated_banks[i].alg_id) { - rc = EINVAL; + rc = -EINVAL; goto out; } }
For the algorithm that does not match the bank, a positive value EINVAL is returned here. I think this is a typo error. It is necessary to return an error value. Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com> --- drivers/char/tpm/tpm-interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)