evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Cc: <stable@vger.kernel.org>
Reviewed-by: Jason Gunthorpe <jason.gunthorpe@obsidianresearch.com>
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Reviewed-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
This commit is contained in:
Christophe Ricard 2015-01-13 23:13:14 +01:00 • committed by Peter Huewe
parent aec04cbdf7
commit c4eadfafb9
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/char/tpm/tpm_i2c_stm_st33.c
View file

@ -441,7 +441,7 @@ again:
*/ */
static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count) 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 tpm_stm_dev *tpm_dev; struct tpm_stm_dev *tpm_dev;
tpm_dev = (struct tpm_stm_dev *)TPM_VPRIV(chip); tpm_dev = (struct tpm_stm_dev *)TPM_VPRIV(chip);
@ -455,7 +455,10 @@ static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count)
if (burstcnt < 0) if (burstcnt < 0)
return burstcnt; return burstcnt;
len = min_t(int, burstcnt, count - size); len = min_t(int, burstcnt, count - size);
I2C_READ_DATA(tpm_dev, TPM_DATA_FIFO, buf + size, len); ret = I2C_READ_DATA(tpm_dev, TPM_DATA_FIFO, buf + size, len);
if (ret < 0)
return ret;
size += len; size += len;
} }
return size; return size;