| Message ID | 1344953946-13005-1-git-send-email-shubhrajyoti@ti.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Aug 14, 2012 at 07:49:06PM +0530, Shubhrajyoti D wrote: > Prevent the NULL pointer access by moving the platform_set_drvdata function > after the access of the pdev. > > [ 654.961761] Unable to handle kernel NULL pointer dereference at virtual address 00000070 > [ 654.970611] pgd = df254000 > [ 654.973480] [00000070] *pgd=9f1da831, *pte=00000000, *ppte=00000000 > [ 654.980163] Internal error: Oops: 17 [#1] SMP ARM > [ 654.985076] Modules linked in: > [ 654.988281] CPU: 1 Not tainted (3.6.0-rc1-00031-ge547de1-dirty #339) > [ 654.995330] PC is at omap_i2c_runtime_resume+0x8/0x148 > [ 655.000732] LR is at omap_i2c_runtime_resume+0x8/0x148 > > Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> > --- > drivers/i2c/busses/i2c-omap.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c > index 3df6f92..49dbff1 100644 > --- a/drivers/i2c/busses/i2c-omap.c > +++ b/drivers/i2c/busses/i2c-omap.c > @@ -1217,8 +1217,6 @@ static int __devexit omap_i2c_remove(struct platform_device *pdev) > struct omap_i2c_dev *dev = platform_get_drvdata(pdev); > int ret; > > - platform_set_drvdata(pdev, NULL); > - > i2c_del_adapter(&dev->adapter); > ret = pm_runtime_get_sync(&pdev->dev); > if (IS_ERR_VALUE(ret)) > @@ -1227,6 +1225,8 @@ static int __devexit omap_i2c_remove(struct platform_device *pdev) > omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0); > pm_runtime_put(&pdev->dev); > pm_runtime_disable(&pdev->dev); > + platform_set_drvdata(pdev, NULL); in fact this platform_set_drvdata(pdev, NULL) can be removed. The platform_device object will be destroyed anyway.
On Tue, Aug 14, 2012 at 19:48:56, Datta, Shubhrajyoti wrote: > From: Felipe Balbi <balbi@ti.com> > > otherwise we could get our IRQ line disabled due > to many spurious IRQs. Patch description should be readable by itself. It is not a continuation of subject line. > > Signed-off-by: Felipe Balbi <balbi@ti.com> > Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> > --- > drivers/i2c/busses/i2c-omap.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c > index 80ebcf5..eb6898b 100644 > --- a/drivers/i2c/busses/i2c-omap.c > +++ b/drivers/i2c/busses/i2c-omap.c > @@ -962,7 +962,7 @@ complete: > } > } while (stat); > > - return count ? IRQ_HANDLED : IRQ_NONE; > + return IRQ_HANDLED; > } > > static const struct i2c_algorithm omap_i2c_algo = { > -- > 1.7.5.4 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > Regards, Gururaja
Changes since v1: - removed tabification on patch 6/17 - removed dev_err() which was introduced on patch 09/17 Changes since v2: - do not set full fifo depth in the RDR interrupt. - some changelog updates. - rebase to the Wolfram's tree. Changes since v3: - Remove a redundant read of status register - Read the dev->buf_len variable instead of the register as the information of the remaining bytes is there. Changes since v4: - Ack the arbitration lost. - Rebase to the i2c-embedded/for-next branch. Changes since v5: - Rebase to latest mainline - Added some more cleanup patches so as have a consolidated series. Tested on omap4sdp and 3430sdp. Functional testing. Also did suspend resume test. Previous disscurssion http://www.spinics.net/lists/linux-i2c/msg09304.html The following changes since commit 3bf671af14d591ede9251acb0085e8017f3705e7: Merge branch 'fixes-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds (2012-08-13 09:59:04 +0300) are available in the git repository at: git://gitorious.org/linus-tree/linus-tree.git for_3.6/i2c/big_cleanup Felipe Balbi (22): i2c: omap: switch to devm_* API i2c: omap: simplify num_bytes handling i2c: omap: decrease indentation level on data handling i2c: omap: add blank lines i2c: omap: simplify omap_i2c_ack_stat() i2c: omap: split out [XR]DR and [XR]RDY i2c: omap: improve i462 errata handling i2c: omap: re-factor receive/transmit data loop i2c: omap: switch over to do {} while loop i2c: omap: ack IRQ in parts i2c: omap: switch to platform_get_irq() i2c: omap: bus: add a receiver flag i2c: omap: simplify errata check i2c: omap: always return IRQ_HANDLED i2c: omap: simplify IRQ exit path i2c: omap: resize fifos before each message i2c: omap: get rid of the "complete" label i2c: omap: always return IRQ_HANDLED i2c: omap: switch to threaded IRQ support i2c: omap: remove unnecessary pm_runtime_suspended check i2c: omap: switch over to autosuspend API i2c: omap: sanitize exit path Shubhrajyoti D (2): i2c: omap: remove redundant status read i2c: omap: Prevent NULL pointer dereference in remove drivers/i2c/busses/i2c-omap.c | 446 +++++++++++++++++++++++++---------------- 1 files changed, 273 insertions(+), 173 deletions(-)