TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmc: core: Fix error when SD card is removed

Browse Source 
The device reboots when the SD card is removed.
This is because the host->claimer resource has been released
earlier as part of the SD card removal process.
When mmc_try_claim_host tries to check the host->claimer->task,
it dereferences a NULL pointer.

Change-Id: I8625b17e337248791de6fac2ba5b3a2d5e82894e
Signed-off-by: Bao D. Nguyen <nguyenb@codeaurora.org>
This commit is contained in:
Bao D. Nguyen
2019-02-22 16:50:12 -08:00
parent 0a48238d00
commit 6bdf4fce97
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mmc/core/core.c
View File

@@ -1787,12 +1787,13 @@ int mmc_try_claim_host(struct mmc_host *host, unsigned int delay_ms)
unsigned long flags; unsigned long flags;
int retry_cnt = delay_ms/10; int retry_cnt = delay_ms/10;
bool pm = false; bool pm = false;
struct task_struct *task = current;
do { do {
spin_lock_irqsave(&host->lock, flags); spin_lock_irqsave(&host->lock, flags);
if (!host->claimed || host->claimer->task == current) { if (!host->claimed || mmc_ctx_matches(host, NULL, task)) {
host->claimed = 1; host->claimed = 1;
host->claimer->task = current; mmc_ctx_set_claimer(host, NULL, task);
host->claim_cnt += 1; host->claim_cnt += 1;
claimed_host = 1; claimed_host = 1;
if (host->claim_cnt == 1) if (host->claim_cnt == 1)

2
drivers/mmc/core/sd.c
View File

@@ -1197,8 +1197,6 @@ static void mmc_sd_detect(struct mmc_host *host)
return; return;
} }
mmc_get_card(host->card, NULL);
/* /*
* Just check if our card has been removed. * Just check if our card has been removed.
*/ */