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

Commit d3fb88a5 authored by Madhuparna Bhowmik's avatar Madhuparna Bhowmik Committed by Greg Kroah-Hartman
Browse files

mmc: via-sdmmc: Fix data race bug 



[ Upstream commit 87d7ad089b318b4f319bf57f1daa64eb6d1d10ad ]

via_save_pcictrlreg() should be called with host->lock held
as it writes to pm_pcictrl_reg, otherwise there can be a race
condition between via_sd_suspend() and via_sdc_card_detect().
The same pattern is used in the function via_reset_pcictrl()
as well, where via_save_pcictrlreg() is called with host->lock
held.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: default avatarMadhuparna Bhowmik <madhuparnabhowmik10@gmail.com>
Link: https://lore.kernel.org/r/20200822061528.7035-1-madhuparnabhowmik10@gmail.com


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

drivers/mmc/host/via-sdmmc.c

+3 −0
Original line number Diff line number Diff line
@@ -1259,11 +1259,14 @@ static void via_init_sdc_pm(struct via_crdr_mmc_host *host) 
static int via_sd_suspend(struct pci_dev *pcidev, pm_message_t state)

{

	struct via_crdr_mmc_host *host;

	unsigned long flags;



	host = pci_get_drvdata(pcidev);



	spin_lock_irqsave(&host->lock, flags);

	via_save_pcictrlreg(host);

	via_save_sdcreg(host);

	spin_unlock_irqrestore(&host->lock, flags);



	pci_save_state(pcidev);

	pci_enable_wake(pcidev, pci_choose_state(pcidev, state), 0);