Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 937112e9 authored by Yang Yingliang's avatar Yang Yingliang Committed by Greg Kroah-Hartman
Browse files

mmc: rtsx_usb_sdmmc: fix return value check of mmc_add_host() 



[ Upstream commit fc38a5a10e9e5a75eb9189854abeb8405b214cc9 ]

mmc_add_host() may return error, if we ignore its return value, the memory
that allocated in mmc_alloc_host() will be leaked and it will lead a kernel
crash because of deleting not added device in the remove path.

So fix this by checking the return value and calling mmc_free_host() in the
error path, besides, led_classdev_unregister() and pm_runtime_disable() also
need be called.

Fixes: c7f6558d ("mmc: Add realtek USB sdmmc host driver")
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20221101063023.1664968-7-yangyingliang@huawei.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0b7b6342

drivers/mmc/host/rtsx_usb_sdmmc.c

+10 −1
Original line number Original line Diff line number Diff line
@@ -1338,6 +1338,7 @@ static int rtsx_usb_sdmmc_drv_probe(struct platform_device *pdev) 
#ifdef RTSX_USB_USE_LEDS_CLASS

#ifdef RTSX_USB_USE_LEDS_CLASS

	int err;

	int err;

#endif

#endif

	int ret;





	ucr = usb_get_intfdata(to_usb_interface(pdev->dev.parent));

	ucr = usb_get_intfdata(to_usb_interface(pdev->dev.parent));

	if (!ucr)

	if (!ucr)
@@ -1374,7 +1375,15 @@ static int rtsx_usb_sdmmc_drv_probe(struct platform_device *pdev) 
	INIT_WORK(&host->led_work, rtsx_usb_update_led);

	INIT_WORK(&host->led_work, rtsx_usb_update_led);





#endif

#endif

	mmc_add_host(mmc);

	ret = mmc_add_host(mmc);

	if (ret) {

#ifdef RTSX_USB_USE_LEDS_CLASS

		led_classdev_unregister(&host->led);

#endif

		mmc_free_host(mmc);

		pm_runtime_disable(&pdev->dev);

		return ret;

	}





	return 0;

	return 0;

}

}