[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240918203559.192605-2-jarkko@kernel.org>
Date: Wed, 18 Sep 2024 23:35:45 +0300
From: Jarkko Sakkinen <jarkko@...nel.org>
To: linux-integrity@...r.kernel.org
Cc: James.Bottomley@...senPartnership.com,
roberto.sassu@...wei.com,
mapengyu@...il.com,
Jarkko Sakkinen <jarkko@...nel.org>,
stable@...r.kernel.org,
Mimi Zohar <zohar@...ux.ibm.com>,
David Howells <dhowells@...hat.com>,
Paul Moore <paul@...l-moore.com>,
James Morris <jmorris@...ei.org>,
"Serge E. Hallyn" <serge@...lyn.com>,
keyrings@...r.kernel.org,
linux-security-module@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH v4 1/5] tpm: Return on tpm2_create_null_primary() failure
tpm2_sessions_init() does not ignores the result of saving the null key.
Address this by printing either TPM or POSIX error code, and returning
-ENODEV back to the caller.
Cc: stable@...r.kernel.org # v6.10+
Fixes: d2add27cf2b8 ("tpm: Add NULL primary creation")
Signed-off-by: Jarkko Sakkinen <jarkko@...nel.org>
---
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 | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/char/tpm/tpm2-sessions.c b/drivers/char/tpm/tpm2-sessions.c
index d3521aadd43e..795f4c7c6adb 100644
--- a/drivers/char/tpm/tpm2-sessions.c
+++ b/drivers/char/tpm/tpm2-sessions.c
@@ -1338,7 +1338,13 @@ static int tpm2_create_null_primary(struct tpm_chip *chip)
tpm2_flush_context(chip, null_key);
}
- return rc;
+ if (rc < 0)
+ dev_err(&chip->dev, "saving the null key failed with error %d\n", rc);
+ else if (rc > 0)
+ dev_err(&chip->dev, "saving the null key failed with TPM error 0x%04X\n", rc);
+
+ /* Map all errors to -ENODEV: */
+ return rc ? -ENODEV : rc;
}
/**
@@ -1354,7 +1360,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);
+ return rc;
chip->auth = kmalloc(sizeof(*chip->auth), GFP_KERNEL);
if (!chip->auth)
--
2.46.0
Powered by blists - more mailing lists