From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20120205220949.791917535@pcw.home.local> Date: Sun, 05 Feb 2012 23:09:57 +0100 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ben Dooks , Mark Brown , Chris Ball , Greg KH Subject: [PATCH 08/91] mmc: sdhci: Check mrq->cmd in sdhci_tasklet_finish In-Reply-To: <0635750f5f06ed2ca212b91fcb5c4483@local> Sender: linux-kernel-owner@vger.kernel.org List-ID: 2.6.27-longterm review patch. If anyone has any objections, please let us know. ------------------ commit b7b4d3426d2b5ecab21578eb20d8e456a1aace8f upstream. 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 Signed-off-by: Mark Brown Signed-off-by: Chris Ball Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/host/sdhci.c | 2 +- 1 files changed, 1 insertions(+), 1 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:34.798915250 +0100 +++ longterm-2.6.27/drivers/mmc/host/sdhci.c 2012-02-05 22:34:36.053916156 +0100 @@ -1176,7 +1176,7 @@ * 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))) {