diff options
| author | Rodolfo Giometti <giometti@enneenne.com> | 2013-09-09 17:31:59 +0200 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2013-09-25 21:46:11 -0400 |
| commit | fbd986cd420d1deeabf1039ec4e74075a5639db5 (patch) | |
| tree | ab8b82ee748d62b563abeab4508ea3dcd806ae1f /drivers | |
| parent | c1fa3426aa5c782724c97394303d52228206eda4 (diff) | |
| download | blackbird-op-linux-fbd986cd420d1deeabf1039ec4e74075a5639db5.tar.gz blackbird-op-linux-fbd986cd420d1deeabf1039ec4e74075a5639db5.zip | |
mmc: atmel-mci: fix oops in atmci_tasklet_func
In some cases, a NULL pointer dereference happens because data is NULL when
STATE_END_REQUEST case is reached in atmci_tasklet_func.
Cc: <stable@vger.kernel.org> # 3.9+
Signed-off-by: Rodolfo Giometti <giometti@enneenne.com>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/atmel-mci.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index b8dfe0d8adbb..92c18779d47e 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -1810,12 +1810,14 @@ static void atmci_tasklet_func(unsigned long priv) if (unlikely(status)) { host->stop_transfer(host); host->data = NULL; - if (status & ATMCI_DTOE) { - data->error = -ETIMEDOUT; - } else if (status & ATMCI_DCRCE) { - data->error = -EILSEQ; - } else { - data->error = -EIO; + if (data) { + if (status & ATMCI_DTOE) { + data->error = -ETIMEDOUT; + } else if (status & ATMCI_DCRCE) { + data->error = -EILSEQ; + } else { + data->error = -EIO; + } } } |
