From: Rabin Vincent <rabin.vincent@axis.com>
To: ulf.hansson@linaro.org
Cc: g.liakhovetski@gmx.de, linux-mmc@vger.kernel.org,
Rabin Vincent <rabinv@axis.com>
Subject: [PATCH 2/3] mmc: usdhi6rol0: fix NULL pointer deref in debug print
Date: Wed, 19 Aug 2015 15:41:35 +0200 [thread overview]
Message-ID: <1439991696-28488-2-git-send-email-rabin.vincent@axis.com> (raw)
In-Reply-To: <1439991696-28488-1-git-send-email-rabin.vincent@axis.com>
host->sg is only set when we're transferring multiple blocks. Check for
its availibility before dereferencing it in the timeout work debug
print.
Signed-off-by: Rabin Vincent <rabin.vincent@axis.com>
---
drivers/mmc/host/usdhi6rol0.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/usdhi6rol0.c b/drivers/mmc/host/usdhi6rol0.c
index 63d5d72..4188e84e 100644
--- a/drivers/mmc/host/usdhi6rol0.c
+++ b/drivers/mmc/host/usdhi6rol0.c
@@ -1634,6 +1634,7 @@ static void usdhi6_timeout_work(struct work_struct *work)
struct usdhi6_host *host = container_of(d, struct usdhi6_host, timeout_work);
struct mmc_request *mrq = host->mrq;
struct mmc_data *data = mrq ? mrq->data : NULL;
+ struct scatterlist *sg = host->sg ?: data->sg;
dev_warn(mmc_dev(host->mmc),
"%s timeout wait %u CMD%d: IRQ 0x%08x:0x%08x, last IRQ 0x%08x\n",
@@ -1669,7 +1670,7 @@ static void usdhi6_timeout_work(struct work_struct *work)
"%c: page #%u @ +0x%zx %ux%u in SG%u. Current SG %u bytes @ %u\n",
data->flags & MMC_DATA_READ ? 'R' : 'W', host->page_idx,
host->offset, data->blocks, data->blksz, data->sg_len,
- sg_dma_len(host->sg), host->sg->offset);
+ sg_dma_len(sg), sg->offset);
usdhi6_sg_unmap(host, true);
/*
* If USDHI6_WAIT_FOR_DATA_END times out, we have already unmapped
--
1.7.10.4
next prev parent reply other threads:[~2015-08-19 13:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-19 13:41 [PATCH 1/3] mmc: usdhi6rol0: handle probe deferral for regulator Rabin Vincent
2015-08-19 13:41 ` Rabin Vincent [this message]
2015-08-25 12:07 ` [PATCH 2/3] mmc: usdhi6rol0: fix NULL pointer deref in debug print Ulf Hansson
2015-08-19 13:41 ` [PATCH 3/3] mmc: usdhi6rol0: fix ack register write Rabin Vincent
2015-08-25 12:07 ` Ulf Hansson
2015-08-25 12:07 ` [PATCH 1/3] mmc: usdhi6rol0: handle probe deferral for regulator Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1439991696-28488-2-git-send-email-rabin.vincent@axis.com \
--to=rabin.vincent@axis.com \
--cc=g.liakhovetski@gmx.de \
--cc=linux-mmc@vger.kernel.org \
--cc=rabinv@axis.com \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox