From: Brendan Higgins <brendanhiggins@google.com>
Date: Sat, 29 Jul 2017 01:00:12 +0000 (-0700)
Subject: i2c: aspeed: fixed potential null pointer dereference
X-Git-Tag: v4.14-rc1~237^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1c0b7e448b9e66dd9a7343bab58a3d3a477e104;p=platform%2Fkernel%2Flinux-rpi.git

i2c: aspeed: fixed potential null pointer dereference

Before I skipped null checks when the master is in the STOP state; this
fixes that.

Signed-off-by: Brendan Higgins <brendanhiggins@google.com>
Acked-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Fixes: f327c686d3ba ("i2c: aspeed: added driver for Aspeed I2C")
---

diff --git a/drivers/i2c/busses/i2c-aspeed.c b/drivers/i2c/busses/i2c-aspeed.c
index f193483..6fdf923 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];