From 3148a3c2d32e3a0d58914d1a219e7fd2f0cb001e Mon Sep 17 00:00:00 2001 From: "Matwey V. Kornilov" Date: Thu, 1 Aug 2019 18:00:05 +0300 Subject: [PATCH] mmc: zynq_sdhci: fix uninitialized pointer deref on probe Since commit 3d296365e4e8 ("mmc: sdhci: Add support for sdhci-caps-mask") sdhci_setup_cfg() expects a valid sdhci_host mmc field. Move the mmc field initialization before sdhci_setup_cfg() call to avoid crash on mmc pointer dereference. [this patch is based on commit 41a9fab8dac8 ("mmc: mv_sdhci: fix uninitialized pointer deref on probe") by Baruch Siach] Fixes: 3d296365e4e8 ("mmc: sdhci: Add support for sdhci-caps-mask") Cc: Faiz Abbas Cc: Baruch Siach Signed-off-by: Matwey V. Kornilov Reviewed-by: Peng Fan Tested-by: Michal Simek (on zcu102/zc706) --- drivers/mmc/zynq_sdhci.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c index c525084250..3225a7ac93 100644 --- a/drivers/mmc/zynq_sdhci.c +++ b/drivers/mmc/zynq_sdhci.c @@ -242,13 +242,14 @@ static int arasan_sdhci_probe(struct udevice *dev) host->max_clk = clock; + host->mmc = &plat->mmc; + host->mmc->dev = dev; + host->mmc->priv = host; + ret = sdhci_setup_cfg(&plat->cfg, host, plat->f_max, CONFIG_ZYNQ_SDHCI_MIN_FREQ); - host->mmc = &plat->mmc; if (ret) return ret; - host->mmc->priv = host; - host->mmc->dev = dev; upriv->mmc = host->mmc; return sdhci_probe(dev); -- 2.25.1