All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefan Wahren <stefan.wahren@i2se.com>
To: Eric Anholt <eric@anholt.net>, Wolfram Sang <wsa@the-dreams.de>,
	Peter Robinson <pbrobinson@gmail.com>
Cc: "Martin Sperl" <kernel@martin.sperl.org>,
	"Noralf Trønnes" <noralf@tronnes.org>,
	"Catalin Marinas" <catalin.marinas@arm.com>,
	"Will Deacon" <will.deacon@arm.com>,
	"Rob Herring" <robh+dt@kernel.org>,
	"Frank Rowand" <frowand.list@gmail.com>,
	"Florian Fainelli" <f.fainelli@gmail.com>,
	linux-rpi-kernel@lists.infradead.org, devicetree@vger.kernel.org,
	linux-i2c@vger.kernel.org,
	"Stefan Wahren" <stefan.wahren@i2se.com>
Subject: [PATCH RFC 1/3] i2c: bcm2835: Avoid possible NULL ptr dereference
Date: Thu, 16 Feb 2017 21:20:45 +0000	[thread overview]
Message-ID: <1487280047-29608-2-git-send-email-stefan.wahren@i2se.com> (raw)
In-Reply-To: <1487280047-29608-1-git-send-email-stefan.wahren@i2se.com>

Since commit e2474541032d ("bcm2835: Fix hang for writing messages
larger than 16 bytes") the interrupt handler is prone to a possible
NULL pointer dereference. This could happen if an interrupt fires
before curr_msg is set by bcm2835_i2c_xfer_msg() and randomly occurs
on the RPi 3. Even this is an unexpected behavior the driver must
handle that with an error instead of a crash.

CC: Noralf Trønnes <noralf@tronnes.org>
CC: Martin Sperl <kernel@martin.sperl.org>
Reported-by: Peter Robinson <pbrobinson@gmail.com>
Fixes: e2474541032d ("bcm2835: Fix hang for writing messages larger than 16 bytes")
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
 drivers/i2c/busses/i2c-bcm2835.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
index c3436f6..10e39c8 100644
--- a/drivers/i2c/busses/i2c-bcm2835.c
+++ b/drivers/i2c/busses/i2c-bcm2835.c
@@ -195,7 +195,9 @@ static irqreturn_t bcm2835_i2c_isr(int this_irq, void *data)
 	}
 
 	if (val & BCM2835_I2C_S_DONE) {
-		if (i2c_dev->curr_msg->flags & I2C_M_RD) {
+		if (!i2c_dev->curr_msg) {
+			dev_err(i2c_dev->dev, "Got unexpected interrupt (from firmware?)\n");
+		} else if (i2c_dev->curr_msg->flags & I2C_M_RD) {
 			bcm2835_drain_rxfifo(i2c_dev);
 			val = bcm2835_i2c_readl(i2c_dev, BCM2835_I2C_S);
 		}
-- 
1.7.9.5

  reply	other threads:[~2017-02-16 21:20 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-16 21:20 [PATCH RFC 0/3] ARM64: bcm2837-rpi: Fix random crashes caused by i2c Stefan Wahren
2017-02-16 21:20 ` Stefan Wahren [this message]
     [not found]   ` <1487280047-29608-2-git-send-email-stefan.wahren-eS4NqCHxEME@public.gmane.org>
2017-02-18 18:34     ` [PATCH RFC 1/3] i2c: bcm2835: Avoid possible NULL ptr dereference Noralf Trønnes
     [not found]       ` <48907a31-eaa6-27e2-633f-d36de521e868-L59+Z2yzLopAfugRpC6u6w@public.gmane.org>
2017-02-20 19:40         ` Stefan Wahren
     [not found]           ` <1983281189.110224.1487619653742-7tX72C7vayboQLBSYMtkGA@public.gmane.org>
2017-02-20 21:22             ` Noralf Trønnes
     [not found]               ` <5b14ed6d-4db8-abf7-ceba-ef46534b6023-L59+Z2yzLopAfugRpC6u6w@public.gmane.org>
2017-02-21  8:58                 ` Stefan Wahren
     [not found]                   ` <31b96f29-e369-546a-6270-266daea71062-eS4NqCHxEME@public.gmane.org>
2017-02-21 11:54                     ` kernel-TqfNSX0MhmxHKSADF0wUEw
2017-02-21 15:07                 ` Michael Zoran
2017-02-21 15:37                   ` Stefan Wahren
2017-02-20 18:22   ` Wolfram Sang
2017-02-21 16:31     ` Stefan Wahren
2017-02-21 20:14       ` Wolfram Sang
2017-02-22  7:20         ` Greg Kroah-Hartman
2017-02-28 12:42           ` Stefan Wahren
     [not found]             ` <77c2af87-6f0e-4de0-18e9-0aa798f282d0-eS4NqCHxEME@public.gmane.org>
2017-02-28 12:47               ` Greg Kroah-Hartman
2017-02-16 21:20 ` [PATCH RFC 2/3] ARM64: bcm2837-rpi: remove link to bcm2835-rpi.dtsi Stefan Wahren
2017-02-16 21:20 ` [PATCH RFC 3/3] ARM64: bcm2837-rpi: Fix pwm and i2c pin control Stefan Wahren
2017-02-27 20:56   ` Eric Anholt
     [not found]     ` <87r32j8ial.fsf-omZaPlIz5HhaEpDpdNBo/KxOck334EZe@public.gmane.org>
2017-02-27 21:13       ` Stefan Wahren
2017-02-27 22:36         ` Eric Anholt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1487280047-29608-2-git-send-email-stefan.wahren@i2se.com \
    --to=stefan.wahren@i2se.com \
    --cc=catalin.marinas@arm.com \
    --cc=devicetree@vger.kernel.org \
    --cc=eric@anholt.net \
    --cc=f.fainelli@gmail.com \
    --cc=frowand.list@gmail.com \
    --cc=kernel@martin.sperl.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-rpi-kernel@lists.infradead.org \
    --cc=noralf@tronnes.org \
    --cc=pbrobinson@gmail.com \
    --cc=robh+dt@kernel.org \
    --cc=will.deacon@arm.com \
    --cc=wsa@the-dreams.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.