| Message ID | 20190925203113.6972-1-fparent@baylibre.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | i2c: i2c-mt65xx: fix NULL ptr dereference | expand |
> - if (adap->quirks->flags & I2C_AQ_NO_ZERO_LEN) > + if (adap->quirks && adap->quirks->flags & I2C_AQ_NO_ZERO_LEN) Right. Please use i2c_check_quirks(). Otherwise thanks for the catch! @Mediatek-people: can we have a dedicated maintainer for this driver to better prevent stuff like this from happening again?
diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c index 29eae1bf4f86..ec00fc6af9ae 100644 --- a/drivers/i2c/busses/i2c-mt65xx.c +++ b/drivers/i2c/busses/i2c-mt65xx.c @@ -875,7 +875,7 @@ static irqreturn_t mtk_i2c_irq(int irqno, void *dev_id) static u32 mtk_i2c_functionality(struct i2c_adapter *adap) { - if (adap->quirks->flags & I2C_AQ_NO_ZERO_LEN) + if (adap->quirks && adap->quirks->flags & I2C_AQ_NO_ZERO_LEN) return I2C_FUNC_I2C | (I2C_FUNC_SMBUS_EMUL & ~I2C_FUNC_SMBUS_QUICK); else
Since commit abf4923e97c3 ("i2c: mediatek: disable zero-length transfers for mt8183"), there is a NULL pointer dereference for all the SoCs that don't have any quirk. mtk_i2c_functionality is not checking that the quirks pointer is not NULL before starting to use it. This commit add a check on the quirk pointer before dereferencing it. Fixes: abf4923e97c3 ("i2c: mediatek: disable zero-length transfers for mt8183") Signed-off-by: Fabien Parent <fparent@baylibre.com> --- drivers/i2c/busses/i2c-mt65xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)