aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorChris Ball <cjb@laptop.org>2011-04-27 17:35:31 -0400
committerChris Ball <cjb@laptop.org>2011-04-27 19:16:50 -0400
commit0c9c99a765321104cc5f9c97f949382a9ba4927e (patch)
treec2879b7fc0c81d680745a2a8592e0fdf1cf876ba /drivers/mmc
parentb7b4d3426d2b5ecab21578eb20d8e456a1aace8f (diff)
downloadkernel_samsung_aries-0c9c99a765321104cc5f9c97f949382a9ba4927e.zip
kernel_samsung_aries-0c9c99a765321104cc5f9c97f949382a9ba4927e.tar.gz
kernel_samsung_aries-0c9c99a765321104cc5f9c97f949382a9ba4927e.tar.bz2
mmc: sdhci: Check mrq != NULL in sdhci_tasklet_finish
It seems that under certain circumstances the sdhci_tasklet_finish() call can be entered with mrq set to NULL, causing the system to crash with a NULL pointer de-reference. Seen on S3C6410 system. Based on a patch by Dimitris Papastamos. Reported-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com> Cc: <stable@kernel.org> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index fd8f488..5d20661 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1334,6 +1334,13 @@ static void sdhci_tasklet_finish(unsigned long param)
host = (struct sdhci_host*)param;
+ /*
+ * If this tasklet gets rescheduled while running, it will
+ * be run again afterwards but without any active request.
+ */
+ if (!host->mrq)
+ return;
+
spin_lock_irqsave(&host->lock, flags);
del_timer(&host->timer);