linux-kernel - Re: [PATCH] tpm_crb: Fix an error handling path in crb_acpi

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <CUZ1G69D6DVR.10SDRFENHCCAZ@suppilovahvero>
Date:   Tue, 22 Aug 2023 14:31:26 +0300
From:   "Jarkko Sakkinen" <jarkko@...nel.org>
To:     "Jarkko Sakkinen" <jarkko@...nel.org>,
        "Christophe JAILLET" <christophe.jaillet@...adoo.fr>,
        "Peter Huewe" <peterhuewe@....de>,
        "Jason Gunthorpe" <jgg@...pe.ca>,
        "Matthew Garrett" <mjg59@...f.ucam.org>
Cc:     <linux-kernel@...r.kernel.org>, <kernel-janitors@...r.kernel.org>,
        <linux-integrity@...r.kernel.org>
Subject: Re: [PATCH] tpm_crb: Fix an error handling path in crb_acpi_add()

rn Tue Aug 22, 2023 at 2:28 PM EEST, Jarkko Sakkinen wrote:
> On Sun Aug 20, 2023 at 9:21 AM EEST, Christophe JAILLET wrote:
> > Le 25/02/2023 à 11:58, Christophe JAILLET a écrit :
> > > Some error paths don't call acpi_put_table() before returning.
> > > Branch to the correct place instead of doing some direct return.
> > > 
> > > Fixes: 4d2732882703 ("tpm_crb: Add support for CRB devices based on Pluton")
> > > Signed-off-by: Christophe JAILLET <christophe.jaillet@...adoo.fr>
> > > ---
> > >   drivers/char/tpm/tpm_crb.c | 5 +++--
> > >   1 file changed, 3 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
> > > index 99698ee1a744..f7068bd8b3d0 100644
> > > --- a/drivers/char/tpm/tpm_crb.c
> > > +++ b/drivers/char/tpm/tpm_crb.c
> > > @@ -771,12 +771,13 @@ static int crb_acpi_add(struct acpi_device *device)
> > >   				FW_BUG "TPM2 ACPI table has wrong size %u for start method type %d\n",
> > >   				buf->header.length,
> > >   				ACPI_TPM2_COMMAND_BUFFER_WITH_PLUTON);
> > > -			return -EINVAL;
> > > +			rc = -EINVAL;
> > > +			goto out;
> > >   		}
> > >   		crb_pluton = ACPI_ADD_PTR(struct tpm2_crb_pluton, buf, sizeof(*buf));
> > >   		rc = crb_map_pluton(dev, priv, buf, crb_pluton);
> > >   		if (rc)
> > > -			return rc;
> > > +			goto out;
> > >   	}
> > >   
> > >   	priv->sm = sm;
> >
> > Hi,
> >
> > polite reminder.
> >
> > While re-looking at it, the 3rd parameter of crb_map_pluton() (i.e. buf) 
> > looks unused and could be removed if it makes sense to you.
>
> This AFAIK went to Linux v6.2 already.

Sorry I overlooked! There was bunch of patches with almost similar name,
so I must have overlooked also back then. Now it is applied.

Reviewed-by: Jarkko Sakkinen <jarkko@...nel.org>

BR, Jarkko