[PATCH 5.10 22/52] mmc: hsq: Fix data stomping during mmc recovery

From: Greg Kroah-Hartman
Date: Mon Oct 03 2022 - 04:24:38 EST

From: Wenchao Chen <wenchao.chen@xxxxxxxxxx>

commit e7afa79a3b35a27a046a2139f8b20bd6b98155c2 upstream.

The block device uses multiple queues to access emmc. There will be up to 3
requests in the hsq of the host. The current code will check whether there
is a request doing recovery before entering the queue, but it will not check
whether there is a request when the lock is issued. The request is in recovery
mode. If there is a request in recovery, then a read and write request is
initiated at this time, and the conflict between the request and the recovery
request will cause the data to be trampled.

Signed-off-by: Wenchao Chen <wenchao.chen@xxxxxxxxxx>
Fixes: 511ce378e16f ("mmc: Add MMC host software queue support")
Cc: stable@xxxxxxxxxxxxxxx
Link: https://lore.kernel.org/r/20220916090506.10662-1-wenchao.chen666@xxxxxxxxx
Signed-off-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
drivers/mmc/host/mmc_hsq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/mmc/host/mmc_hsq.c
+++ b/drivers/mmc/host/mmc_hsq.c
@@ -34,7 +34,7 @@ static void mmc_hsq_pump_requests(struct
spin_lock_irqsave(&hsq->lock, flags);

/* Make sure we are not already running a request now */
- if (hsq->mrq) {
+ if (hsq->mrq || hsq->recovery_halt) {
spin_unlock_irqrestore(&hsq->lock, flags);