If the _probe() method fails, the 'ts' struct is freed, yet it is
still used as the drvdata passed to suspend/resume/remove methods.
Even though the input device does not get registerd, the driver's
suspend/resume methods still get called as it's a registered SPI
device. This patch adds sanity checks to these methods to ensure that
drvdata is valid before using it.
Problem discovered when using lockdep since the ts->lock taken in
suspend & resume methods was left pointing into free'd memory if
_probe() fails.
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
---
drivers/input/touchscreen/ads7846.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 532279c..1da2369 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -815,6 +815,9 @@ static int ads7846_suspend(struct spi_device *spi, pm_message_t message)
{
struct ads7846 *ts = dev_get_drvdata(&spi->dev);
+ if (WARN_ON_ONCE(!ts))
+ return 0;
+
spin_lock_irq(&ts->lock);
ts->is_suspended = 1;
@@ -833,6 +836,9 @@ static int ads7846_resume(struct spi_device *spi)
{
struct ads7846 *ts = dev_get_drvdata(&spi->dev);
+ if (WARN_ON_ONCE(!ts))
+ return 0;
+
if (device_may_wakeup(&ts->spi->dev))
disable_irq_wake(ts->spi->irq);
@@ -1231,6 +1237,7 @@ static int __devinit ads7846_probe(struct spi_device *spi)
input_free_device(input_dev);
kfree(packet);
kfree(ts);
+ dev_set_drvdata(&spi->dev, NULL);
return err;
}
@@ -1240,6 +1247,9 @@ static int __devexit ads7846_remove(struct spi_device *spi)
device_init_wakeup(&spi->dev, false);
+ if (WARN_ON_ONCE(!ts))
+ return 0;
+
ads784x_hwmon_unregister(spi, ts);
input_unregister_device(ts->input);
--
1.7.0.2
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
