mmc: sdhci: Avoid a NULL pointer crash

pelwell · pelwell · commit a5804e571541 · 2025-03-31T11:35:14.000+01:00
Two days into running a reboot test over the weekend, the SDHCI driver
hit a NULL pointer in sdhci_needs_reset. It's not clear how that has
been added by the changes for a faster reboot, but guard against it
explicitly.

Signed-off-by: Phil Elwell &lt;phil@raspberrypi.com&gt;
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
@@ -1490,6 +1490,8 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host,
 
 static bool sdhci_needs_reset(struct sdhci_host *host, struct mmc_request *mrq)
 {
+	if (!mrq)
+		return false;
 	return (!(host->flags & SDHCI_DEVICE_DEAD) &&
 		((mrq->cmd && mrq->cmd->error) ||
 		 (mrq->sbc && mrq->sbc->error) ||

Original file line number	Diff line number	Diff line change
`@@ -1490,6 +1490,8 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host,`
`1490`	`1490`
`1491`	`1491`	`static bool sdhci_needs_reset(struct sdhci_host host, struct mmc_request mrq)`
`1492`	`1492`	`{`
	`1493`	`+ if (!mrq)`
	`1494`	`+ return false;`
`1493`	`1495`	`return (!(host->flags & SDHCI_DEVICE_DEAD) &&`
`1494`	`1496`	`((mrq->cmd && mrq->cmd->error) \|\|`
`1495`	`1497`	`(mrq->sbc && mrq->sbc->error) \|\|`