Merge tag 'v2021.01-rc5' into next

[J-u-boot.git] / drivers / tpm / tpm_tis_st33zp24_i2c.c

diff --git a/drivers/tpm/tpm_tis_st33zp24_i2c.c b/drivers/tpm/tpm_tis_st33zp24_i2c.c
index c8d01254d2236ab1d4f8e277f6376c11714cb85b..e0eeabb93371e0591f47ee4e8b63da14453a699a 100644 (file)
--- a/drivers/tpm/tpm_tis_st33zp24_i2c.c
+++ b/drivers/tpm/tpm_tis_st33zp24_i2c.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * STMicroelectronics TPM ST33ZP24 I2C UBOOT driver
  *
@@ -9,16 +10,16 @@
  * This device driver implements the TPM interface as defined in
  * the TCG TPM Interface Spec version 1.21, revision 1.0 and the
  * STMicroelectronics Protocol Stack Specification version 1.2.0.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <i2c.h>
-#include <tpm.h>
+#include <log.h>
+#include <tpm-v1.h>
 #include <errno.h>
+#include <linux/delay.h>
 #include <linux/types.h>
 #include <asm/unaligned.h>
 
@@ -303,7 +304,8 @@ static int st33zp24_i2c_recv_data(struct udevice *dev, u8 *buf, size_t count)
 static int st33zp24_i2c_recv(struct udevice *dev, u8 *buf, size_t count)
 {
        struct tpm_chip *chip = dev_get_priv(dev);
-       int size, expected;
+       int size;
+       unsigned int expected;
 
        if (!chip)
                return -ENODEV;
@@ -320,7 +322,7 @@ static int st33zp24_i2c_recv(struct udevice *dev, u8 *buf, size_t count)
        }
 
        expected = get_unaligned_be32(buf + 2);
-       if (expected > count) {
+       if (expected > count || expected < TPM_HEADER_SIZE) {
                size = -EIO;
                goto out;
        }
@@ -540,5 +542,5 @@ U_BOOT_DRIVER(st33zp24_i2c) = {
        .probe  = st33zp24_i2c_probe,
        .remove = st33zp24_i2c_remove,
        .ops = &st33zp24_i2c_tpm_ops,
-       .priv_auto_alloc_size = sizeof(struct tpm_chip),
+       .priv_auto      = sizeof(struct tpm_chip),
 };