linux-kernel - Re: [PATCH v6 1/5] tpm: Return on tpm2_create_null

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: <D501D1CY5SJ4.SUKXHV680B30@kernel.org>
Date: Sat, 19 Oct 2024 22:39:44 +0300
From: "Jarkko Sakkinen" <jarkko@...nel.org>
To: "Jarkko Sakkinen" <jarkko@...nel.org>, "Peter Huewe"
 <peterhuewe@....de>, "Jason Gunthorpe" <jgg@...pe.ca>, "James Bottomley"
 <James.Bottomley@...senPartnership.com>
Cc: "Stefan Berger" <stefanb@...ux.ibm.com>, <stable@...r.kernel.org>,
 <linux-integrity@...r.kernel.org>, <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v6 1/5] tpm: Return on tpm2_create_null_primary()
 failure

On Tue Oct 15, 2024 at 11:58 PM EEST, Jarkko Sakkinen wrote:
> tpm2_sessions_init() does not ignore the result of
> tpm2_create_null_primary(). Address this by returning -ENODEV to the
> caller. Given that upper layers cannot help healing the situation
> further, deal with the TPM error here by
>
> Cc: stable@...r.kernel.org # v6.10+
> Fixes: d2add27cf2b8 ("tpm: Add NULL primary creation")
> Signed-off-by: Jarkko Sakkinen <jarkko@...nel.org>
> ---
> v6:
> - Address:
>   https://lore.kernel.org/linux-integrity/69c893e7-6b87-4daa-80db-44d1120e80fe@linux.ibm.com/
>   as TPM RC is taken care of at the call site. Add also the missing
>   documentation for the return values.
> v5:
> - Do not print klog messages on error, as tpm2_save_context() already
>   takes care of this.
> v4:
> - Fixed up stable version.
> v3:
> - Handle TPM and POSIX error separately and return -ENODEV always back
>   to the caller.
> v2:
> - Refined the commit message.
> ---
>  drivers/char/tpm/tpm2-sessions.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/char/tpm/tpm2-sessions.c b/drivers/char/tpm/tpm2-sessions.c
> index 511c67061728..253639767c1e 100644
> --- a/drivers/char/tpm/tpm2-sessions.c
> +++ b/drivers/char/tpm/tpm2-sessions.c
> @@ -1347,6 +1347,11 @@ static int tpm2_create_null_primary(struct tpm_chip *chip)
>   *
>   * Derive and context save the null primary and allocate memory in the
>   * struct tpm_chip for the authorizations.
> + *
> + * Return:
> + * * 0		- OK
> + * * -errno	- A system error
> + * * TPM_RC	- A TPM error
>   */
>  int tpm2_sessions_init(struct tpm_chip *chip)
>  {
> @@ -1354,7 +1359,7 @@ int tpm2_sessions_init(struct tpm_chip *chip)
>  
>  	rc = tpm2_create_null_primary(chip);
>  	if (rc)
> -		dev_err(&chip->dev, "TPM: security failed (NULL seed derivation): %d\n", rc);

I can fixup this message back before sending PR.

> +		return rc;
>  
>  	chip->auth = kmalloc(sizeof(*chip->auth), GFP_KERNEL);
>  	if (!chip->auth)

I don't know what happened to the cover letter but this version is only
major tweaks to the previous version.

BR, Jarkko