Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+8
-4
+4
-2
drivers/char/tpm/st33zp24/st33zp24.c
+4
-2
drivers/char/tpm/st33zp24/st33zp24.c
···
328
328
329
329
for (i = 0; i < len - 1;) {
330
330
burstcnt = get_burstcount(chip);
331
-
if (burstcnt < 0)
332
-
return burstcnt;
331
+
if (burstcnt < 0) {
332
+
ret = burstcnt;
333
+
goto out_err;
334
+
}
333
335
size = min_t(int, len - i - 1, burstcnt);
334
336
ret = tpm_dev->ops->send(tpm_dev->phy_id, TPM_DATA_FIFO,
335
337
buf + i, size);
+4
-2
drivers/char/tpm/tpm_i2c_infineon.c
+4
-2
drivers/char/tpm/tpm_i2c_infineon.c
···
544
544
burstcnt = get_burstcount(chip);
545
545
546
546
/* burstcnt < 0 = TPM is busy */
547
-
if (burstcnt < 0)
548
-
return burstcnt;
547
+
if (burstcnt < 0) {
548
+
rc = burstcnt;
549
+
goto out_err;
550
+
}
549
551
550
552
if (burstcnt > (len - 1 - count))
551
553
burstcnt = len - 1 - count;