Commit e630af7d authored by Jarkko Sakkinen's avatar Jarkko Sakkinen
Browse files

tpm, tpm_tis: Extend locality handling to TPM2 in tpm_tis_gen_interrupt() 

The earlier fix (linked) only partially fixed the locality handling bug
in tpm_tis_gen_interrupt(), i.e. only for TPM 1.x.

Extend the locality handling to cover TPM2.

Cc: Hans de Goede <hdegoede@redhat.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/linux-integrity/20210220125534.20707-1-jarkko@kernel.org/


Fixes: a3fbfae8 ("tpm: take TPM chip power gating out of tpm_transmit()")
Reported-by: default avatarLino Sanfilippo <LinoSanfilippo@gmx.de>
Signed-off-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Tested-by: default avatarLino Sanfilippo <LinoSanfilippo@gmx.de>
parent b3ad7855

drivers/char/tpm/tpm_tis_core.c

+4 −6
Original line number Diff line number Diff line
@@ -709,15 +709,13 @@ static int tpm_tis_gen_interrupt(struct tpm_chip *chip) 
	cap_t cap;

	int ret;



	/* TPM 2.0 */

	if (chip->flags & TPM_CHIP_FLAG_TPM2)

		return tpm2_get_tpm_pt(chip, 0x100, &cap2, desc);



	/* TPM 1.2 */

	ret = request_locality(chip, 0);

	if (ret < 0)

		return ret;



	if (chip->flags & TPM_CHIP_FLAG_TPM2)

		ret = tpm2_get_tpm_pt(chip, 0x100, &cap2, desc);

	else

		ret = tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, desc, 0);



	release_locality(chip, 0);