Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c775e8e authored by Matthew Garrett's avatar Matthew Garrett Committed by Greg Kroah-Hartman
Browse files

tpm: Don't make log failures fatal 



commit 805fa88e0780b7ce1cc9b649dd91a0a7164c6eb4 upstream.

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.

Signed-off-by: default avatarMatthew Garrett <matthewgarrett@google.com>
Cc: stable@vger.kernel.org # 4.19.x
Reviewed-by: default avatarJerry Snitselaar <jsnitsel@redhat.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9ffaeee7

drivers/char/tpm/eventlog/common.c

+4 −8
Original line number Diff line number Diff line
@@ -104,11 +104,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;
@@ -117,7 +114,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;
@@ -163,13 +160,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
Original line number Diff line number Diff line
@@ -463,9 +463,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
Original line number Diff line number Diff line
@@ -602,6 +602,6 @@ int tpm2_prepare_space(struct tpm_chip *chip, struct tpm_space *space, u32 cc, 
int tpm2_commit_space(struct tpm_chip *chip, struct tpm_space *space,

		      u32 cc, u8 *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);

#endif