|
 |
daca4a8 |
From patchwork Thu May 25 17:04:55 2017
|
|
|
daca4a8 |
Content-Type: text/plain; charset="utf-8"
|
|
|
daca4a8 |
MIME-Version: 1.0
|
|
|
daca4a8 |
Content-Transfer-Encoding: 7bit
|
|
|
daca4a8 |
Subject: [v2] mmc: bcm2835: fix potential null pointer dereferences
|
|
|
daca4a8 |
From: "Gustavo A. R. Silva" <garsilva@embeddedor.com>
|
|
|
daca4a8 |
X-Patchwork-Id: 9748761
|
|
|
daca4a8 |
Message-Id: <20170525170455.GA6904@embeddedgus>
|
|
|
daca4a8 |
To: Stefan Wahren <stefan.wahren@i2se.com>,
|
|
|
daca4a8 |
Ulf Hansson <ulf.hansson@linaro.org>,
|
|
|
daca4a8 |
Florian Fainelli <f.fainelli@gmail.com>,
|
|
|
daca4a8 |
Ray Jui <rjui@broadcom.com>, Scott Branden <sbranden@broadcom.com>,
|
|
|
daca4a8 |
bcm-kernel-feedback-list@broadcom.com, Eric Anholt <eric@anholt.net>
|
|
|
daca4a8 |
Cc: "Gustavo A. R. Silva" <garsilva@embeddedor.com>,
|
|
|
daca4a8 |
linux-mmc@vger.kernel.org, linux-rpi-kernel@lists.infradead.org,
|
|
|
daca4a8 |
linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
|
|
|
daca4a8 |
Date: Thu, 25 May 2017 12:04:55 -0500
|
|
|
daca4a8 |
|
|
|
daca4a8 |
Null check at line 1165: if (mrq->cmd), implies that mrq->cmd might
|
|
|
daca4a8 |
be NULL.
|
|
|
daca4a8 |
Add null checks before dereferencing pointer mrq->cmd in order to avoid
|
|
|
daca4a8 |
any potential NULL pointer dereference.
|
|
|
daca4a8 |
|
|
|
daca4a8 |
Addresses-Coverity-ID: 1408740
|
|
|
daca4a8 |
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
|
|
|
daca4a8 |
Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
|
|
|
daca4a8 |
---
|
|
|
daca4a8 |
Changes in v2:
|
|
|
daca4a8 |
Change subject to make it clear the patch is bcm2835 related.
|
|
|
daca4a8 |
|
|
|
daca4a8 |
drivers/mmc/host/bcm2835.c | 12 +++++++++---
|
|
|
daca4a8 |
1 file changed, 9 insertions(+), 3 deletions(-)
|
|
|
daca4a8 |
|
|
|
daca4a8 |
diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c
|
|
|
daca4a8 |
index 1f343a4..abba9a2 100644
|
|
|
daca4a8 |
--- a/drivers/mmc/host/bcm2835.c
|
|
|
daca4a8 |
+++ b/drivers/mmc/host/bcm2835.c
|
|
|
daca4a8 |
@@ -1172,7 +1172,10 @@ static void bcm2835_request(struct mmc_host *mmc, struct mmc_request *mrq)
|
|
|
daca4a8 |
if (mrq->data && !is_power_of_2(mrq->data->blksz)) {
|
|
|
daca4a8 |
dev_err(dev, "unsupported block size (%d bytes)\n",
|
|
|
daca4a8 |
mrq->data->blksz);
|
|
|
daca4a8 |
- mrq->cmd->error = -EINVAL;
|
|
|
daca4a8 |
+
|
|
|
daca4a8 |
+ if (mrq->cmd)
|
|
|
daca4a8 |
+ mrq->cmd->error = -EINVAL;
|
|
|
daca4a8 |
+
|
|
|
daca4a8 |
mmc_request_done(mmc, mrq);
|
|
|
daca4a8 |
return;
|
|
|
daca4a8 |
}
|
|
|
daca4a8 |
@@ -1194,7 +1197,10 @@ static void bcm2835_request(struct mmc_host *mmc, struct mmc_request *mrq)
|
|
|
daca4a8 |
readl(host->ioaddr + SDCMD) & SDCMD_CMD_MASK,
|
|
|
daca4a8 |
edm);
|
|
|
daca4a8 |
bcm2835_dumpregs(host);
|
|
|
daca4a8 |
- mrq->cmd->error = -EILSEQ;
|
|
|
daca4a8 |
+
|
|
|
daca4a8 |
+ if (mrq->cmd)
|
|
|
daca4a8 |
+ mrq->cmd->error = -EILSEQ;
|
|
|
daca4a8 |
+
|
|
|
daca4a8 |
bcm2835_finish_request(host);
|
|
|
daca4a8 |
mutex_unlock(&host->mutex);
|
|
|
daca4a8 |
return;
|
|
|
daca4a8 |
@@ -1207,7 +1213,7 @@ static void bcm2835_request(struct mmc_host *mmc, struct mmc_request *mrq)
|
|
|
daca4a8 |
if (!host->use_busy)
|
|
|
daca4a8 |
bcm2835_finish_command(host);
|
|
|
daca4a8 |
}
|
|
|
daca4a8 |
- } else if (bcm2835_send_command(host, mrq->cmd)) {
|
|
|
daca4a8 |
+ } else if (mrq->cmd && bcm2835_send_command(host, mrq->cmd)) {
|
|
|
daca4a8 |
if (host->data && host->dma_desc) {
|
|
|
daca4a8 |
/* DMA transfer starts now, PIO starts after irq */
|
|
|
daca4a8 |
bcm2835_start_dma(host);
|