[media] ascot2e: Fix I2C message size check
authorSaso Slavicic <saso.linux@astim.si>
Wed, 13 Jul 2016 14:56:22 +0000 (11:56 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Wed, 13 Jul 2016 14:56:22 +0000 (11:56 -0300)
Tuning a card with Sony ASCOT2E produces the following error:

kernel: i2c i2c-9: wr reg=0006: len=11 is too big!

MAX_WRITE_REGSIZE is defined as 10, buf[MAX_WRITE_REGSIZE + 1] buffer is
used in ascot2e_write_regs().

The problem is that exactly 10 bytes are written in ascot2e_set_params():

/* Set BW_OFFSET (0x0F) value from parameter table */
data[9] = ascot2e_sett[tv_system].bw_offset;
ascot2e_write_regs(priv, 0x06, data, 10);

The test in write_regs is as follows:

if (len + 1 >= sizeof(buf))

10 + 1 = 11 and that would be exactly the size of buf. Since 10 bytes +
buf[0] = reg would seem to fit into buf[], this shouldn't be an error.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/dvb-frontends/ascot2e.c

index f770f6a2c987b00356e25d39d15bc7024c35c115..8cc8c4597b6a7bf6cf6790a3a146de7850902859 100644 (file)
@@ -132,7 +132,7 @@ static int ascot2e_write_regs(struct ascot2e_priv *priv,
                }
        };
 
                }
        };
 
-       if (len + 1 >= sizeof(buf)) {
+       if (len + 1 > sizeof(buf)) {
                dev_warn(&priv->i2c->dev,"wr reg=%04x: len=%d is too big!\n",
                         reg, len + 1);
                return -E2BIG;
                dev_warn(&priv->i2c->dev,"wr reg=%04x: len=%d is too big!\n",
                         reg, len + 1);
                return -E2BIG;
This page took 0.026114 seconds and 5 git commands to generate.