Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1699199
| Path | csiph.com!weretis.net!feeder4.news.weretis.net!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Brendan Higgins <brendanhiggins@google.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH v1] i2c: aspeed: fixed potential null pointer dereference |
| Date | Sat, 29 Jul 2017 03:10:02 +0200 |
| Message-ID | <u8oqu-3ee-11@gated-at.bofh.it> (permalink) |
| Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=neuYIs0x3YrOmCWjJ40ujFNTeMcMywch5prqiDbC8bU=; b=YTY30p9thHlwgb09h2PAkyvUe+QSsOI2EscQBtyZFSLjVCG7lPgEUOhfHr4fPipjKd axdcilUwwEMS9/Zn7nLlqkKrVdXir86LCNhRkLQnzt+NPO2hNoo+CIwN7Zlfwo4Boh/I wm060YlAW2iiZe2vY1SLYw7cdqauIRnLSpmN+xU/o2AweMv+XdWdza3WP5V3Spk8Yv6Y TXZAJvK/O0q98+bkW5Sk/yueXTf4fn8DBOG4WVhLjKtlphW0dQRO9LY2JrVcAJsBryTr PT91N0AaHtzchiHi5s4R1Mq7TxOiHnJYpGgA/p4fVfkWwj+XADjoEddDpZNYW5blqCdy 24Jw== |
| X-Google-Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=neuYIs0x3YrOmCWjJ40ujFNTeMcMywch5prqiDbC8bU=; b=eOkcy6FHKbhNJGU8kmBB3MyKjUi2ywqsXEQ73m8kHCu03u0Z47a8E/CQbJTWxH+LJj 8tS5XkO9+GJCpD+fv85zHnY71AAgFop3XZp8prt1ZU9xFMvBQ8U+yc14KZ/PHMZGgPpP Hw/f0DfKzNyxo003ZYebmvGcBnzl86NcYAdy2X3MRkwFgcVwHO4p0k11sc7TGI1rilra M8CvqRDtMLXLrhWHhmCF9QaumPMVHl3JzY/kKLlxletmAlv6BAn0RrsH4vS5LaVgCVql ImVmNKzshoAYuHasMmGYv2M4nxih+Ja00e3s/g7OIyMSeV4DrZNx7cFKrsj1IdTsJkiq t9ow== |
| X-Gm-Message-State | AIVw112v9zc3IawmWbN4jXFcdBSHMUq8dm7u4RHM4eErbvABnAs9yr7L aZUrnBnbfSqUTK6M |
| X-Received | by 10.99.126.86 with SMTP id o22mr8904722pgn.385.1501290023493; Fri, 28 Jul 2017 18:00:23 -0700 (PDT) |
| X-Mailer | git-send-email 2.14.0.rc0.400.g1c36432dff-goog |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 28 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | linux-i2c@vger.kernel.org, openbmc@lists.ozlabs.org, linux-kernel@vger.kernel.org, Brendan Higgins <brendanhiggins@google.com> |
| X-Original-Date | Fri, 28 Jul 2017 18:00:12 -0700 |
| X-Original-Message-ID | <20170729010012.5032-1-brendanhiggins@google.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1699199 |
Show key headers only | View raw
Before I skipped null checks when the master is in the STOP state; this
fixes that.
Signed-off-by: Brendan Higgins <brendanhiggins@google.com>
---
drivers/i2c/busses/i2c-aspeed.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-aspeed.c b/drivers/i2c/busses/i2c-aspeed.c
index f19348328a71..6fdf9231c23c 100644
--- a/drivers/i2c/busses/i2c-aspeed.c
+++ b/drivers/i2c/busses/i2c-aspeed.c
@@ -410,10 +410,11 @@ static bool aspeed_i2c_master_irq(struct aspeed_i2c_bus *bus)
}
/* We are in an invalid state; reset bus to a known state. */
- if (!bus->msgs && bus->master_state != ASPEED_I2C_MASTER_STOP) {
+ if (!bus->msgs) {
dev_err(bus->dev, "bus in unknown state");
bus->cmd_err = -EIO;
- aspeed_i2c_do_stop(bus);
+ if (bus->master_state != ASPEED_I2C_MASTER_STOP)
+ aspeed_i2c_do_stop(bus);
goto out_no_complete;
}
msg = &bus->msgs[bus->msgs_index];
--
2.14.0.rc0.400.g1c36432dff-goog
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
[PATCH v1] i2c: aspeed: fixed potential null pointer dereference Brendan Higgins <brendanhiggins@google.com> - 2017-07-29 03:10 +0200 Re: [PATCH v1] i2c: aspeed: fixed potential null pointer dereference Joel Stanley <joel@jms.id.au> - 2017-07-31 11:30 +0200
csiph-web