| Message ID | 20221108121316.340354-1-yangyingliang@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mmc: host: omap_hsmmc: fix return value check of mmc_add_host() | expand |
On Tue, 8 Nov 2022 at 13:14, Yang Yingliang <yangyingliang@huawei.com> wrote: > > mmc_add_host() may return error, if we ignore its return value, > it will lead two issues: > 1. The memory that allocated in mmc_alloc_host() is leaked. > 2. In the remove() path, mmc_remove_host() will be called to > delete device, but it's not added yet, it will lead a kernel > crash because of null-ptr-deref in device_del(). > > Fix this by checking the return value and goto error path wihch > will call mmc_free_host(). > > Fixes: a45c6cb81647 ("[ARM] 5369/1: omap mmc: Add new omap hsmmc controller for 2430 and 34xx, v3") > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/omap_hsmmc.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c > index fca30add563e..4bd744755205 100644 > --- a/drivers/mmc/host/omap_hsmmc.c > +++ b/drivers/mmc/host/omap_hsmmc.c > @@ -1946,7 +1946,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev) > if (!ret) > mmc->caps |= MMC_CAP_SDIO_IRQ; > > - mmc_add_host(mmc); > + ret = mmc_add_host(mmc); > + if (ret) > + goto err_irq; > > if (mmc_pdata(host)->name != NULL) { > ret = device_create_file(&mmc->class_dev, &dev_attr_slot_name); > -- > 2.25.1 >
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index fca30add563e..4bd744755205 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -1946,7 +1946,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev) if (!ret) mmc->caps |= MMC_CAP_SDIO_IRQ; - mmc_add_host(mmc); + ret = mmc_add_host(mmc); + if (ret) + goto err_irq; if (mmc_pdata(host)->name != NULL) { ret = device_create_file(&mmc->class_dev, &dev_attr_slot_name);
mmc_add_host() may return error, if we ignore its return value, it will lead two issues: 1. The memory that allocated in mmc_alloc_host() is leaked. 2. In the remove() path, mmc_remove_host() will be called to delete device, but it's not added yet, it will lead a kernel crash because of null-ptr-deref in device_del(). Fix this by checking the return value and goto error path wihch will call mmc_free_host(). Fixes: a45c6cb81647 ("[ARM] 5369/1: omap mmc: Add new omap hsmmc controller for 2430 and 34xx, v3") Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- drivers/mmc/host/omap_hsmmc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)