Skip to contentSkip to conversation

tpm: Don't make log failures fatal

PATCH In review Matthew Garrett 4 participants 7 messages Jan 2, 2020 – Feb 25, 2020 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 tpm: Don't make log failures fatal

If a TPM is in disabled state, it's reasonable for it to have an empty log. Bailing out of probe in this case means that the PPI interface isn't available, so there's no way to then enable the TPM from the OS. In general it seems reasonable to ignore log errors - they shouldn't interfere with any other TPM functionality.

---

V2: make tpm_bios_log_setup() void, since we're not using the return code now. Fix typo in patch description.

 drivers/char/tpm/eventlog/common.c | 12 ++++--------
 drivers/char/tpm/tpm-chip.c        |  4 +---
 drivers/char/tpm/tpm.h             |  2 +-
 3 files changed, 6 insertions(+), 12 deletions(-)
drivers/char/tpm/eventlog/common.c +4 -8
index 7a0fca659b6a6..7460f230bae4c 100644
@@ -99,11 +99,8 @@ static int tpm_read_log(struct tpm_chip *chip)
  *
  * If an event log is found then the securityfs files are setup to
  * export it to userspace, otherwise nothing is done.
- *
- * Returns -ENODEV if the firmware has no event log or securityfs is not
- * supported.
  */
-int tpm_bios_log_setup(struct tpm_chip *chip)
+void tpm_bios_log_setup(struct tpm_chip *chip)
 {
 	const char *name = dev_name(&chip->dev);
 	unsigned int cnt;
@@ -112,7 +109,7 @@ int tpm_bios_log_setup(struct tpm_chip *chip)
 
 	rc = tpm_read_log(chip);
 	if (rc < 0)
-		return rc;
+		return;
 	log_version = rc;
 
 	cnt = 0;
@@ -158,13 +155,12 @@ int tpm_bios_log_setup(struct tpm_chip *chip)
 		cnt++;
 	}
 
-	return 0;
+	return;
 
 err:
-	rc = PTR_ERR(chip->bios_dir[cnt]);
 	chip->bios_dir[cnt] = NULL;
 	tpm_bios_log_teardown(chip);
-	return rc;
+	return;
 }
 
 void tpm_bios_log_teardown(struct tpm_chip *chip)
drivers/char/tpm/tpm-chip.c +1 -3
index 3d6d394a86618..58073836b5555 100644
@@ -596,9 +596,7 @@ int tpm_chip_register(struct tpm_chip *chip)
 
 	tpm_sysfs_add_device(chip);
 
-	rc = tpm_bios_log_setup(chip);
-	if (rc != 0 && rc != -ENODEV)
-		return rc;
+	tpm_bios_log_setup(chip);
 
 	tpm_add_ppi(chip);
 
drivers/char/tpm/tpm.h +1 -1
index b9e1547be6b51..1df2cf40ab794 100644
@@ -236,7 +236,7 @@ int tpm2_prepare_space(struct tpm_chip *chip, struct tpm_space *space, u8 *cmd,
 int tpm2_commit_space(struct tpm_chip *chip, struct tpm_space *space, void *buf,
 		      size_t *bufsiz);
 
-int tpm_bios_log_setup(struct tpm_chip *chip);
+void tpm_bios_log_setup(struct tpm_chip *chip);
 void tpm_bios_log_teardown(struct tpm_chip *chip);
 int tpm_dev_common_init(void);
 void tpm_dev_common_exit(void);
Signature · 1 line
2.24.1.735.g03f4e72817-goog
Reviewed-by on v2 1/1
#1 lore raw
Quoted 9 lines · Matthew Garrett

If a TPM is in disabled state, it's reasonable for it to have an empty log. Bailing out of probe in this case means that the PPI interface isn't available, so there's no way to then enable the TPM from the OS. In general it seems reasonable to ignore log errors - they shouldn't interfere with any other TPM functionality.

---

Reviewed-by on v2 1/1
#2 lore raw
In reply to Matthew Garrett
Quoted 8 lines · Matthew Garrett

If a TPM is in disabled state, it's reasonable for it to have an empty log. Bailing out of probe in this case means that the PPI interface isn't available, so there's no way to then enable the TPM from the OS. In general it seems reasonable to ignore log errors - they shouldn't interfere with any other TPM functionality.

/Jarkko

#3 lore raw
Quoted 8 lines · Jarkko Sakkinen
Quoted 6 lines · Matthew Garrett

If a TPM is in disabled state, it's reasonable for it to have an empty log. Bailing out of probe in this case means that the PPI interface isn't available, so there's no way to then enable the TPM from the OS. In general it seems reasonable to ignore log errors - they shouldn't interfere with any other TPM functionality.

Quoted 4 lines
Quoted 2 lines

Hi Jarkko,

Is this queued anywhere? Thanks!

#4 lore raw
Quoted 10 lines · Matthew Garrett
Quoted 8 lines · Jarkko Sakkinen
Quoted 6 lines · Matthew Garrett

If a TPM is in disabled state, it's reasonable for it to have an empty log. Bailing out of probe in this case means that the PPI interface isn't available, so there's no way to then enable the TPM from the OS. In general it seems reasonable to ignore log errors - they shouldn't interfere with any other TPM functionality.

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

Hi Jarkko,

Is this queued anywhere? Thanks!

Thanks for reminding. Now is:

git://git.infradead.org/users/jjs/linux-tpmdd.git

/Jarkko

A message that is not in the archive (sent off-list or not yet received): [email protected]

#6 lore raw
Quoted 3 lines · Sasha Levin

The bot has tested the following trees: v5.4.7, v5.3.18, v4.19.92, v4.14.161, v4.9.207, v4.4.207. v4.14.161: Failed to apply! Possible dependencies:

…

Quoted 1 line

v4.9.207: Failed to apply! Possible dependencies:

…

Quoted 1 line

v4.4.207: Failed to apply! Possible dependencies:

…

Quoted 1 line

How should we proceed with this patch?

Ignoring these kernels should be fine.

#7 lore raw
Quoted 4 lines · Matthew Garrett
Quoted 3 lines · Sasha Levin

The bot has tested the following trees: v5.4.7, v5.3.18, v4.19.92, v4.14.161, v4.9.207, v4.4.207. v4.14.161: Failed to apply! Possible dependencies:

Quoted 8 lines

…

Quoted 1 line

v4.9.207: Failed to apply! Possible dependencies:

…

Quoted 1 line

v4.4.207: Failed to apply! Possible dependencies:

…

Quoted 1 line

How should we proceed with this patch?

Ignoring these kernels should be fine.

Please, (sanity) check:

git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

Modified the commit message:

Cc [email protected] # 4.19.x

/Jarkko