]> git.sur5r.net Git - u-boot/commitdiff
i2c: mv_i2c.c: Validate read length in I2C command
authorjinghua <jinghua@marvell.com>
Fri, 16 Sep 2016 13:07:54 +0000 (15:07 +0200)
committerHeiko Schocher <hs@denx.de>
Mon, 26 Sep 2016 08:42:56 +0000 (10:42 +0200)
The I2C bus will get stuck when reading 0 byte. So we add validation of
the read length in i2c_read(). This issue only occurs on read operation.

Signed-off-by: jinghua <jinghua@marvell.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Nadav Haklai <nadavh@marvell.com>
Cc: Kostya Porotchkin <kostap@marvell.com>
Cc: Wilson Ding <dingwei@marvell.com>
Cc: Victor Gu <xigu@marvell.com>
Cc: Hua Jing <jinghua@marvell.com>
Cc: Terry Zhou <bjzhou@marvell.com>
Cc: Hanna Hawa <hannah@marvell.com>
Cc: Haim Boot <hayim@marvell.com>
Cc: Heiko Schocher <hs@denx.de>
drivers/i2c/mv_i2c.c

index 291b2d7e68c7557c431e07596684577841e7fa1e..7f52fa2d858bf42fc5b6cd4d95030d9ff1193bbd 100644 (file)
@@ -243,6 +243,11 @@ static int __i2c_read(struct mv_i2c *base, uchar chip, u8 *addr, int alen,
        debug("i2c_read(chip=0x%02x, addr=0x%02x, alen=0x%02x, "
              "len=0x%02x)\n", chip, *addr, alen, len);
 
+       if (len == 0) {
+               printf("reading zero byte is invalid\n");
+               return -EINVAL;
+       }
+
        i2c_reset(base);
 
        /* dummy chip address write */