public inbox for linux-mmc@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] MMC: SDHCI: Check mrq->cmd in sdhci_tasklet_finish
@ 2011-03-30 12:35 Dimitris Papastamos
  2011-03-30 12:35 ` [PATCH 2/2] MMC: SDHCI: Check mrq != NULL " Dimitris Papastamos
  0 siblings, 1 reply; 3+ messages in thread
From: Dimitris Papastamos @ 2011-03-30 12:35 UTC (permalink / raw)
  To: Chris Ball; +Cc: linux-mmc, Ben Dooks, Mark Brown

From: Ben Dooks <ben-linux@fluff.org>

It seems that under certain circumstances that the sdhci_tasklet_finish()
call can be entered with mrq->cmd set to NULL, causing the system to crash
with a NULL pointer de-reference.

Unable to handle kernel NULL pointer dereference at virtual address 00000000
PC is at sdhci_tasklet_finish+0x34/0xe8
LR is at sdhci_tasklet_finish+0x24/0xe8

Seen on S3C6410 system.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---
 drivers/mmc/host/sdhci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 79ebc39..e75d070 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1341,7 +1341,7 @@ static void sdhci_tasklet_finish(unsigned long param)
 	 * upon error conditions.
 	 */
 	if (!(host->flags & SDHCI_DEVICE_DEAD) &&
-		(mrq->cmd->error ||
+	    ((mrq->cmd && mrq->cmd->error) ||
 		 (mrq->data && (mrq->data->error ||
 		  (mrq->data->stop && mrq->data->stop->error))) ||
 		   (host->quirks & SDHCI_QUIRK_RESET_AFTER_REQUEST))) {
-- 
1.7.4.2


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH 2/2] MMC: SDHCI: Check mrq != NULL in sdhci_tasklet_finish
  2011-03-30 12:35 [PATCH 1/2] MMC: SDHCI: Check mrq->cmd in sdhci_tasklet_finish Dimitris Papastamos
@ 2011-03-30 12:35 ` Dimitris Papastamos
  0 siblings, 0 replies; 3+ messages in thread
From: Dimitris Papastamos @ 2011-03-30 12:35 UTC (permalink / raw)
  To: Chris Ball; +Cc: linux-mmc, Ben Dooks, Mark Brown

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.

Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
---
 drivers/mmc/host/sdhci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index e75d070..19f4ba6 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1341,7 +1341,7 @@ static void sdhci_tasklet_finish(unsigned long param)
 	 * upon error conditions.
 	 */
 	if (!(host->flags & SDHCI_DEVICE_DEAD) &&
-	    ((mrq->cmd && mrq->cmd->error) ||
+	    mrq && ((mrq->cmd && mrq->cmd->error) ||
 		 (mrq->data && (mrq->data->error ||
 		  (mrq->data->stop && mrq->data->stop->error))) ||
 		   (host->quirks & SDHCI_QUIRK_RESET_AFTER_REQUEST))) {
-- 
1.7.4.2


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH 2/2] MMC: SDHCI: Check mrq != NULL in sdhci_tasklet_finish
  2011-04-27 13:24 [PATCH 1/2] MMC: SDHCI: Check mrq->cmd " Mark Brown
@ 2011-04-27 13:24 ` Mark Brown
  0 siblings, 0 replies; 3+ messages in thread
From: Mark Brown @ 2011-04-27 13:24 UTC (permalink / raw)
  To: Chris Ball; +Cc: linux-mmc, Ben Dooks, Dimitris Papastamos, Mark Brown

From: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>

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.

Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 drivers/mmc/host/sdhci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 5553829..5c85352 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1384,7 +1384,7 @@ static void sdhci_tasklet_finish(unsigned long param)
 	 * upon error conditions.
 	 */
 	if (!(host->flags & SDHCI_DEVICE_DEAD) &&
-	    ((mrq->cmd && mrq->cmd->error) ||
+	    mrq && ((mrq->cmd && mrq->cmd->error) ||
 		 (mrq->data && (mrq->data->error ||
 		  (mrq->data->stop && mrq->data->stop->error))) ||
 		   (host->quirks & SDHCI_QUIRK_RESET_AFTER_REQUEST))) {
-- 
1.7.4.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-04-27 13:24 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-30 12:35 [PATCH 1/2] MMC: SDHCI: Check mrq->cmd in sdhci_tasklet_finish Dimitris Papastamos
2011-03-30 12:35 ` [PATCH 2/2] MMC: SDHCI: Check mrq != NULL " Dimitris Papastamos
  -- strict thread matches above, loose matches on Subject: below --
2011-04-27 13:24 [PATCH 1/2] MMC: SDHCI: Check mrq->cmd " Mark Brown
2011-04-27 13:24 ` [PATCH 2/2] MMC: SDHCI: Check mrq != NULL " Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox