* [PATCH] tpm_crb: Fix an error handling path in crb_acpi_add()
@ 2023-02-25 10:58 Christophe JAILLET
2023-08-20 6:21 ` Christophe JAILLET
0 siblings, 1 reply; 5+ messages in thread
From: Christophe JAILLET @ 2023-02-25 10:58 UTC (permalink / raw)
To: Peter Huewe, Jarkko Sakkinen, Jason Gunthorpe, Matthew Garrett
Cc: linux-kernel, kernel-janitors, Christophe JAILLET,
linux-integrity
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@wanadoo.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;
--
2.34.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] tpm_crb: Fix an error handling path in crb_acpi_add()
2023-02-25 10:58 [PATCH] tpm_crb: Fix an error handling path in crb_acpi_add() Christophe JAILLET
@ 2023-08-20 6:21 ` Christophe JAILLET
2023-08-20 6:25 ` Matthew Garrett
2023-08-22 11:28 ` Jarkko Sakkinen
0 siblings, 2 replies; 5+ messages in thread
From: Christophe JAILLET @ 2023-08-20 6:21 UTC (permalink / raw)
To: Peter Huewe, Jarkko Sakkinen, Jason Gunthorpe, Matthew Garrett
Cc: linux-kernel, kernel-janitors, linux-integrity
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@wanadoo.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.
CJ
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] tpm_crb: Fix an error handling path in crb_acpi_add()
2023-08-20 6:21 ` Christophe JAILLET
@ 2023-08-20 6:25 ` Matthew Garrett
2023-08-22 11:28 ` Jarkko Sakkinen
1 sibling, 0 replies; 5+ messages in thread
From: Matthew Garrett @ 2023-08-20 6:25 UTC (permalink / raw)
To: Christophe JAILLET
Cc: Peter Huewe, Jarkko Sakkinen, Jason Gunthorpe, linux-kernel,
kernel-janitors, linux-integrity
On Sun, Aug 20, 2023 at 08:21:47AM +0200, 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@wanadoo.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.
For the original patch:
ACKed-by: Matthew Garrett <mgarrett@aurora.tech>
I'm actually re-working the pluton mapping code because right now it's
impossible to use localities because the ACPI table is unhelpful and I
think that can be worked around.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] tpm_crb: Fix an error handling path in crb_acpi_add()
2023-08-20 6:21 ` Christophe JAILLET
2023-08-20 6:25 ` Matthew Garrett
@ 2023-08-22 11:28 ` Jarkko Sakkinen
2023-08-22 11:31 ` Jarkko Sakkinen
1 sibling, 1 reply; 5+ messages in thread
From: Jarkko Sakkinen @ 2023-08-22 11:28 UTC (permalink / raw)
To: Christophe JAILLET, Peter Huewe, Jason Gunthorpe, Matthew Garrett
Cc: linux-kernel, kernel-janitors, linux-integrity
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@wanadoo.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.
BR, Jarkko
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] tpm_crb: Fix an error handling path in crb_acpi_add()
2023-08-22 11:28 ` Jarkko Sakkinen
@ 2023-08-22 11:31 ` Jarkko Sakkinen
0 siblings, 0 replies; 5+ messages in thread
From: Jarkko Sakkinen @ 2023-08-22 11:31 UTC (permalink / raw)
To: Jarkko Sakkinen, Christophe JAILLET, Peter Huewe, Jason Gunthorpe,
Matthew Garrett
Cc: linux-kernel, kernel-janitors, linux-integrity
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@wanadoo.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@kernel.org>
BR, Jarkko
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-08-22 11:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-25 10:58 [PATCH] tpm_crb: Fix an error handling path in crb_acpi_add() Christophe JAILLET
2023-08-20 6:21 ` Christophe JAILLET
2023-08-20 6:25 ` Matthew Garrett
2023-08-22 11:28 ` Jarkko Sakkinen
2023-08-22 11:31 ` Jarkko Sakkinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox