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

Commit a0366884 authored by Christophe Ricard's avatar Christophe Ricard Committed by Sasha Levin
Browse files

tpm/tpm_i2c_stm_st33: Add status check when reading data on the FIFO 



[ Upstream commit c4eadfafb91d5501095c55ffadaa1168743f39d3 ]

Add a return value check when reading data from the FIFO register.

Cc: <stable@vger.kernel.org>
Reviewed-by: default avatarJason Gunthorpe <jason.gunthorpe@obsidianresearch.com>
Signed-off-by: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Reviewed-by: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 33c5b3ad

drivers/char/tpm/tpm_i2c_stm_st33.c

+6 −4
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout, 
 */

static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count)

{

	int size = 0, burstcnt, len;

	int size = 0, burstcnt, len, ret;

	struct i2c_client *client;



	client = (struct i2c_client *)TPM_VPRIV(chip);
@@ -406,13 +406,15 @@ static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count) 
	       wait_for_stat(chip,

			     TPM_STS_DATA_AVAIL | TPM_STS_VALID,

			     chip->vendor.timeout_c,

			     &chip->vendor.read_queue)

	       == 0) {

			     &chip->vendor.read_queue) == 0) {

		burstcnt = get_burstcount(chip);

		if (burstcnt < 0)

			return burstcnt;

		len = min_t(int, burstcnt, count - size);

		I2C_READ_DATA(client, TPM_DATA_FIFO, buf + size, len);

		ret = I2C_READ_DATA(client, TPM_DATA_FIFO, buf + size, len);

		if (ret < 0)

			return ret;



		size += len;

	}

	return size;