| Message ID | 20241028055007.1708971-2-jarkko@kernel.org (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | Lazy flush for the auth session | expand |
On 10/28/24 1:49 AM, Jarkko Sakkinen wrote: > Do not continue tpm2_sessions_init() further if the null key pair creation > fails. > > Cc: stable@vger.kernel.org # v6.10+ > Fixes: d2add27cf2b8 ("tpm: Add NULL primary creation") > Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org> Reviewed-by: Stefan Berger <stefanb@linux.ibm.com> > --- > v8: > - Refine commit message. > v7: > - Add the error message back but fix it up a bit: > 1. Remove 'TPM:' given dev_err(). > 2. s/NULL/null/ as this has nothing to do with the macro in libc. > 3. Fix the reasoning: null key creation failed > 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 | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/drivers/char/tpm/tpm2-sessions.c b/drivers/char/tpm/tpm2-sessions.c > index d3521aadd43e..a0306126e86c 100644 > --- a/drivers/char/tpm/tpm2-sessions.c > +++ b/drivers/char/tpm/tpm2-sessions.c > @@ -1347,14 +1347,21 @@ 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) > { > int rc; > > rc = tpm2_create_null_primary(chip); > - if (rc) > - dev_err(&chip->dev, "TPM: security failed (NULL seed derivation): %d\n", rc); > + if (rc) { > + dev_err(&chip->dev, "null key creation failed with %d\n", rc); > + return rc; > + } > > chip->auth = kmalloc(sizeof(*chip->auth), GFP_KERNEL); > if (!chip->auth)
On Mon Oct 28, 2024 at 3:00 PM EET, Stefan Berger wrote: > > > On 10/28/24 1:49 AM, Jarkko Sakkinen wrote: > > Do not continue tpm2_sessions_init() further if the null key pair creation > > fails. > > > > Cc: stable@vger.kernel.org # v6.10+ > > Fixes: d2add27cf2b8 ("tpm: Add NULL primary creation") > > Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org> > > Reviewed-by: Stefan Berger <stefanb@linux.ibm.com> Thanks, patch are applied to https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git/log/?h=next I will amend these with any further changes (such as tags). BR, Jarkko
diff --git a/drivers/char/tpm/tpm2-sessions.c b/drivers/char/tpm/tpm2-sessions.c index d3521aadd43e..a0306126e86c 100644 --- a/drivers/char/tpm/tpm2-sessions.c +++ b/drivers/char/tpm/tpm2-sessions.c @@ -1347,14 +1347,21 @@ 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) { int rc; rc = tpm2_create_null_primary(chip); - if (rc) - dev_err(&chip->dev, "TPM: security failed (NULL seed derivation): %d\n", rc); + if (rc) { + dev_err(&chip->dev, "null key creation failed with %d\n", rc); + return rc; + } chip->auth = kmalloc(sizeof(*chip->auth), GFP_KERNEL); if (!chip->auth)
Do not continue tpm2_sessions_init() further if the null key pair creation fails. Cc: stable@vger.kernel.org # v6.10+ Fixes: d2add27cf2b8 ("tpm: Add NULL primary creation") Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org> --- v8: - Refine commit message. v7: - Add the error message back but fix it up a bit: 1. Remove 'TPM:' given dev_err(). 2. s/NULL/null/ as this has nothing to do with the macro in libc. 3. Fix the reasoning: null key creation failed 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 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)