* [PATCH v2] i2c: i2c-mt65xx: fix NULL ptr dereference
@ 2019-09-30 15:28 Fabien Parent
2019-09-30 21:20 ` Cengiz Can
2019-10-02 8:43 ` Ulrich Hecht
0 siblings, 2 replies; 4+ messages in thread
From: Fabien Parent @ 2019-09-30 15:28 UTC (permalink / raw)
To: linux-i2c, linux-arm-kernel, linux-mediatek, linux-kernel
Cc: matthias.bgg, wsa, qii.wang, drinkcat, hsinyi, tglx, Fabien Parent
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 call to i2c_check_quirks which will check whether
the quirks pointer is set, and if so will check if the IP has the
NO_ZERO_LEN quirk.
Fixes: abf4923e97c3 ("i2c: mediatek: disable zero-length transfers for mt8183")
Signed-off-by: Fabien Parent <fparent@baylibre.com>
---
v2:
* use i2c_check_quirks to check the quirks
---
drivers/i2c/busses/i2c-mt65xx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c
index 29eae1bf4f86..2152ec5f535c 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 (i2c_check_quirks(adap, I2C_AQ_NO_ZERO_LEN))
return I2C_FUNC_I2C |
(I2C_FUNC_SMBUS_EMUL & ~I2C_FUNC_SMBUS_QUICK);
else
--
2.23.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] i2c: i2c-mt65xx: fix NULL ptr dereference
2019-09-30 15:28 [PATCH v2] i2c: i2c-mt65xx: fix NULL ptr dereference Fabien Parent
@ 2019-09-30 21:20 ` Cengiz Can
2019-09-30 23:26 ` Hsin-Yi Wang
2019-10-02 8:43 ` Ulrich Hecht
1 sibling, 1 reply; 4+ messages in thread
From: Cengiz Can @ 2019-09-30 21:20 UTC (permalink / raw)
To: Fabien Parent
Cc: linux-i2c, linux-arm-kernel, linux-mediatek, linux-kernel,
matthias.bgg, wsa, qii.wang, drinkcat, hsinyi, tglx,
linux-i2c-owner
On 2019-09-30 18:28, Fabien Parent wrote:
> Fixes: abf4923e97c3 ("i2c: mediatek: disable zero-length transfers for
> mt8183")
> Signed-off-by: Fabien Parent <fparent@baylibre.com>
Reviewed-by: Cengiz Can <cengiz@kernel.wtf>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] i2c: i2c-mt65xx: fix NULL ptr dereference
2019-09-30 21:20 ` Cengiz Can
@ 2019-09-30 23:26 ` Hsin-Yi Wang
0 siblings, 0 replies; 4+ messages in thread
From: Hsin-Yi Wang @ 2019-09-30 23:26 UTC (permalink / raw)
To: Cengiz Can
Cc: Fabien Parent, linux-i2c,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE,
linux-mediatek, lkml, Matthias Brugger, Wolfram Sang, Qii Wang,
Nicolas Boichat, Thomas Gleixner, linux-i2c-owner
On Mon, Sep 30, 2019 at 2:20 PM Cengiz Can <cengiz@kernel.wtf> wrote:
>
> On 2019-09-30 18:28, Fabien Parent wrote:
> > Fixes: abf4923e97c3 ("i2c: mediatek: disable zero-length transfers for
> > mt8183")
> > Signed-off-by: Fabien Parent <fparent@baylibre.com>
>
> Reviewed-by: Cengiz Can <cengiz@kernel.wtf>
Reviewed-by: Hsin-Yi Wang <hsinyi@chromium.org>
Thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] i2c: i2c-mt65xx: fix NULL ptr dereference
2019-09-30 15:28 [PATCH v2] i2c: i2c-mt65xx: fix NULL ptr dereference Fabien Parent
2019-09-30 21:20 ` Cengiz Can
@ 2019-10-02 8:43 ` Ulrich Hecht
1 sibling, 0 replies; 4+ messages in thread
From: Ulrich Hecht @ 2019-10-02 8:43 UTC (permalink / raw)
To: Fabien Parent, linux-i2c, linux-arm-kernel, linux-mediatek, linux-kernel
Cc: drinkcat, wsa, hsinyi, matthias.bgg, tglx, qii.wang
> On September 30, 2019 at 5:28 PM Fabien Parent <fparent@baylibre.com> wrote:
>
>
> 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 call to i2c_check_quirks which will check whether
> the quirks pointer is set, and if so will check if the IP has the
> NO_ZERO_LEN quirk.
>
> Fixes: abf4923e97c3 ("i2c: mediatek: disable zero-length transfers for mt8183")
> Signed-off-by: Fabien Parent <fparent@baylibre.com>
Thank you! Tested successfully on Acer R13 Chromebook (mt8173).
Tested-by: Ulrich Hecht <uli@fpond.eu>
CU
Uli
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-10-02 8:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-30 15:28 [PATCH v2] i2c: i2c-mt65xx: fix NULL ptr dereference Fabien Parent
2019-09-30 21:20 ` Cengiz Can
2019-09-30 23:26 ` Hsin-Yi Wang
2019-10-02 8:43 ` Ulrich Hecht
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).