diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-05-31 12:02:46 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-05-31 12:02:46 +0800 |
| commit | dc06d1ba220ca16ebbca598bb45242ec5e818cb2 (patch) | |
| tree | ef66bd14901ec3a07cf65842a3b63884a64be529 /drivers/char/tpm/tpm_crb.c | |
| parent | 018ed21cf3b7cb618c63294793d63b23ce4afe24 (diff) | |
| parent | a898540914d4136f29bc738ce593c1c501006f23 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-17.06-androidlsk-v4.1-17.05-androidlinux-linaro-lsk-v4.1-android
Diffstat (limited to 'drivers/char/tpm/tpm_crb.c')
| -rw-r--r-- | drivers/char/tpm/tpm_crb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c index b02d4b160403..66587c12ab43 100644 --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c @@ -117,8 +117,7 @@ static int crb_recv(struct tpm_chip *chip, u8 *buf, size_t count) memcpy_fromio(buf, priv->rsp, 6); expected = be32_to_cpup((__be32 *) &buf[2]); - - if (expected > count) + if (expected > count || expected < 6) return -EIO; memcpy_fromio(&buf[6], &priv->rsp[6], expected - 6); |