Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05caee93 authored by Rabin Vincent's avatar Rabin Vincent Committed by Ulf Hansson
Browse files

mmc: usdhi6rol0: handle NULL data in timeout 



Commit bb08a7d4 ("mmc: usdhi6rol0: fix NULL pointer deref in debug
print") fixed one NULL pointer dereference but unfortunately introduced
another.  "data" may be NULL if this is a command timeout for a command
without any data, so we should only use it if we're actually waiting for
data.

Fixes: bb08a7d4 ("mmc: usdhi6rol0: fix NULL pointer deref in debug print")
Cc: stable@vger.kernel.org # v4.3
Signed-off-by: default avatarRabin Vincent <rabin.vincent@axis.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 60b71f60

drivers/mmc/host/usdhi6rol0.c

+2 −1
Original line number Diff line number Diff line
@@ -1634,7 +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;

	struct scatterlist *sg;



	dev_warn(mmc_dev(host->mmc),

		 "%s timeout wait %u CMD%d: IRQ 0x%08x:0x%08x, last IRQ 0x%08x\n",
@@ -1666,6 +1666,7 @@ static void usdhi6_timeout_work(struct work_struct *work) 
	case USDHI6_WAIT_FOR_MWRITE:

	case USDHI6_WAIT_FOR_READ:

	case USDHI6_WAIT_FOR_WRITE:

		sg = host->sg ?: data->sg;

		dev_dbg(mmc_dev(host->mmc),

			"%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,