lkml.org 
[lkml]   [2023]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH] tpm_crb: Fix an error handling path in crb_acpi_add()
From
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

\
 
 \ /
  Last update: 2023-08-20 08:32    [W:0.062 / U:0.728 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site