superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hi, 

Here are TPM driver updates for Linux v7.0.
 
 BR, Jarkko
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYKAB0WIQRE6pSOnaBC00OEHEIaerohdGur0gUCaYFFIQAKCRAaerohdGur
 0nlGAQCCquTrPQPGeng2eZQHDnkfwF0z11kfULUOqxaB14KGPQEA+cdPkSWxxH1j
 eKKz6MIBUjRA2eowcL3IQ2Cbc9qf2wA=
 =/lTh
 -----END PGP SIGNATURE-----

Merge tag 'tpmdd-next-7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd

Pull tpm updates from Jarkko Sakkinen.

* tag 'tpmdd-next-7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  tpm: st33zp24: Fix missing cleanup on get_burstcount() error
  tpm: tpm_i2c_infineon: Fix locality leak on get_burstcount() failure
master
Linus Torvalds 2026-02-09 10:11:28 -08:00
parent 2f81bdbdb3 3e91b44c93
commit 37b4fbf8db
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/char/tpm/st33zp24/st33zp24.c
View File

@ -328,8 +328,10 @@ static int st33zp24_send(struct tpm_chip *chip, unsigned char *buf,
for (i = 0; i < len - 1;) {
burstcnt = get_burstcount(chip);
if (burstcnt < 0)
return burstcnt;
if (burstcnt < 0) {
ret = burstcnt;
goto out_err;
}
size = min_t(int, len - i - 1, burstcnt);
ret = tpm_dev->ops->send(tpm_dev->phy_id, TPM_DATA_FIFO,
buf + i, size);

6
drivers/char/tpm/tpm_i2c_infineon.c
View File

@ -544,8 +544,10 @@ static int tpm_tis_i2c_send(struct tpm_chip *chip, u8 *buf, size_t bufsiz,
burstcnt = get_burstcount(chip);
/* burstcnt < 0 = TPM is busy */
if (burstcnt < 0)
return burstcnt;
if (burstcnt < 0) {
rc = burstcnt;
goto out_err;
}
if (burstcnt > (len - 1 - count))
burstcnt = len - 1 - count;