[U-Boot] [PATCH 4/7] mmc: pci: fix uninitialized pointer deref on probe

Simon Glass sjg at chromium.org
Tue Aug 13 09:34:11 UTC 2019


On Mon, 5 Aug 2019 at 20:48, Peng Fan <peng.fan at nxp.com> wrote:
>
> Commit 3d296365e4e8 ("mmc: sdhci: Add support for
> sdhci-caps-mask") sdhci_setup_cfg() expects a valid sdhci_host mmc
> field.
>
> Fixes: 3d296365e4e8 ("mmc: sdhci: Add support for sdhci-caps-mask")
> Cc: Faiz Abbas <faiz_abbas at ti.com>
> Cc: Simon Glass <sjg at chromium.org>
> Cc: Bin Meng <bmeng.cn at gmail.com>
> Signed-off-by: Peng Fan <peng.fan at nxp.com>
> ---
>  drivers/mmc/pci_mmc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Simon Glass <sjg at chromium.org>

>
> diff --git a/drivers/mmc/pci_mmc.c b/drivers/mmc/pci_mmc.c
> index 182d41637f..404264a697 100644
> --- a/drivers/mmc/pci_mmc.c
> +++ b/drivers/mmc/pci_mmc.c
> @@ -33,12 +33,12 @@ static int pci_mmc_probe(struct udevice *dev)
>         host->ioaddr = (void *)dm_pci_map_bar(dev, PCI_BASE_ADDRESS_0,
>                                               PCI_REGION_MEM);
>         host->name = dev->name;
> +       host->mmc = &plat->mmc;
> +       host->mmc->dev = dev;

How about putting through three lines in a common function in
mmc-uclass.c (with args 'host', dev and play) since they appear in a
lot of drivers.

Regards,
Simon


More information about the U-Boot mailing list