[PATCH 09/91] mmc: sdhci: Check mrq != NULL in sdhci_tasklet_finish

From: Willy Tarreau
Date: Sun Feb 05 2012 - 17:49:25 EST


2.6.27-longterm review patch. If anyone has any objections, please let us know.

------------------

commit 0c9c99a765321104cc5f9c97f949382a9ba4927e upstream.

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@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Chris Ball <cjb@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
drivers/mmc/host/sdhci.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)

Index: longterm-2.6.27/drivers/mmc/host/sdhci.c
===================================================================
--- longterm-2.6.27.orig/drivers/mmc/host/sdhci.c 2012-02-05 22:34:36.053916156 +0100
+++ longterm-2.6.27/drivers/mmc/host/sdhci.c 2012-02-05 22:34:36.192916064 +0100
@@ -1165,6 +1165,13 @@

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);


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/